Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
112 changes: 109 additions & 3 deletions packages/cli/src/cli.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,13 +12,16 @@ import {
assertSafeRelativePath,
buildRelayfileMountPatterns,
buildMountGitExcludeBlock,
buildSidecarBody,
configureGitForMount,
decideCleanMode,
loadSidecarForSelection,
parseAgentArgs,
parseInstallArgs,
parseCreateArgs,
resolveSystemPromptPlaceholders,
stripAgentFlag
stripAgentFlag,
type ResolvedSidecar
} from './cli.js';

// The conflict-detection path inside parseAgentArgs uses the module-local
Expand DownExpand Up@@ -279,7 +282,10 @@ test('CLEAN_IGNORED_PATTERNS: covers the declared repo-level claude config files
'CLAUDE.md',
'CLAUDE.local.md',
'.claude',
'.mcp.json'
'.mcp.json',
// AGENTS.md hidden so per-persona sidecar materialization into the
// mount doesn't leak the user's real-cwd file in or sync back out.
'AGENTS.md'
]);
});

Expand DownExpand Up@@ -319,7 +325,11 @@ test('SKILL_INSTALL_IGNORED_PATTERNS: keeps skill-install artifacts out of the r
'.opencode',
'.skills',
'prpm.lock',
'skills-lock.json'
'skills-lock.json',
// AGENTS.md (opencode sidecar) materialized into the mount; hide so
// the user's real-cwd file doesn't copy in and the persona-written
// file doesn't sync back.
'AGENTS.md'
]);
});

Expand DownExpand Up@@ -602,6 +612,102 @@ test('configureGitForMount: empty patterns is a no-op', () => {
assert.doesNotThrow(() => configureGitForMount('/nonexistent-path', []));
});

test('buildSidecarBody: overwrite mode returns persona content as-is', () => {
const sidecar: ResolvedSidecar = {
mountFile: 'CLAUDE.md',
personaContent: '# Persona\n',
mode: 'overwrite'
};
// Even if a real-cwd file exists, overwrite must ignore it.
const dir = mkdtempSync(join(tmpdir(), 'aw-sidecar-'));
try {
writeFileSync(join(dir, 'CLAUDE.md'), '# Real\n', 'utf8');
assert.equal(buildSidecarBody(sidecar, dir), '# Persona\n');
} finally {
rmSync(dir, { recursive: true, force: true });
}
});

test('buildSidecarBody: extend mode prepends real-cwd content with separator', () => {
const sidecar: ResolvedSidecar = {
mountFile: 'CLAUDE.md',
personaContent: '# Persona\n',
mode: 'extend'
};
const dir = mkdtempSync(join(tmpdir(), 'aw-sidecar-'));
try {
writeFileSync(join(dir, 'CLAUDE.md'), '# Real\n', 'utf8');
assert.equal(buildSidecarBody(sidecar, dir), '# Real\n\n\n---\n\n# Persona\n');
} finally {
rmSync(dir, { recursive: true, force: true });
}
});

test('buildSidecarBody: extend mode degrades to overwrite when real file is missing', () => {
const sidecar: ResolvedSidecar = {
mountFile: 'AGENTS.md',
personaContent: '# Only persona\n',
mode: 'extend'
};
const dir = mkdtempSync(join(tmpdir(), 'aw-sidecar-'));
try {
assert.equal(buildSidecarBody(sidecar, dir), '# Only persona\n');
} finally {
rmSync(dir, { recursive: true, force: true });
}
});

test('loadSidecarForSelection: prefers inlined Content over path; selects by harness', () => {
const baseRuntime = {
harness: 'claude' as const,
model: 'claude-3-5-sonnet',
systemPrompt: 'You are a test persona.',
harnessSettings: { reasoning: 'medium' as const, timeoutSeconds: 300 }
};
const selection = {
personaId: 'p',
tier: 'best' as const,
runtime: baseRuntime,
skills: [],
rationale: 'test',
claudeMdContent: '# Inlined\n',
claudeMdMode: 'overwrite' as const
};
const { sidecar } = loadSidecarForSelection(selection);
assert.ok(sidecar);
assert.equal(sidecar.mountFile, 'CLAUDE.md');
assert.equal(sidecar.personaContent, '# Inlined\n');
assert.equal(sidecar.mode, 'overwrite');

// codex harness gets nothing
const codexSelection = {
...selection,
runtime: { ...baseRuntime, harness: 'codex' as const }
};
const out = loadSidecarForSelection(codexSelection);
assert.equal(out.sidecar, undefined);
});

test('loadSidecarForSelection: opencode picks agentsMd, not claudeMd', () => {
const selection = {
personaId: 'p',
tier: 'best' as const,
runtime: {
harness: 'opencode' as const,
model: 'gpt-5.2',
systemPrompt: 'X',
harnessSettings: { reasoning: 'medium' as const, timeoutSeconds: 300 }
},
skills: [],
rationale: 'test',
claudeMdContent: '# claude\n',
agentsMdContent: '# agents\n'
};
const { sidecar } = loadSidecarForSelection(selection);
assert.equal(sidecar?.mountFile, 'AGENTS.md');
assert.equal(sidecar?.personaContent, '# agents\n');
});

test('main: codex sessions never engage the sandbox mount', async () => {
// npm-provenance-publisher@best runs on codex; codex has no sandbox mount
// support, so the run continues down the non-mount spawn path (which then
Expand Down
158 changes: 154 additions & 4 deletions packages/cli/src/cli.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ import {
PERSONA_TAGS,
PERSONA_TIERS,
personaCatalog,
resolveSidecar,
routingProfiles,
useSelection,
type Harness,
Expand All@@ -27,7 +28,8 @@ import {
type PersonaSelection,
type PersonaSpec,
type PersonaTag,
type PersonaTier
type PersonaTier,
type SidecarMdMode
} from '@agentworkforce/workload-router';
import {
buildInteractiveSpec,
Expand DownExpand Up@@ -240,6 +242,7 @@ function buildSelection(spec: PersonaSpec, tier: PersonaTier, kind: 'repo' | 'lo
...rawRuntime,
systemPrompt: resolveSystemPromptPlaceholders(rawRuntime.systemPrompt, rawRuntime.harness)
};
const sidecar = resolveSidecar(spec, tier);
return {
personaId: spec.id,
tier,
Expand All@@ -250,7 +253,17 @@ function buildSelection(spec: PersonaSpec, tier: PersonaTier, kind: 'repo' | 'lo
...(spec.env ? { env: spec.env } : {}),
...(spec.mcpServers ? { mcpServers: spec.mcpServers } : {}),
...(spec.permissions ? { permissions: spec.permissions } : {}),
...(spec.mount ? { mount: spec.mount } : {})
...(spec.mount ? { mount: spec.mount } : {}),
...(sidecar.claudeMd ? { claudeMd: sidecar.claudeMd } : {}),
...(sidecar.claudeMdContent ? { claudeMdContent: sidecar.claudeMdContent } : {}),
...(sidecar.claudeMd || sidecar.claudeMdContent
? { claudeMdMode: sidecar.claudeMdMode }
: {}),
...(sidecar.agentsMd ? { agentsMd: sidecar.agentsMd } : {}),
...(sidecar.agentsMdContent ? { agentsMdContent: sidecar.agentsMdContent } : {}),
...(sidecar.agentsMd || sidecar.agentsMdContent
? { agentsMdMode: sidecar.agentsMdMode }
: {})
};
}

Expand DownExpand Up@@ -431,7 +444,12 @@ export const CLEAN_IGNORED_PATTERNS = [
'CLAUDE.md',
'CLAUDE.local.md',
'.claude',
'.mcp.json'
'.mcp.json',
// Per-persona AGENTS.md sidecars get materialized into the mount when
// running under opencode; without this the user's real-cwd AGENTS.md
// would copy in (masking the persona content) and writes from
// onBeforeLaunch would sync back out.
'AGENTS.md'
] as const;

/**
Expand All@@ -456,7 +474,11 @@ export const SKILL_INSTALL_IGNORED_PATTERNS = [
'.skills',
// provider lockfiles written at the repo root
'prpm.lock',
'skills-lock.json'
'skills-lock.json',
// Per-persona AGENTS.md sidecars (opencode harness) get materialized
// into the mount; hide so the real-cwd AGENTS.md isn't copied in and
// the persona-written copy doesn't sync back out.
'AGENTS.md'
] as const;

export interface RelayfileMountPatterns {
Expand DownExpand Up@@ -570,6 +592,113 @@ export function configureGitForMount(mountDir: string, patterns: readonly string
}
}

/**
* Persona-supplied sidecar markdown materialized into a sandbox mount.
* Pure data carrier — `runInteractive` translates it into the on-disk
* write inside `onBeforeLaunch` (mount path) and warns/skips when the
* harness has no mount (codex / `--install-in-repo`).
*/
export interface ResolvedSidecar {
/** Filename inside the mount: `CLAUDE.md` (claude) or `AGENTS.md` (opencode). */
mountFile: 'CLAUDE.md' | 'AGENTS.md';
/** Persona-author content. Already inlined for built-ins; read from disk for local. */
personaContent: string;
mode: SidecarMdMode;
}

/**
* Resolve the sidecar for a given selection + harness, returning the
* persona-author content the runtime should materialize into the mount.
* Returns `{}` when no sidecar applies (no path/content set, or harness
* doesn't support sidecar files at all). Read errors surface as a warning
* string so the caller can drop the sidecar gracefully rather than
* failing the whole session.
*/
export function loadSidecarForSelection(
selection: PersonaSelection
): { sidecar?: ResolvedSidecar; warning?: string } {
const harness = selection.runtime.harness;
if (harness !== 'claude' && harness !== 'opencode') return {};
if (harness === 'claude') {
if (selection.claudeMdContent) {
return {
sidecar: {
mountFile: 'CLAUDE.md',
personaContent: selection.claudeMdContent,
mode: selection.claudeMdMode ?? 'overwrite'
}
};
}
if (selection.claudeMd) {
try {
const content = readFileSync(selection.claudeMd, 'utf8');
return {
sidecar: {
mountFile: 'CLAUDE.md',
personaContent: content,
mode: selection.claudeMdMode ?? 'overwrite'
}
};
} catch (err) {
return { warning: `claudeMd: could not read ${selection.claudeMd}: ${(err as Error).message}` };
}
}
return {};
}
if (selection.agentsMdContent) {
return {
sidecar: {
mountFile: 'AGENTS.md',
personaContent: selection.agentsMdContent,
mode: selection.agentsMdMode ?? 'overwrite'
}
};
}
if (selection.agentsMd) {
try {
const content = readFileSync(selection.agentsMd, 'utf8');
return {
sidecar: {
mountFile: 'AGENTS.md',
personaContent: content,
mode: selection.agentsMdMode ?? 'overwrite'
}
};
} catch (err) {
return { warning: `agentsMd: could not read ${selection.agentsMd}: ${(err as Error).message}` };
}
}
return {};
}

/**
* Compute the bytes to write into the mount for a sidecar. In `extend`
* mode, prepends the user's real-cwd file (if any) joined to the persona
* content with `\n\n---\n\n`. Pure — exposed for unit tests.
*/
export function buildSidecarBody(
sidecar: ResolvedSidecar,
realCwdDir: string
): string {
if (sidecar.mode === 'extend') {
const realPath = join(realCwdDir, sidecar.mountFile);
try {
const realContent = readFileSync(realPath, 'utf8');
return `${realContent}\n\n---\n\n${sidecar.personaContent}`;
} catch (err) {
// Only "missing path" errors degrade to overwrite. Real I/O
// problems (EACCES, EISDIR, …) propagate so callers see them
// instead of silently dropping the user's CLAUDE.md/AGENTS.md.
const code = (err as NodeJS.ErrnoException).code;
if (code === 'ENOENT' || code === 'ENOTDIR') {
return sidecar.personaContent;
}
throw err;
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}
return sidecar.personaContent;
}

/**
* Decide whether to run the interactive session inside a
* `@relayfile/local-mount` sandbox.
Expand DownExpand Up@@ -622,6 +751,23 @@ async function runInteractive(
runtime.harness,
options.installInRepo === true
).useClean;
// Per-persona CLAUDE.md / AGENTS.md: load the author content if any. The
// file is materialized into the mount inside onBeforeLaunch (claude/
// opencode default). Without a mount (codex, --install-in-repo) we
// skip-and-warn — writing into the real cwd would pollute the user's
// repo and is explicitly out of scope.
const sidecarLookup = loadSidecarForSelection(effectiveSelection);
if (sidecarLookup.warning) {
process.stderr.write(`warning: ${sidecarLookup.warning}\n`);
}
const resolvedSidecar = useClean ? sidecarLookup.sidecar : undefined;
if (sidecarLookup.sidecar && !useClean) {
process.stderr.write(
`warning: persona declares ${sidecarLookup.sidecar.mountFile} but no sandbox mount is available (` +
`${runtime.harness === 'codex' ? 'codex harness has no mount' : '--install-in-repo disengages the mount'})` +
`; skipping sidecar materialization to avoid writing into your repo.\n`
);
}
// A session dir is needed whenever we either (a) stage skills out-of-repo
// via claude's installRoot, or (b) open a mount. Both engage for claude/
// opencode by default; --install-in-repo disengages both.
Expand DownExpand Up@@ -884,6 +1030,10 @@ async function runInteractive(
mkdirSync(dirname(target), { recursive: true });
writeFileSync(target, file.contents, 'utf8');
}
if (resolvedSidecar) {
const body = buildSidecarBody(resolvedSidecar, process.cwd());
writeFileSync(join(dir, resolvedSidecar.mountFile), body, 'utf8');
}
}
});
return result.exitCode;
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
112 changes: 109 additions & 3 deletions packages/cli/src/cli.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,13 +12,16 @@ import {
assertSafeRelativePath,
buildRelayfileMountPatterns,
buildMountGitExcludeBlock,
buildSidecarBody,
configureGitForMount,
decideCleanMode,
loadSidecarForSelection,
parseAgentArgs,
parseInstallArgs,
parseCreateArgs,
resolveSystemPromptPlaceholders,
stripAgentFlag
stripAgentFlag,
type ResolvedSidecar
} from './cli.js';

// The conflict-detection path inside parseAgentArgs uses the module-local
Expand DownExpand Up@@ -279,7 +282,10 @@ test('CLEAN_IGNORED_PATTERNS: covers the declared repo-level claude config files
'CLAUDE.md',
'CLAUDE.local.md',
'.claude',
'.mcp.json'
'.mcp.json',
// AGENTS.md hidden so per-persona sidecar materialization into the
// mount doesn't leak the user's real-cwd file in or sync back out.
'AGENTS.md'
]);
});

Expand DownExpand Up@@ -319,7 +325,11 @@ test('SKILL_INSTALL_IGNORED_PATTERNS: keeps skill-install artifacts out of the r
'.opencode',
'.skills',
'prpm.lock',
'skills-lock.json'
'skills-lock.json',
// AGENTS.md (opencode sidecar) materialized into the mount; hide so
// the user's real-cwd file doesn't copy in and the persona-written
// file doesn't sync back.
'AGENTS.md'
]);
});

Expand DownExpand Up@@ -602,6 +612,102 @@ test('configureGitForMount: empty patterns is a no-op', () => {
assert.doesNotThrow(() => configureGitForMount('/nonexistent-path', []));
});

test('buildSidecarBody: overwrite mode returns persona content as-is', () => {
const sidecar: ResolvedSidecar = {
mountFile: 'CLAUDE.md',
personaContent: '# Persona\n',
mode: 'overwrite'
};
// Even if a real-cwd file exists, overwrite must ignore it.
const dir = mkdtempSync(join(tmpdir(), 'aw-sidecar-'));
try {
writeFileSync(join(dir, 'CLAUDE.md'), '# Real\n', 'utf8');
assert.equal(buildSidecarBody(sidecar, dir), '# Persona\n');
} finally {
rmSync(dir, { recursive: true, force: true });
}
});

test('buildSidecarBody: extend mode prepends real-cwd content with separator', () => {
const sidecar: ResolvedSidecar = {
mountFile: 'CLAUDE.md',
personaContent: '# Persona\n',
mode: 'extend'
};
const dir = mkdtempSync(join(tmpdir(), 'aw-sidecar-'));
try {
writeFileSync(join(dir, 'CLAUDE.md'), '# Real\n', 'utf8');
assert.equal(buildSidecarBody(sidecar, dir), '# Real\n\n\n---\n\n# Persona\n');
} finally {
rmSync(dir, { recursive: true, force: true });
}
});

test('buildSidecarBody: extend mode degrades to overwrite when real file is missing', () => {
const sidecar: ResolvedSidecar = {
mountFile: 'AGENTS.md',
personaContent: '# Only persona\n',
mode: 'extend'
};
const dir = mkdtempSync(join(tmpdir(), 'aw-sidecar-'));
try {
assert.equal(buildSidecarBody(sidecar, dir), '# Only persona\n');
} finally {
rmSync(dir, { recursive: true, force: true });
}
});

test('loadSidecarForSelection: prefers inlined Content over path; selects by harness', () => {
const baseRuntime = {
harness: 'claude' as const,
model: 'claude-3-5-sonnet',
systemPrompt: 'You are a test persona.',
harnessSettings: { reasoning: 'medium' as const, timeoutSeconds: 300 }
};
const selection = {
personaId: 'p',
tier: 'best' as const,
runtime: baseRuntime,
skills: [],
rationale: 'test',
claudeMdContent: '# Inlined\n',
claudeMdMode: 'overwrite' as const
};
const { sidecar } = loadSidecarForSelection(selection);
assert.ok(sidecar);
assert.equal(sidecar.mountFile, 'CLAUDE.md');
assert.equal(sidecar.personaContent, '# Inlined\n');
assert.equal(sidecar.mode, 'overwrite');

// codex harness gets nothing
const codexSelection = {
...selection,
runtime: { ...baseRuntime, harness: 'codex' as const }
};
const out = loadSidecarForSelection(codexSelection);
assert.equal(out.sidecar, undefined);
});

test('loadSidecarForSelection: opencode picks agentsMd, not claudeMd', () => {
const selection = {
personaId: 'p',
tier: 'best' as const,
runtime: {
harness: 'opencode' as const,
model: 'gpt-5.2',
systemPrompt: 'X',
harnessSettings: { reasoning: 'medium' as const, timeoutSeconds: 300 }
},
skills: [],
rationale: 'test',
claudeMdContent: '# claude\n',
agentsMdContent: '# agents\n'
};
const { sidecar } = loadSidecarForSelection(selection);
assert.equal(sidecar?.mountFile, 'AGENTS.md');
assert.equal(sidecar?.personaContent, '# agents\n');
});

test('main: codex sessions never engage the sandbox mount', async () => {
// npm-provenance-publisher@best runs on codex; codex has no sandbox mount
// support, so the run continues down the non-mount spawn path (which then
Expand Down
158 changes: 154 additions & 4 deletions packages/cli/src/cli.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ import {
PERSONA_TAGS,
PERSONA_TIERS,
personaCatalog,
resolveSidecar,
routingProfiles,
useSelection,
type Harness,
Expand All@@ -27,7 +28,8 @@ import {
type PersonaSelection,
type PersonaSpec,
type PersonaTag,
type PersonaTier
type PersonaTier,
type SidecarMdMode
} from '@agentworkforce/workload-router';
import {
buildInteractiveSpec,
Expand DownExpand Up@@ -240,6 +242,7 @@ function buildSelection(spec: PersonaSpec, tier: PersonaTier, kind: 'repo' | 'lo
...rawRuntime,
systemPrompt: resolveSystemPromptPlaceholders(rawRuntime.systemPrompt, rawRuntime.harness)
};
const sidecar = resolveSidecar(spec, tier);
return {
personaId: spec.id,
tier,
Expand All@@ -250,7 +253,17 @@ function buildSelection(spec: PersonaSpec, tier: PersonaTier, kind: 'repo' | 'lo
...(spec.env ? { env: spec.env } : {}),
...(spec.mcpServers ? { mcpServers: spec.mcpServers } : {}),
...(spec.permissions ? { permissions: spec.permissions } : {}),
...(spec.mount ? { mount: spec.mount } : {})
...(spec.mount ? { mount: spec.mount } : {}),
...(sidecar.claudeMd ? { claudeMd: sidecar.claudeMd } : {}),
...(sidecar.claudeMdContent ? { claudeMdContent: sidecar.claudeMdContent } : {}),
...(sidecar.claudeMd || sidecar.claudeMdContent
? { claudeMdMode: sidecar.claudeMdMode }
: {}),
...(sidecar.agentsMd ? { agentsMd: sidecar.agentsMd } : {}),
...(sidecar.agentsMdContent ? { agentsMdContent: sidecar.agentsMdContent } : {}),
...(sidecar.agentsMd || sidecar.agentsMdContent
? { agentsMdMode: sidecar.agentsMdMode }
: {})
};
}

Expand DownExpand Up@@ -431,7 +444,12 @@ export const CLEAN_IGNORED_PATTERNS = [
'CLAUDE.md',
'CLAUDE.local.md',
'.claude',
'.mcp.json'
'.mcp.json',
// Per-persona AGENTS.md sidecars get materialized into the mount when
// running under opencode; without this the user's real-cwd AGENTS.md
// would copy in (masking the persona content) and writes from
// onBeforeLaunch would sync back out.
'AGENTS.md'
] as const;

/**
Expand All@@ -456,7 +474,11 @@ export const SKILL_INSTALL_IGNORED_PATTERNS = [
'.skills',
// provider lockfiles written at the repo root
'prpm.lock',
'skills-lock.json'
'skills-lock.json',
// Per-persona AGENTS.md sidecars (opencode harness) get materialized
// into the mount; hide so the real-cwd AGENTS.md isn't copied in and
// the persona-written copy doesn't sync back out.
'AGENTS.md'
] as const;

export interface RelayfileMountPatterns {
Expand DownExpand Up@@ -570,6 +592,113 @@ export function configureGitForMount(mountDir: string, patterns: readonly string
}
}

/**
* Persona-supplied sidecar markdown materialized into a sandbox mount.
* Pure data carrier — `runInteractive` translates it into the on-disk
* write inside `onBeforeLaunch` (mount path) and warns/skips when the
* harness has no mount (codex / `--install-in-repo`).
*/
export interface ResolvedSidecar {
/** Filename inside the mount: `CLAUDE.md` (claude) or `AGENTS.md` (opencode). */
mountFile: 'CLAUDE.md' | 'AGENTS.md';
/** Persona-author content. Already inlined for built-ins; read from disk for local. */
personaContent: string;
mode: SidecarMdMode;
}

/**
* Resolve the sidecar for a given selection + harness, returning the
* persona-author content the runtime should materialize into the mount.
* Returns `{}` when no sidecar applies (no path/content set, or harness
* doesn't support sidecar files at all). Read errors surface as a warning
* string so the caller can drop the sidecar gracefully rather than
* failing the whole session.
*/
export function loadSidecarForSelection(
selection: PersonaSelection
): { sidecar?: ResolvedSidecar; warning?: string } {
const harness = selection.runtime.harness;
if (harness !== 'claude' && harness !== 'opencode') return {};
if (harness === 'claude') {
if (selection.claudeMdContent) {
return {
sidecar: {
mountFile: 'CLAUDE.md',
personaContent: selection.claudeMdContent,
mode: selection.claudeMdMode ?? 'overwrite'
}
};
}
if (selection.claudeMd) {
try {
const content = readFileSync(selection.claudeMd, 'utf8');
return {
sidecar: {
mountFile: 'CLAUDE.md',
personaContent: content,
mode: selection.claudeMdMode ?? 'overwrite'
}
};
} catch (err) {
return { warning: `claudeMd: could not read ${selection.claudeMd}: ${(err as Error).message}` };
}
}
return {};
}
if (selection.agentsMdContent) {
return {
sidecar: {
mountFile: 'AGENTS.md',
personaContent: selection.agentsMdContent,
mode: selection.agentsMdMode ?? 'overwrite'
}
};
}
if (selection.agentsMd) {
try {
const content = readFileSync(selection.agentsMd, 'utf8');
return {
sidecar: {
mountFile: 'AGENTS.md',
personaContent: content,
mode: selection.agentsMdMode ?? 'overwrite'
}
};
} catch (err) {
return { warning: `agentsMd: could not read ${selection.agentsMd}: ${(err as Error).message}` };
}
}
return {};
}

/**
* Compute the bytes to write into the mount for a sidecar. In `extend`
* mode, prepends the user's real-cwd file (if any) joined to the persona
* content with `\n\n---\n\n`. Pure — exposed for unit tests.
*/
export function buildSidecarBody(
sidecar: ResolvedSidecar,
realCwdDir: string
): string {
if (sidecar.mode === 'extend') {
const realPath = join(realCwdDir, sidecar.mountFile);
try {
const realContent = readFileSync(realPath, 'utf8');
return `${realContent}\n\n---\n\n${sidecar.personaContent}`;
} catch (err) {
// Only "missing path" errors degrade to overwrite. Real I/O
// problems (EACCES, EISDIR, …) propagate so callers see them
// instead of silently dropping the user's CLAUDE.md/AGENTS.md.
const code = (err as NodeJS.ErrnoException).code;
if (code === 'ENOENT' || code === 'ENOTDIR') {
return sidecar.personaContent;
}
throw err;
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}
return sidecar.personaContent;
}

/**
* Decide whether to run the interactive session inside a
* `@relayfile/local-mount` sandbox.
Expand DownExpand Up@@ -622,6 +751,23 @@ async function runInteractive(
runtime.harness,
options.installInRepo === true
).useClean;
// Per-persona CLAUDE.md / AGENTS.md: load the author content if any. The
// file is materialized into the mount inside onBeforeLaunch (claude/
// opencode default). Without a mount (codex, --install-in-repo) we
// skip-and-warn — writing into the real cwd would pollute the user's
// repo and is explicitly out of scope.
const sidecarLookup = loadSidecarForSelection(effectiveSelection);
if (sidecarLookup.warning) {
process.stderr.write(`warning: ${sidecarLookup.warning}\n`);
}
const resolvedSidecar = useClean ? sidecarLookup.sidecar : undefined;
if (sidecarLookup.sidecar && !useClean) {
process.stderr.write(
`warning: persona declares ${sidecarLookup.sidecar.mountFile} but no sandbox mount is available (` +
`${runtime.harness === 'codex' ? 'codex harness has no mount' : '--install-in-repo disengages the mount'})` +
`; skipping sidecar materialization to avoid writing into your repo.\n`
);
}
// A session dir is needed whenever we either (a) stage skills out-of-repo
// via claude's installRoot, or (b) open a mount. Both engage for claude/
// opencode by default; --install-in-repo disengages both.
Expand DownExpand Up@@ -884,6 +1030,10 @@ async function runInteractive(
mkdirSync(dirname(target), { recursive: true });
writeFileSync(target, file.contents, 'utf8');
}
if (resolvedSidecar) {
const body = buildSidecarBody(resolvedSidecar, process.cwd());
writeFileSync(join(dir, resolvedSidecar.mountFile), body, 'utf8');
}
}
});
return result.exitCode;
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
112 changes: 109 additions & 3 deletions packages/cli/src/cli.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,13 +12,16 @@ import {
assertSafeRelativePath,
buildRelayfileMountPatterns,
buildMountGitExcludeBlock,
buildSidecarBody,
configureGitForMount,
decideCleanMode,
loadSidecarForSelection,
parseAgentArgs,
parseInstallArgs,
parseCreateArgs,
resolveSystemPromptPlaceholders,
stripAgentFlag
stripAgentFlag,
type ResolvedSidecar
} from './cli.js';

// The conflict-detection path inside parseAgentArgs uses the module-local
Expand DownExpand Up@@ -279,7 +282,10 @@ test('CLEAN_IGNORED_PATTERNS: covers the declared repo-level claude config files
'CLAUDE.md',
'CLAUDE.local.md',
'.claude',
'.mcp.json'
'.mcp.json',
// AGENTS.md hidden so per-persona sidecar materialization into the
// mount doesn't leak the user's real-cwd file in or sync back out.
'AGENTS.md'
]);
});

Expand DownExpand Up@@ -319,7 +325,11 @@ test('SKILL_INSTALL_IGNORED_PATTERNS: keeps skill-install artifacts out of the r
'.opencode',
'.skills',
'prpm.lock',
'skills-lock.json'
'skills-lock.json',
// AGENTS.md (opencode sidecar) materialized into the mount; hide so
// the user's real-cwd file doesn't copy in and the persona-written
// file doesn't sync back.
'AGENTS.md'
]);
});

Expand DownExpand Up@@ -602,6 +612,102 @@ test('configureGitForMount: empty patterns is a no-op', () => {
assert.doesNotThrow(() => configureGitForMount('/nonexistent-path', []));
});

test('buildSidecarBody: overwrite mode returns persona content as-is', () => {
const sidecar: ResolvedSidecar = {
mountFile: 'CLAUDE.md',
personaContent: '# Persona\n',
mode: 'overwrite'
};
// Even if a real-cwd file exists, overwrite must ignore it.
const dir = mkdtempSync(join(tmpdir(), 'aw-sidecar-'));
try {
writeFileSync(join(dir, 'CLAUDE.md'), '# Real\n', 'utf8');
assert.equal(buildSidecarBody(sidecar, dir), '# Persona\n');
} finally {
rmSync(dir, { recursive: true, force: true });
}
});

test('buildSidecarBody: extend mode prepends real-cwd content with separator', () => {
const sidecar: ResolvedSidecar = {
mountFile: 'CLAUDE.md',
personaContent: '# Persona\n',
mode: 'extend'
};
const dir = mkdtempSync(join(tmpdir(), 'aw-sidecar-'));
try {
writeFileSync(join(dir, 'CLAUDE.md'), '# Real\n', 'utf8');
assert.equal(buildSidecarBody(sidecar, dir), '# Real\n\n\n---\n\n# Persona\n');
} finally {
rmSync(dir, { recursive: true, force: true });
}
});

test('buildSidecarBody: extend mode degrades to overwrite when real file is missing', () => {
const sidecar: ResolvedSidecar = {
mountFile: 'AGENTS.md',
personaContent: '# Only persona\n',
mode: 'extend'
};
const dir = mkdtempSync(join(tmpdir(), 'aw-sidecar-'));
try {
assert.equal(buildSidecarBody(sidecar, dir), '# Only persona\n');
} finally {
rmSync(dir, { recursive: true, force: true });
}
});

test('loadSidecarForSelection: prefers inlined Content over path; selects by harness', () => {
const baseRuntime = {
harness: 'claude' as const,
model: 'claude-3-5-sonnet',
systemPrompt: 'You are a test persona.',
harnessSettings: { reasoning: 'medium' as const, timeoutSeconds: 300 }
};
const selection = {
personaId: 'p',
tier: 'best' as const,
runtime: baseRuntime,
skills: [],
rationale: 'test',
claudeMdContent: '# Inlined\n',
claudeMdMode: 'overwrite' as const
};
const { sidecar } = loadSidecarForSelection(selection);
assert.ok(sidecar);
assert.equal(sidecar.mountFile, 'CLAUDE.md');
assert.equal(sidecar.personaContent, '# Inlined\n');
assert.equal(sidecar.mode, 'overwrite');

// codex harness gets nothing
const codexSelection = {
...selection,
runtime: { ...baseRuntime, harness: 'codex' as const }
};
const out = loadSidecarForSelection(codexSelection);
assert.equal(out.sidecar, undefined);
});

test('loadSidecarForSelection: opencode picks agentsMd, not claudeMd', () => {
const selection = {
personaId: 'p',
tier: 'best' as const,
runtime: {
harness: 'opencode' as const,
model: 'gpt-5.2',
systemPrompt: 'X',
harnessSettings: { reasoning: 'medium' as const, timeoutSeconds: 300 }
},
skills: [],
rationale: 'test',
claudeMdContent: '# claude\n',
agentsMdContent: '# agents\n'
};
const { sidecar } = loadSidecarForSelection(selection);
assert.equal(sidecar?.mountFile, 'AGENTS.md');
assert.equal(sidecar?.personaContent, '# agents\n');
});

test('main: codex sessions never engage the sandbox mount', async () => {
// npm-provenance-publisher@best runs on codex; codex has no sandbox mount
// support, so the run continues down the non-mount spawn path (which then
Expand Down
158 changes: 154 additions & 4 deletions packages/cli/src/cli.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ import {
PERSONA_TAGS,
PERSONA_TIERS,
personaCatalog,
resolveSidecar,
routingProfiles,
useSelection,
type Harness,
Expand All@@ -27,7 +28,8 @@ import {
type PersonaSelection,
type PersonaSpec,
type PersonaTag,
type PersonaTier
type PersonaTier,
type SidecarMdMode
} from '@agentworkforce/workload-router';
import {
buildInteractiveSpec,
Expand DownExpand Up@@ -240,6 +242,7 @@ function buildSelection(spec: PersonaSpec, tier: PersonaTier, kind: 'repo' | 'lo
...rawRuntime,
systemPrompt: resolveSystemPromptPlaceholders(rawRuntime.systemPrompt, rawRuntime.harness)
};
const sidecar = resolveSidecar(spec, tier);
return {
personaId: spec.id,
tier,
Expand All@@ -250,7 +253,17 @@ function buildSelection(spec: PersonaSpec, tier: PersonaTier, kind: 'repo' | 'lo
...(spec.env ? { env: spec.env } : {}),
...(spec.mcpServers ? { mcpServers: spec.mcpServers } : {}),
...(spec.permissions ? { permissions: spec.permissions } : {}),
...(spec.mount ? { mount: spec.mount } : {})
...(spec.mount ? { mount: spec.mount } : {}),
...(sidecar.claudeMd ? { claudeMd: sidecar.claudeMd } : {}),
...(sidecar.claudeMdContent ? { claudeMdContent: sidecar.claudeMdContent } : {}),
...(sidecar.claudeMd || sidecar.claudeMdContent
? { claudeMdMode: sidecar.claudeMdMode }
: {}),
...(sidecar.agentsMd ? { agentsMd: sidecar.agentsMd } : {}),
...(sidecar.agentsMdContent ? { agentsMdContent: sidecar.agentsMdContent } : {}),
...(sidecar.agentsMd || sidecar.agentsMdContent
? { agentsMdMode: sidecar.agentsMdMode }
: {})
};
}

Expand DownExpand Up@@ -431,7 +444,12 @@ export const CLEAN_IGNORED_PATTERNS = [
'CLAUDE.md',
'CLAUDE.local.md',
'.claude',
'.mcp.json'
'.mcp.json',
// Per-persona AGENTS.md sidecars get materialized into the mount when
// running under opencode; without this the user's real-cwd AGENTS.md
// would copy in (masking the persona content) and writes from
// onBeforeLaunch would sync back out.
'AGENTS.md'
] as const;

/**
Expand All@@ -456,7 +474,11 @@ export const SKILL_INSTALL_IGNORED_PATTERNS = [
'.skills',
// provider lockfiles written at the repo root
'prpm.lock',
'skills-lock.json'
'skills-lock.json',
// Per-persona AGENTS.md sidecars (opencode harness) get materialized
// into the mount; hide so the real-cwd AGENTS.md isn't copied in and
// the persona-written copy doesn't sync back out.
'AGENTS.md'
] as const;

export interface RelayfileMountPatterns {
Expand DownExpand Up@@ -570,6 +592,113 @@ export function configureGitForMount(mountDir: string, patterns: readonly string
}
}

/**
* Persona-supplied sidecar markdown materialized into a sandbox mount.
* Pure data carrier — `runInteractive` translates it into the on-disk
* write inside `onBeforeLaunch` (mount path) and warns/skips when the
* harness has no mount (codex / `--install-in-repo`).
*/
export interface ResolvedSidecar {
/** Filename inside the mount: `CLAUDE.md` (claude) or `AGENTS.md` (opencode). */
mountFile: 'CLAUDE.md' | 'AGENTS.md';
/** Persona-author content. Already inlined for built-ins; read from disk for local. */
personaContent: string;
mode: SidecarMdMode;
}

/**
* Resolve the sidecar for a given selection + harness, returning the
* persona-author content the runtime should materialize into the mount.
* Returns `{}` when no sidecar applies (no path/content set, or harness
* doesn't support sidecar files at all). Read errors surface as a warning
* string so the caller can drop the sidecar gracefully rather than
* failing the whole session.
*/
export function loadSidecarForSelection(
selection: PersonaSelection
): { sidecar?: ResolvedSidecar; warning?: string } {
const harness = selection.runtime.harness;
if (harness !== 'claude' && harness !== 'opencode') return {};
if (harness === 'claude') {
if (selection.claudeMdContent) {
return {
sidecar: {
mountFile: 'CLAUDE.md',
personaContent: selection.claudeMdContent,
mode: selection.claudeMdMode ?? 'overwrite'
}
};
}
if (selection.claudeMd) {
try {
const content = readFileSync(selection.claudeMd, 'utf8');
return {
sidecar: {
mountFile: 'CLAUDE.md',
personaContent: content,
mode: selection.claudeMdMode ?? 'overwrite'
}
};
} catch (err) {
return { warning: `claudeMd: could not read ${selection.claudeMd}: ${(err as Error).message}` };
}
}
return {};
}
if (selection.agentsMdContent) {
return {
sidecar: {
mountFile: 'AGENTS.md',
personaContent: selection.agentsMdContent,
mode: selection.agentsMdMode ?? 'overwrite'
}
};
}
if (selection.agentsMd) {
try {
const content = readFileSync(selection.agentsMd, 'utf8');
return {
sidecar: {
mountFile: 'AGENTS.md',
personaContent: content,
mode: selection.agentsMdMode ?? 'overwrite'
}
};
} catch (err) {
return { warning: `agentsMd: could not read ${selection.agentsMd}: ${(err as Error).message}` };
}
}
return {};
}

/**
* Compute the bytes to write into the mount for a sidecar. In `extend`
* mode, prepends the user's real-cwd file (if any) joined to the persona
* content with `\n\n---\n\n`. Pure — exposed for unit tests.
*/
export function buildSidecarBody(
sidecar: ResolvedSidecar,
realCwdDir: string
): string {
if (sidecar.mode === 'extend') {
const realPath = join(realCwdDir, sidecar.mountFile);
try {
const realContent = readFileSync(realPath, 'utf8');
return `${realContent}\n\n---\n\n${sidecar.personaContent}`;
} catch (err) {
// Only "missing path" errors degrade to overwrite. Real I/O
// problems (EACCES, EISDIR, …) propagate so callers see them
// instead of silently dropping the user's CLAUDE.md/AGENTS.md.
const code = (err as NodeJS.ErrnoException).code;
if (code === 'ENOENT' || code === 'ENOTDIR') {
return sidecar.personaContent;
}
throw err;
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}
return sidecar.personaContent;
}

/**
* Decide whether to run the interactive session inside a
* `@relayfile/local-mount` sandbox.
Expand DownExpand Up@@ -622,6 +751,23 @@ async function runInteractive(
runtime.harness,
options.installInRepo === true
).useClean;
// Per-persona CLAUDE.md / AGENTS.md: load the author content if any. The
// file is materialized into the mount inside onBeforeLaunch (claude/
// opencode default). Without a mount (codex, --install-in-repo) we
// skip-and-warn — writing into the real cwd would pollute the user's
// repo and is explicitly out of scope.
const sidecarLookup = loadSidecarForSelection(effectiveSelection);
if (sidecarLookup.warning) {
process.stderr.write(`warning: ${sidecarLookup.warning}\n`);
}
const resolvedSidecar = useClean ? sidecarLookup.sidecar : undefined;
if (sidecarLookup.sidecar && !useClean) {
process.stderr.write(
`warning: persona declares ${sidecarLookup.sidecar.mountFile} but no sandbox mount is available (` +
`${runtime.harness === 'codex' ? 'codex harness has no mount' : '--install-in-repo disengages the mount'})` +
`; skipping sidecar materialization to avoid writing into your repo.\n`
);
}
// A session dir is needed whenever we either (a) stage skills out-of-repo
// via claude's installRoot, or (b) open a mount. Both engage for claude/
// opencode by default; --install-in-repo disengages both.
Expand DownExpand Up@@ -884,6 +1030,10 @@ async function runInteractive(
mkdirSync(dirname(target), { recursive: true });
writeFileSync(target, file.contents, 'utf8');
}
if (resolvedSidecar) {
const body = buildSidecarBody(resolvedSidecar, process.cwd());
writeFileSync(join(dir, resolvedSidecar.mountFile), body, 'utf8');
}
}
});
return result.exitCode;
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
112 changes: 109 additions & 3 deletions packages/cli/src/cli.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,13 +12,16 @@ import {
assertSafeRelativePath,
buildRelayfileMountPatterns,
buildMountGitExcludeBlock,
buildSidecarBody,
configureGitForMount,
decideCleanMode,
loadSidecarForSelection,
parseAgentArgs,
parseInstallArgs,
parseCreateArgs,
resolveSystemPromptPlaceholders,
stripAgentFlag
stripAgentFlag,
type ResolvedSidecar
} from './cli.js';

// The conflict-detection path inside parseAgentArgs uses the module-local
Expand DownExpand Up@@ -279,7 +282,10 @@ test('CLEAN_IGNORED_PATTERNS: covers the declared repo-level claude config files
'CLAUDE.md',
'CLAUDE.local.md',
'.claude',
'.mcp.json'
'.mcp.json',
// AGENTS.md hidden so per-persona sidecar materialization into the
// mount doesn't leak the user's real-cwd file in or sync back out.
'AGENTS.md'
]);
});

Expand DownExpand Up@@ -319,7 +325,11 @@ test('SKILL_INSTALL_IGNORED_PATTERNS: keeps skill-install artifacts out of the r
'.opencode',
'.skills',
'prpm.lock',
'skills-lock.json'
'skills-lock.json',
// AGENTS.md (opencode sidecar) materialized into the mount; hide so
// the user's real-cwd file doesn't copy in and the persona-written
// file doesn't sync back.
'AGENTS.md'
]);
});

Expand DownExpand Up@@ -602,6 +612,102 @@ test('configureGitForMount: empty patterns is a no-op', () => {
assert.doesNotThrow(() => configureGitForMount('/nonexistent-path', []));
});

test('buildSidecarBody: overwrite mode returns persona content as-is', () => {
const sidecar: ResolvedSidecar = {
mountFile: 'CLAUDE.md',
personaContent: '# Persona\n',
mode: 'overwrite'
};
// Even if a real-cwd file exists, overwrite must ignore it.
const dir = mkdtempSync(join(tmpdir(), 'aw-sidecar-'));
try {
writeFileSync(join(dir, 'CLAUDE.md'), '# Real\n', 'utf8');
assert.equal(buildSidecarBody(sidecar, dir), '# Persona\n');
} finally {
rmSync(dir, { recursive: true, force: true });
}
});

test('buildSidecarBody: extend mode prepends real-cwd content with separator', () => {
const sidecar: ResolvedSidecar = {
mountFile: 'CLAUDE.md',
personaContent: '# Persona\n',
mode: 'extend'
};
const dir = mkdtempSync(join(tmpdir(), 'aw-sidecar-'));
try {
writeFileSync(join(dir, 'CLAUDE.md'), '# Real\n', 'utf8');
assert.equal(buildSidecarBody(sidecar, dir), '# Real\n\n\n---\n\n# Persona\n');
} finally {
rmSync(dir, { recursive: true, force: true });
}
});

test('buildSidecarBody: extend mode degrades to overwrite when real file is missing', () => {
const sidecar: ResolvedSidecar = {
mountFile: 'AGENTS.md',
personaContent: '# Only persona\n',
mode: 'extend'
};
const dir = mkdtempSync(join(tmpdir(), 'aw-sidecar-'));
try {
assert.equal(buildSidecarBody(sidecar, dir), '# Only persona\n');
} finally {
rmSync(dir, { recursive: true, force: true });
}
});

test('loadSidecarForSelection: prefers inlined Content over path; selects by harness', () => {
const baseRuntime = {
harness: 'claude' as const,
model: 'claude-3-5-sonnet',
systemPrompt: 'You are a test persona.',
harnessSettings: { reasoning: 'medium' as const, timeoutSeconds: 300 }
};
const selection = {
personaId: 'p',
tier: 'best' as const,
runtime: baseRuntime,
skills: [],
rationale: 'test',
claudeMdContent: '# Inlined\n',
claudeMdMode: 'overwrite' as const
};
const { sidecar } = loadSidecarForSelection(selection);
assert.ok(sidecar);
assert.equal(sidecar.mountFile, 'CLAUDE.md');
assert.equal(sidecar.personaContent, '# Inlined\n');
assert.equal(sidecar.mode, 'overwrite');

// codex harness gets nothing
const codexSelection = {
...selection,
runtime: { ...baseRuntime, harness: 'codex' as const }
};
const out = loadSidecarForSelection(codexSelection);
assert.equal(out.sidecar, undefined);
});

test('loadSidecarForSelection: opencode picks agentsMd, not claudeMd', () => {
const selection = {
personaId: 'p',
tier: 'best' as const,
runtime: {
harness: 'opencode' as const,
model: 'gpt-5.2',
systemPrompt: 'X',
harnessSettings: { reasoning: 'medium' as const, timeoutSeconds: 300 }
},
skills: [],
rationale: 'test',
claudeMdContent: '# claude\n',
agentsMdContent: '# agents\n'
};
const { sidecar } = loadSidecarForSelection(selection);
assert.equal(sidecar?.mountFile, 'AGENTS.md');
assert.equal(sidecar?.personaContent, '# agents\n');
});

test('main: codex sessions never engage the sandbox mount', async () => {
// npm-provenance-publisher@best runs on codex; codex has no sandbox mount
// support, so the run continues down the non-mount spawn path (which then
Expand Down
158 changes: 154 additions & 4 deletions packages/cli/src/cli.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ import {
PERSONA_TAGS,
PERSONA_TIERS,
personaCatalog,
resolveSidecar,
routingProfiles,
useSelection,
type Harness,
Expand All@@ -27,7 +28,8 @@ import {
type PersonaSelection,
type PersonaSpec,
type PersonaTag,
type PersonaTier
type PersonaTier,
type SidecarMdMode
} from '@agentworkforce/workload-router';
import {
buildInteractiveSpec,
Expand DownExpand Up@@ -240,6 +242,7 @@ function buildSelection(spec: PersonaSpec, tier: PersonaTier, kind: 'repo' | 'lo
...rawRuntime,
systemPrompt: resolveSystemPromptPlaceholders(rawRuntime.systemPrompt, rawRuntime.harness)
};
const sidecar = resolveSidecar(spec, tier);
return {
personaId: spec.id,
tier,
Expand All@@ -250,7 +253,17 @@ function buildSelection(spec: PersonaSpec, tier: PersonaTier, kind: 'repo' | 'lo
...(spec.env ? { env: spec.env } : {}),
...(spec.mcpServers ? { mcpServers: spec.mcpServers } : {}),
...(spec.permissions ? { permissions: spec.permissions } : {}),
...(spec.mount ? { mount: spec.mount } : {})
...(spec.mount ? { mount: spec.mount } : {}),
...(sidecar.claudeMd ? { claudeMd: sidecar.claudeMd } : {}),
...(sidecar.claudeMdContent ? { claudeMdContent: sidecar.claudeMdContent } : {}),
...(sidecar.claudeMd || sidecar.claudeMdContent
? { claudeMdMode: sidecar.claudeMdMode }
: {}),
...(sidecar.agentsMd ? { agentsMd: sidecar.agentsMd } : {}),
...(sidecar.agentsMdContent ? { agentsMdContent: sidecar.agentsMdContent } : {}),
...(sidecar.agentsMd || sidecar.agentsMdContent
? { agentsMdMode: sidecar.agentsMdMode }
: {})
};
}

Expand DownExpand Up@@ -431,7 +444,12 @@ export const CLEAN_IGNORED_PATTERNS = [
'CLAUDE.md',
'CLAUDE.local.md',
'.claude',
'.mcp.json'
'.mcp.json',
// Per-persona AGENTS.md sidecars get materialized into the mount when
// running under opencode; without this the user's real-cwd AGENTS.md
// would copy in (masking the persona content) and writes from
// onBeforeLaunch would sync back out.
'AGENTS.md'
] as const;

/**
Expand All@@ -456,7 +474,11 @@ export const SKILL_INSTALL_IGNORED_PATTERNS = [
'.skills',
// provider lockfiles written at the repo root
'prpm.lock',
'skills-lock.json'
'skills-lock.json',
// Per-persona AGENTS.md sidecars (opencode harness) get materialized
// into the mount; hide so the real-cwd AGENTS.md isn't copied in and
// the persona-written copy doesn't sync back out.
'AGENTS.md'
] as const;

export interface RelayfileMountPatterns {
Expand DownExpand Up@@ -570,6 +592,113 @@ export function configureGitForMount(mountDir: string, patterns: readonly string
}
}

/**
* Persona-supplied sidecar markdown materialized into a sandbox mount.
* Pure data carrier — `runInteractive` translates it into the on-disk
* write inside `onBeforeLaunch` (mount path) and warns/skips when the
* harness has no mount (codex / `--install-in-repo`).
*/
export interface ResolvedSidecar {
/** Filename inside the mount: `CLAUDE.md` (claude) or `AGENTS.md` (opencode). */
mountFile: 'CLAUDE.md' | 'AGENTS.md';
/** Persona-author content. Already inlined for built-ins; read from disk for local. */
personaContent: string;
mode: SidecarMdMode;
}

/**
* Resolve the sidecar for a given selection + harness, returning the
* persona-author content the runtime should materialize into the mount.
* Returns `{}` when no sidecar applies (no path/content set, or harness
* doesn't support sidecar files at all). Read errors surface as a warning
* string so the caller can drop the sidecar gracefully rather than
* failing the whole session.
*/
export function loadSidecarForSelection(
selection: PersonaSelection
): { sidecar?: ResolvedSidecar; warning?: string } {
const harness = selection.runtime.harness;
if (harness !== 'claude' && harness !== 'opencode') return {};
if (harness === 'claude') {
if (selection.claudeMdContent) {
return {
sidecar: {
mountFile: 'CLAUDE.md',
personaContent: selection.claudeMdContent,
mode: selection.claudeMdMode ?? 'overwrite'
}
};
}
if (selection.claudeMd) {
try {
const content = readFileSync(selection.claudeMd, 'utf8');
return {
sidecar: {
mountFile: 'CLAUDE.md',
personaContent: content,
mode: selection.claudeMdMode ?? 'overwrite'
}
};
} catch (err) {
return { warning: `claudeMd: could not read ${selection.claudeMd}: ${(err as Error).message}` };
}
}
return {};
}
if (selection.agentsMdContent) {
return {
sidecar: {
mountFile: 'AGENTS.md',
personaContent: selection.agentsMdContent,
mode: selection.agentsMdMode ?? 'overwrite'
}
};
}
if (selection.agentsMd) {
try {
const content = readFileSync(selection.agentsMd, 'utf8');
return {
sidecar: {
mountFile: 'AGENTS.md',
personaContent: content,
mode: selection.agentsMdMode ?? 'overwrite'
}
};
} catch (err) {
return { warning: `agentsMd: could not read ${selection.agentsMd}: ${(err as Error).message}` };
}
}
return {};
}

/**
* Compute the bytes to write into the mount for a sidecar. In `extend`
* mode, prepends the user's real-cwd file (if any) joined to the persona
* content with `\n\n---\n\n`. Pure — exposed for unit tests.
*/
export function buildSidecarBody(
sidecar: ResolvedSidecar,
realCwdDir: string
): string {
if (sidecar.mode === 'extend') {
const realPath = join(realCwdDir, sidecar.mountFile);
try {
const realContent = readFileSync(realPath, 'utf8');
return `${realContent}\n\n---\n\n${sidecar.personaContent}`;
} catch (err) {
// Only "missing path" errors degrade to overwrite. Real I/O
// problems (EACCES, EISDIR, …) propagate so callers see them
// instead of silently dropping the user's CLAUDE.md/AGENTS.md.
const code = (err as NodeJS.ErrnoException).code;
if (code === 'ENOENT' || code === 'ENOTDIR') {
return sidecar.personaContent;
}
throw err;
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}
return sidecar.personaContent;
}

/**
* Decide whether to run the interactive session inside a
* `@relayfile/local-mount` sandbox.
Expand DownExpand Up@@ -622,6 +751,23 @@ async function runInteractive(
runtime.harness,
options.installInRepo === true
).useClean;
// Per-persona CLAUDE.md / AGENTS.md: load the author content if any. The
// file is materialized into the mount inside onBeforeLaunch (claude/
// opencode default). Without a mount (codex, --install-in-repo) we
// skip-and-warn — writing into the real cwd would pollute the user's
// repo and is explicitly out of scope.
const sidecarLookup = loadSidecarForSelection(effectiveSelection);
if (sidecarLookup.warning) {
process.stderr.write(`warning: ${sidecarLookup.warning}\n`);
}
const resolvedSidecar = useClean ? sidecarLookup.sidecar : undefined;
if (sidecarLookup.sidecar && !useClean) {
process.stderr.write(
`warning: persona declares ${sidecarLookup.sidecar.mountFile} but no sandbox mount is available (` +
`${runtime.harness === 'codex' ? 'codex harness has no mount' : '--install-in-repo disengages the mount'})` +
`; skipping sidecar materialization to avoid writing into your repo.\n`
);
}
// A session dir is needed whenever we either (a) stage skills out-of-repo
// via claude's installRoot, or (b) open a mount. Both engage for claude/
// opencode by default; --install-in-repo disengages both.
Expand DownExpand Up@@ -884,6 +1030,10 @@ async function runInteractive(
mkdirSync(dirname(target), { recursive: true });
writeFileSync(target, file.contents, 'utf8');
}
if (resolvedSidecar) {
const body = buildSidecarBody(resolvedSidecar, process.cwd());
writeFileSync(join(dir, resolvedSidecar.mountFile), body, 'utf8');
}
}
});
return result.exitCode;
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
112 changes: 109 additions & 3 deletions packages/cli/src/cli.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,13 +12,16 @@ import {
assertSafeRelativePath,
buildRelayfileMountPatterns,
buildMountGitExcludeBlock,
buildSidecarBody,
configureGitForMount,
decideCleanMode,
loadSidecarForSelection,
parseAgentArgs,
parseInstallArgs,
parseCreateArgs,
resolveSystemPromptPlaceholders,
stripAgentFlag
stripAgentFlag,
type ResolvedSidecar
} from './cli.js';

// The conflict-detection path inside parseAgentArgs uses the module-local
Expand DownExpand Up@@ -279,7 +282,10 @@ test('CLEAN_IGNORED_PATTERNS: covers the declared repo-level claude config files
'CLAUDE.md',
'CLAUDE.local.md',
'.claude',
'.mcp.json'
'.mcp.json',
// AGENTS.md hidden so per-persona sidecar materialization into the
// mount doesn't leak the user's real-cwd file in or sync back out.
'AGENTS.md'
]);
});

Expand DownExpand Up@@ -319,7 +325,11 @@ test('SKILL_INSTALL_IGNORED_PATTERNS: keeps skill-install artifacts out of the r
'.opencode',
'.skills',
'prpm.lock',
'skills-lock.json'
'skills-lock.json',
// AGENTS.md (opencode sidecar) materialized into the mount; hide so
// the user's real-cwd file doesn't copy in and the persona-written
// file doesn't sync back.
'AGENTS.md'
]);
});

Expand DownExpand Up@@ -602,6 +612,102 @@ test('configureGitForMount: empty patterns is a no-op', () => {
assert.doesNotThrow(() => configureGitForMount('/nonexistent-path', []));
});

test('buildSidecarBody: overwrite mode returns persona content as-is', () => {
const sidecar: ResolvedSidecar = {
mountFile: 'CLAUDE.md',
personaContent: '# Persona\n',
mode: 'overwrite'
};
// Even if a real-cwd file exists, overwrite must ignore it.
const dir = mkdtempSync(join(tmpdir(), 'aw-sidecar-'));
try {
writeFileSync(join(dir, 'CLAUDE.md'), '# Real\n', 'utf8');
assert.equal(buildSidecarBody(sidecar, dir), '# Persona\n');
} finally {
rmSync(dir, { recursive: true, force: true });
}
});

test('buildSidecarBody: extend mode prepends real-cwd content with separator', () => {
const sidecar: ResolvedSidecar = {
mountFile: 'CLAUDE.md',
personaContent: '# Persona\n',
mode: 'extend'
};
const dir = mkdtempSync(join(tmpdir(), 'aw-sidecar-'));
try {
writeFileSync(join(dir, 'CLAUDE.md'), '# Real\n', 'utf8');
assert.equal(buildSidecarBody(sidecar, dir), '# Real\n\n\n---\n\n# Persona\n');
} finally {
rmSync(dir, { recursive: true, force: true });
}
});

test('buildSidecarBody: extend mode degrades to overwrite when real file is missing', () => {
const sidecar: ResolvedSidecar = {
mountFile: 'AGENTS.md',
personaContent: '# Only persona\n',
mode: 'extend'
};
const dir = mkdtempSync(join(tmpdir(), 'aw-sidecar-'));
try {
assert.equal(buildSidecarBody(sidecar, dir), '# Only persona\n');
} finally {
rmSync(dir, { recursive: true, force: true });
}
});

test('loadSidecarForSelection: prefers inlined Content over path; selects by harness', () => {
const baseRuntime = {
harness: 'claude' as const,
model: 'claude-3-5-sonnet',
systemPrompt: 'You are a test persona.',
harnessSettings: { reasoning: 'medium' as const, timeoutSeconds: 300 }
};
const selection = {
personaId: 'p',
tier: 'best' as const,
runtime: baseRuntime,
skills: [],
rationale: 'test',
claudeMdContent: '# Inlined\n',
claudeMdMode: 'overwrite' as const
};
const { sidecar } = loadSidecarForSelection(selection);
assert.ok(sidecar);
assert.equal(sidecar.mountFile, 'CLAUDE.md');
assert.equal(sidecar.personaContent, '# Inlined\n');
assert.equal(sidecar.mode, 'overwrite');

// codex harness gets nothing
const codexSelection = {
...selection,
runtime: { ...baseRuntime, harness: 'codex' as const }
};
const out = loadSidecarForSelection(codexSelection);
assert.equal(out.sidecar, undefined);
});

test('loadSidecarForSelection: opencode picks agentsMd, not claudeMd', () => {
const selection = {
personaId: 'p',
tier: 'best' as const,
runtime: {
harness: 'opencode' as const,
model: 'gpt-5.2',
systemPrompt: 'X',
harnessSettings: { reasoning: 'medium' as const, timeoutSeconds: 300 }
},
skills: [],
rationale: 'test',
claudeMdContent: '# claude\n',
agentsMdContent: '# agents\n'
};
const { sidecar } = loadSidecarForSelection(selection);
assert.equal(sidecar?.mountFile, 'AGENTS.md');
assert.equal(sidecar?.personaContent, '# agents\n');
});

test('main: codex sessions never engage the sandbox mount', async () => {
// npm-provenance-publisher@best runs on codex; codex has no sandbox mount
// support, so the run continues down the non-mount spawn path (which then
Expand Down
158 changes: 154 additions & 4 deletions packages/cli/src/cli.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ import {
PERSONA_TAGS,
PERSONA_TIERS,
personaCatalog,
resolveSidecar,
routingProfiles,
useSelection,
type Harness,
Expand All@@ -27,7 +28,8 @@ import {
type PersonaSelection,
type PersonaSpec,
type PersonaTag,
type PersonaTier
type PersonaTier,
type SidecarMdMode
} from '@agentworkforce/workload-router';
import {
buildInteractiveSpec,
Expand DownExpand Up@@ -240,6 +242,7 @@ function buildSelection(spec: PersonaSpec, tier: PersonaTier, kind: 'repo' | 'lo
...rawRuntime,
systemPrompt: resolveSystemPromptPlaceholders(rawRuntime.systemPrompt, rawRuntime.harness)
};
const sidecar = resolveSidecar(spec, tier);
return {
personaId: spec.id,
tier,
Expand All@@ -250,7 +253,17 @@ function buildSelection(spec: PersonaSpec, tier: PersonaTier, kind: 'repo' | 'lo
...(spec.env ? { env: spec.env } : {}),
...(spec.mcpServers ? { mcpServers: spec.mcpServers } : {}),
...(spec.permissions ? { permissions: spec.permissions } : {}),
...(spec.mount ? { mount: spec.mount } : {})
...(spec.mount ? { mount: spec.mount } : {}),
...(sidecar.claudeMd ? { claudeMd: sidecar.claudeMd } : {}),
...(sidecar.claudeMdContent ? { claudeMdContent: sidecar.claudeMdContent } : {}),
...(sidecar.claudeMd || sidecar.claudeMdContent
? { claudeMdMode: sidecar.claudeMdMode }
: {}),
...(sidecar.agentsMd ? { agentsMd: sidecar.agentsMd } : {}),
...(sidecar.agentsMdContent ? { agentsMdContent: sidecar.agentsMdContent } : {}),
...(sidecar.agentsMd || sidecar.agentsMdContent
? { agentsMdMode: sidecar.agentsMdMode }
: {})
};
}

Expand DownExpand Up@@ -431,7 +444,12 @@ export const CLEAN_IGNORED_PATTERNS = [
'CLAUDE.md',
'CLAUDE.local.md',
'.claude',
'.mcp.json'
'.mcp.json',
// Per-persona AGENTS.md sidecars get materialized into the mount when
// running under opencode; without this the user's real-cwd AGENTS.md
// would copy in (masking the persona content) and writes from
// onBeforeLaunch would sync back out.
'AGENTS.md'
] as const;

/**
Expand All@@ -456,7 +474,11 @@ export const SKILL_INSTALL_IGNORED_PATTERNS = [
'.skills',
// provider lockfiles written at the repo root
'prpm.lock',
'skills-lock.json'
'skills-lock.json',
// Per-persona AGENTS.md sidecars (opencode harness) get materialized
// into the mount; hide so the real-cwd AGENTS.md isn't copied in and
// the persona-written copy doesn't sync back out.
'AGENTS.md'
] as const;

export interface RelayfileMountPatterns {
Expand DownExpand Up@@ -570,6 +592,113 @@ export function configureGitForMount(mountDir: string, patterns: readonly string
}
}

/**
* Persona-supplied sidecar markdown materialized into a sandbox mount.
* Pure data carrier — `runInteractive` translates it into the on-disk
* write inside `onBeforeLaunch` (mount path) and warns/skips when the
* harness has no mount (codex / `--install-in-repo`).
*/
export interface ResolvedSidecar {
/** Filename inside the mount: `CLAUDE.md` (claude) or `AGENTS.md` (opencode). */
mountFile: 'CLAUDE.md' | 'AGENTS.md';
/** Persona-author content. Already inlined for built-ins; read from disk for local. */
personaContent: string;
mode: SidecarMdMode;
}

/**
* Resolve the sidecar for a given selection + harness, returning the
* persona-author content the runtime should materialize into the mount.
* Returns `{}` when no sidecar applies (no path/content set, or harness
* doesn't support sidecar files at all). Read errors surface as a warning
* string so the caller can drop the sidecar gracefully rather than
* failing the whole session.
*/
export function loadSidecarForSelection(
selection: PersonaSelection
): { sidecar?: ResolvedSidecar; warning?: string } {
const harness = selection.runtime.harness;
if (harness !== 'claude' && harness !== 'opencode') return {};
if (harness === 'claude') {
if (selection.claudeMdContent) {
return {
sidecar: {
mountFile: 'CLAUDE.md',
personaContent: selection.claudeMdContent,
mode: selection.claudeMdMode ?? 'overwrite'
}
};
}
if (selection.claudeMd) {
try {
const content = readFileSync(selection.claudeMd, 'utf8');
return {
sidecar: {
mountFile: 'CLAUDE.md',
personaContent: content,
mode: selection.claudeMdMode ?? 'overwrite'
}
};
} catch (err) {
return { warning: `claudeMd: could not read ${selection.claudeMd}: ${(err as Error).message}` };
}
}
return {};
}
if (selection.agentsMdContent) {
return {
sidecar: {
mountFile: 'AGENTS.md',
personaContent: selection.agentsMdContent,
mode: selection.agentsMdMode ?? 'overwrite'
}
};
}
if (selection.agentsMd) {
try {
const content = readFileSync(selection.agentsMd, 'utf8');
return {
sidecar: {
mountFile: 'AGENTS.md',
personaContent: content,
mode: selection.agentsMdMode ?? 'overwrite'
}
};
} catch (err) {
return { warning: `agentsMd: could not read ${selection.agentsMd}: ${(err as Error).message}` };
}
}
return {};
}

/**
* Compute the bytes to write into the mount for a sidecar. In `extend`
* mode, prepends the user's real-cwd file (if any) joined to the persona
* content with `\n\n---\n\n`. Pure — exposed for unit tests.
*/
export function buildSidecarBody(
sidecar: ResolvedSidecar,
realCwdDir: string
): string {
if (sidecar.mode === 'extend') {
const realPath = join(realCwdDir, sidecar.mountFile);
try {
const realContent = readFileSync(realPath, 'utf8');
return `${realContent}\n\n---\n\n${sidecar.personaContent}`;
} catch (err) {
// Only "missing path" errors degrade to overwrite. Real I/O
// problems (EACCES, EISDIR, …) propagate so callers see them
// instead of silently dropping the user's CLAUDE.md/AGENTS.md.
const code = (err as NodeJS.ErrnoException).code;
if (code === 'ENOENT' || code === 'ENOTDIR') {
return sidecar.personaContent;
}
throw err;
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}
return sidecar.personaContent;
}

/**
* Decide whether to run the interactive session inside a
* `@relayfile/local-mount` sandbox.
Expand DownExpand Up@@ -622,6 +751,23 @@ async function runInteractive(
runtime.harness,
options.installInRepo === true
).useClean;
// Per-persona CLAUDE.md / AGENTS.md: load the author content if any. The
// file is materialized into the mount inside onBeforeLaunch (claude/
// opencode default). Without a mount (codex, --install-in-repo) we
// skip-and-warn — writing into the real cwd would pollute the user's
// repo and is explicitly out of scope.
const sidecarLookup = loadSidecarForSelection(effectiveSelection);
if (sidecarLookup.warning) {
process.stderr.write(`warning: ${sidecarLookup.warning}\n`);
}
const resolvedSidecar = useClean ? sidecarLookup.sidecar : undefined;
if (sidecarLookup.sidecar && !useClean) {
process.stderr.write(
`warning: persona declares ${sidecarLookup.sidecar.mountFile} but no sandbox mount is available (` +
`${runtime.harness === 'codex' ? 'codex harness has no mount' : '--install-in-repo disengages the mount'})` +
`; skipping sidecar materialization to avoid writing into your repo.\n`
);
}
// A session dir is needed whenever we either (a) stage skills out-of-repo
// via claude's installRoot, or (b) open a mount. Both engage for claude/
// opencode by default; --install-in-repo disengages both.
Expand DownExpand Up@@ -884,6 +1030,10 @@ async function runInteractive(
mkdirSync(dirname(target), { recursive: true });
writeFileSync(target, file.contents, 'utf8');
}
if (resolvedSidecar) {
const body = buildSidecarBody(resolvedSidecar, process.cwd());
writeFileSync(join(dir, resolvedSidecar.mountFile), body, 'utf8');
}
}
});
return result.exitCode;
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
112 changes: 109 additions & 3 deletions packages/cli/src/cli.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,13 +12,16 @@ import {
assertSafeRelativePath,
buildRelayfileMountPatterns,
buildMountGitExcludeBlock,
buildSidecarBody,
configureGitForMount,
decideCleanMode,
loadSidecarForSelection,
parseAgentArgs,
parseInstallArgs,
parseCreateArgs,
resolveSystemPromptPlaceholders,
stripAgentFlag
stripAgentFlag,
type ResolvedSidecar
} from './cli.js';

// The conflict-detection path inside parseAgentArgs uses the module-local
Expand DownExpand Up@@ -279,7 +282,10 @@ test('CLEAN_IGNORED_PATTERNS: covers the declared repo-level claude config files
'CLAUDE.md',
'CLAUDE.local.md',
'.claude',
'.mcp.json'
'.mcp.json',
// AGENTS.md hidden so per-persona sidecar materialization into the
// mount doesn't leak the user's real-cwd file in or sync back out.
'AGENTS.md'
]);
});

Expand DownExpand Up@@ -319,7 +325,11 @@ test('SKILL_INSTALL_IGNORED_PATTERNS: keeps skill-install artifacts out of the r
'.opencode',
'.skills',
'prpm.lock',
'skills-lock.json'
'skills-lock.json',
// AGENTS.md (opencode sidecar) materialized into the mount; hide so
// the user's real-cwd file doesn't copy in and the persona-written
// file doesn't sync back.
'AGENTS.md'
]);
});

Expand DownExpand Up@@ -602,6 +612,102 @@ test('configureGitForMount: empty patterns is a no-op', () => {
assert.doesNotThrow(() => configureGitForMount('/nonexistent-path', []));
});

test('buildSidecarBody: overwrite mode returns persona content as-is', () => {
const sidecar: ResolvedSidecar = {
mountFile: 'CLAUDE.md',
personaContent: '# Persona\n',
mode: 'overwrite'
};
// Even if a real-cwd file exists, overwrite must ignore it.
const dir = mkdtempSync(join(tmpdir(), 'aw-sidecar-'));
try {
writeFileSync(join(dir, 'CLAUDE.md'), '# Real\n', 'utf8');
assert.equal(buildSidecarBody(sidecar, dir), '# Persona\n');
} finally {
rmSync(dir, { recursive: true, force: true });
}
});

test('buildSidecarBody: extend mode prepends real-cwd content with separator', () => {
const sidecar: ResolvedSidecar = {
mountFile: 'CLAUDE.md',
personaContent: '# Persona\n',
mode: 'extend'
};
const dir = mkdtempSync(join(tmpdir(), 'aw-sidecar-'));
try {
writeFileSync(join(dir, 'CLAUDE.md'), '# Real\n', 'utf8');
assert.equal(buildSidecarBody(sidecar, dir), '# Real\n\n\n---\n\n# Persona\n');
} finally {
rmSync(dir, { recursive: true, force: true });
}
});

test('buildSidecarBody: extend mode degrades to overwrite when real file is missing', () => {
const sidecar: ResolvedSidecar = {
mountFile: 'AGENTS.md',
personaContent: '# Only persona\n',
mode: 'extend'
};
const dir = mkdtempSync(join(tmpdir(), 'aw-sidecar-'));
try {
assert.equal(buildSidecarBody(sidecar, dir), '# Only persona\n');
} finally {
rmSync(dir, { recursive: true, force: true });
}
});

test('loadSidecarForSelection: prefers inlined Content over path; selects by harness', () => {
const baseRuntime = {
harness: 'claude' as const,
model: 'claude-3-5-sonnet',
systemPrompt: 'You are a test persona.',
harnessSettings: { reasoning: 'medium' as const, timeoutSeconds: 300 }
};
const selection = {
personaId: 'p',
tier: 'best' as const,
runtime: baseRuntime,
skills: [],
rationale: 'test',
claudeMdContent: '# Inlined\n',
claudeMdMode: 'overwrite' as const
};
const { sidecar } = loadSidecarForSelection(selection);
assert.ok(sidecar);
assert.equal(sidecar.mountFile, 'CLAUDE.md');
assert.equal(sidecar.personaContent, '# Inlined\n');
assert.equal(sidecar.mode, 'overwrite');

// codex harness gets nothing
const codexSelection = {
...selection,
runtime: { ...baseRuntime, harness: 'codex' as const }
};
const out = loadSidecarForSelection(codexSelection);
assert.equal(out.sidecar, undefined);
});

test('loadSidecarForSelection: opencode picks agentsMd, not claudeMd', () => {
const selection = {
personaId: 'p',
tier: 'best' as const,
runtime: {
harness: 'opencode' as const,
model: 'gpt-5.2',
systemPrompt: 'X',
harnessSettings: { reasoning: 'medium' as const, timeoutSeconds: 300 }
},
skills: [],
rationale: 'test',
claudeMdContent: '# claude\n',
agentsMdContent: '# agents\n'
};
const { sidecar } = loadSidecarForSelection(selection);
assert.equal(sidecar?.mountFile, 'AGENTS.md');
assert.equal(sidecar?.personaContent, '# agents\n');
});

test('main: codex sessions never engage the sandbox mount', async () => {
// npm-provenance-publisher@best runs on codex; codex has no sandbox mount
// support, so the run continues down the non-mount spawn path (which then
Expand Down
158 changes: 154 additions & 4 deletions packages/cli/src/cli.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ import {
PERSONA_TAGS,
PERSONA_TIERS,
personaCatalog,
resolveSidecar,
routingProfiles,
useSelection,
type Harness,
Expand All@@ -27,7 +28,8 @@ import {
type PersonaSelection,
type PersonaSpec,
type PersonaTag,
type PersonaTier
type PersonaTier,
type SidecarMdMode
} from '@agentworkforce/workload-router';
import {
buildInteractiveSpec,
Expand DownExpand Up@@ -240,6 +242,7 @@ function buildSelection(spec: PersonaSpec, tier: PersonaTier, kind: 'repo' | 'lo
...rawRuntime,
systemPrompt: resolveSystemPromptPlaceholders(rawRuntime.systemPrompt, rawRuntime.harness)
};
const sidecar = resolveSidecar(spec, tier);
return {
personaId: spec.id,
tier,
Expand All@@ -250,7 +253,17 @@ function buildSelection(spec: PersonaSpec, tier: PersonaTier, kind: 'repo' | 'lo
...(spec.env ? { env: spec.env } : {}),
...(spec.mcpServers ? { mcpServers: spec.mcpServers } : {}),
...(spec.permissions ? { permissions: spec.permissions } : {}),
...(spec.mount ? { mount: spec.mount } : {})
...(spec.mount ? { mount: spec.mount } : {}),
...(sidecar.claudeMd ? { claudeMd: sidecar.claudeMd } : {}),
...(sidecar.claudeMdContent ? { claudeMdContent: sidecar.claudeMdContent } : {}),
...(sidecar.claudeMd || sidecar.claudeMdContent
? { claudeMdMode: sidecar.claudeMdMode }
: {}),
...(sidecar.agentsMd ? { agentsMd: sidecar.agentsMd } : {}),
...(sidecar.agentsMdContent ? { agentsMdContent: sidecar.agentsMdContent } : {}),
...(sidecar.agentsMd || sidecar.agentsMdContent
? { agentsMdMode: sidecar.agentsMdMode }
: {})
};
}

Expand DownExpand Up@@ -431,7 +444,12 @@ export const CLEAN_IGNORED_PATTERNS = [
'CLAUDE.md',
'CLAUDE.local.md',
'.claude',
'.mcp.json'
'.mcp.json',
// Per-persona AGENTS.md sidecars get materialized into the mount when
// running under opencode; without this the user's real-cwd AGENTS.md
// would copy in (masking the persona content) and writes from
// onBeforeLaunch would sync back out.
'AGENTS.md'
] as const;

/**
Expand All@@ -456,7 +474,11 @@ export const SKILL_INSTALL_IGNORED_PATTERNS = [
'.skills',
// provider lockfiles written at the repo root
'prpm.lock',
'skills-lock.json'
'skills-lock.json',
// Per-persona AGENTS.md sidecars (opencode harness) get materialized
// into the mount; hide so the real-cwd AGENTS.md isn't copied in and
// the persona-written copy doesn't sync back out.
'AGENTS.md'
] as const;

export interface RelayfileMountPatterns {
Expand DownExpand Up@@ -570,6 +592,113 @@ export function configureGitForMount(mountDir: string, patterns: readonly string
}
}

/**
* Persona-supplied sidecar markdown materialized into a sandbox mount.
* Pure data carrier — `runInteractive` translates it into the on-disk
* write inside `onBeforeLaunch` (mount path) and warns/skips when the
* harness has no mount (codex / `--install-in-repo`).
*/
export interface ResolvedSidecar {
/** Filename inside the mount: `CLAUDE.md` (claude) or `AGENTS.md` (opencode). */
mountFile: 'CLAUDE.md' | 'AGENTS.md';
/** Persona-author content. Already inlined for built-ins; read from disk for local. */
personaContent: string;
mode: SidecarMdMode;
}

/**
* Resolve the sidecar for a given selection + harness, returning the
* persona-author content the runtime should materialize into the mount.
* Returns `{}` when no sidecar applies (no path/content set, or harness
* doesn't support sidecar files at all). Read errors surface as a warning
* string so the caller can drop the sidecar gracefully rather than
* failing the whole session.
*/
export function loadSidecarForSelection(
selection: PersonaSelection
): { sidecar?: ResolvedSidecar; warning?: string } {
const harness = selection.runtime.harness;
if (harness !== 'claude' && harness !== 'opencode') return {};
if (harness === 'claude') {
if (selection.claudeMdContent) {
return {
sidecar: {
mountFile: 'CLAUDE.md',
personaContent: selection.claudeMdContent,
mode: selection.claudeMdMode ?? 'overwrite'
}
};
}
if (selection.claudeMd) {
try {
const content = readFileSync(selection.claudeMd, 'utf8');
return {
sidecar: {
mountFile: 'CLAUDE.md',
personaContent: content,
mode: selection.claudeMdMode ?? 'overwrite'
}
};
} catch (err) {
return { warning: `claudeMd: could not read ${selection.claudeMd}: ${(err as Error).message}` };
}
}
return {};
}
if (selection.agentsMdContent) {
return {
sidecar: {
mountFile: 'AGENTS.md',
personaContent: selection.agentsMdContent,
mode: selection.agentsMdMode ?? 'overwrite'
}
};
}
if (selection.agentsMd) {
try {
const content = readFileSync(selection.agentsMd, 'utf8');
return {
sidecar: {
mountFile: 'AGENTS.md',
personaContent: content,
mode: selection.agentsMdMode ?? 'overwrite'
}
};
} catch (err) {
return { warning: `agentsMd: could not read ${selection.agentsMd}: ${(err as Error).message}` };
}
}
return {};
}

/**
* Compute the bytes to write into the mount for a sidecar. In `extend`
* mode, prepends the user's real-cwd file (if any) joined to the persona
* content with `\n\n---\n\n`. Pure — exposed for unit tests.
*/
export function buildSidecarBody(
sidecar: ResolvedSidecar,
realCwdDir: string
): string {
if (sidecar.mode === 'extend') {
const realPath = join(realCwdDir, sidecar.mountFile);
try {
const realContent = readFileSync(realPath, 'utf8');
return `${realContent}\n\n---\n\n${sidecar.personaContent}`;
} catch (err) {
// Only "missing path" errors degrade to overwrite. Real I/O
// problems (EACCES, EISDIR, …) propagate so callers see them
// instead of silently dropping the user's CLAUDE.md/AGENTS.md.
const code = (err as NodeJS.ErrnoException).code;
if (code === 'ENOENT' || code === 'ENOTDIR') {
return sidecar.personaContent;
}
throw err;
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}
return sidecar.personaContent;
}

/**
* Decide whether to run the interactive session inside a
* `@relayfile/local-mount` sandbox.
Expand DownExpand Up@@ -622,6 +751,23 @@ async function runInteractive(
runtime.harness,
options.installInRepo === true
).useClean;
// Per-persona CLAUDE.md / AGENTS.md: load the author content if any. The
// file is materialized into the mount inside onBeforeLaunch (claude/
// opencode default). Without a mount (codex, --install-in-repo) we
// skip-and-warn — writing into the real cwd would pollute the user's
// repo and is explicitly out of scope.
const sidecarLookup = loadSidecarForSelection(effectiveSelection);
if (sidecarLookup.warning) {
process.stderr.write(`warning: ${sidecarLookup.warning}\n`);
}
const resolvedSidecar = useClean ? sidecarLookup.sidecar : undefined;
if (sidecarLookup.sidecar && !useClean) {
process.stderr.write(
`warning: persona declares ${sidecarLookup.sidecar.mountFile} but no sandbox mount is available (` +
`${runtime.harness === 'codex' ? 'codex harness has no mount' : '--install-in-repo disengages the mount'})` +
`; skipping sidecar materialization to avoid writing into your repo.\n`
);
}
// A session dir is needed whenever we either (a) stage skills out-of-repo
// via claude's installRoot, or (b) open a mount. Both engage for claude/
// opencode by default; --install-in-repo disengages both.
Expand DownExpand Up@@ -884,6 +1030,10 @@ async function runInteractive(
mkdirSync(dirname(target), { recursive: true });
writeFileSync(target, file.contents, 'utf8');
}
if (resolvedSidecar) {
const body = buildSidecarBody(resolvedSidecar, process.cwd());
writeFileSync(join(dir, resolvedSidecar.mountFile), body, 'utf8');
}
}
});
return result.exitCode;
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
112 changes: 109 additions & 3 deletions packages/cli/src/cli.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,13 +12,16 @@ import {
assertSafeRelativePath,
buildRelayfileMountPatterns,
buildMountGitExcludeBlock,
buildSidecarBody,
configureGitForMount,
decideCleanMode,
loadSidecarForSelection,
parseAgentArgs,
parseInstallArgs,
parseCreateArgs,
resolveSystemPromptPlaceholders,
stripAgentFlag
stripAgentFlag,
type ResolvedSidecar
} from './cli.js';

// The conflict-detection path inside parseAgentArgs uses the module-local
Expand DownExpand Up@@ -279,7 +282,10 @@ test('CLEAN_IGNORED_PATTERNS: covers the declared repo-level claude config files
'CLAUDE.md',
'CLAUDE.local.md',
'.claude',
'.mcp.json'
'.mcp.json',
// AGENTS.md hidden so per-persona sidecar materialization into the
// mount doesn't leak the user's real-cwd file in or sync back out.
'AGENTS.md'
]);
});

Expand DownExpand Up@@ -319,7 +325,11 @@ test('SKILL_INSTALL_IGNORED_PATTERNS: keeps skill-install artifacts out of the r
'.opencode',
'.skills',
'prpm.lock',
'skills-lock.json'
'skills-lock.json',
// AGENTS.md (opencode sidecar) materialized into the mount; hide so
// the user's real-cwd file doesn't copy in and the persona-written
// file doesn't sync back.
'AGENTS.md'
]);
});

Expand DownExpand Up@@ -602,6 +612,102 @@ test('configureGitForMount: empty patterns is a no-op', () => {
assert.doesNotThrow(() => configureGitForMount('/nonexistent-path', []));
});

test('buildSidecarBody: overwrite mode returns persona content as-is', () => {
const sidecar: ResolvedSidecar = {
mountFile: 'CLAUDE.md',
personaContent: '# Persona\n',
mode: 'overwrite'
};
// Even if a real-cwd file exists, overwrite must ignore it.
const dir = mkdtempSync(join(tmpdir(), 'aw-sidecar-'));
try {
writeFileSync(join(dir, 'CLAUDE.md'), '# Real\n', 'utf8');
assert.equal(buildSidecarBody(sidecar, dir), '# Persona\n');
} finally {
rmSync(dir, { recursive: true, force: true });
}
});

test('buildSidecarBody: extend mode prepends real-cwd content with separator', () => {
const sidecar: ResolvedSidecar = {
mountFile: 'CLAUDE.md',
personaContent: '# Persona\n',
mode: 'extend'
};
const dir = mkdtempSync(join(tmpdir(), 'aw-sidecar-'));
try {
writeFileSync(join(dir, 'CLAUDE.md'), '# Real\n', 'utf8');
assert.equal(buildSidecarBody(sidecar, dir), '# Real\n\n\n---\n\n# Persona\n');
} finally {
rmSync(dir, { recursive: true, force: true });
}
});

test('buildSidecarBody: extend mode degrades to overwrite when real file is missing', () => {
const sidecar: ResolvedSidecar = {
mountFile: 'AGENTS.md',
personaContent: '# Only persona\n',
mode: 'extend'
};
const dir = mkdtempSync(join(tmpdir(), 'aw-sidecar-'));
try {
assert.equal(buildSidecarBody(sidecar, dir), '# Only persona\n');
} finally {
rmSync(dir, { recursive: true, force: true });
}
});

test('loadSidecarForSelection: prefers inlined Content over path; selects by harness', () => {
const baseRuntime = {
harness: 'claude' as const,
model: 'claude-3-5-sonnet',
systemPrompt: 'You are a test persona.',
harnessSettings: { reasoning: 'medium' as const, timeoutSeconds: 300 }
};
const selection = {
personaId: 'p',
tier: 'best' as const,
runtime: baseRuntime,
skills: [],
rationale: 'test',
claudeMdContent: '# Inlined\n',
claudeMdMode: 'overwrite' as const
};
const { sidecar } = loadSidecarForSelection(selection);
assert.ok(sidecar);
assert.equal(sidecar.mountFile, 'CLAUDE.md');
assert.equal(sidecar.personaContent, '# Inlined\n');
assert.equal(sidecar.mode, 'overwrite');

// codex harness gets nothing
const codexSelection = {
...selection,
runtime: { ...baseRuntime, harness: 'codex' as const }
};
const out = loadSidecarForSelection(codexSelection);
assert.equal(out.sidecar, undefined);
});

test('loadSidecarForSelection: opencode picks agentsMd, not claudeMd', () => {
const selection = {
personaId: 'p',
tier: 'best' as const,
runtime: {
harness: 'opencode' as const,
model: 'gpt-5.2',
systemPrompt: 'X',
harnessSettings: { reasoning: 'medium' as const, timeoutSeconds: 300 }
},
skills: [],
rationale: 'test',
claudeMdContent: '# claude\n',
agentsMdContent: '# agents\n'
};
const { sidecar } = loadSidecarForSelection(selection);
assert.equal(sidecar?.mountFile, 'AGENTS.md');
assert.equal(sidecar?.personaContent, '# agents\n');
});

test('main: codex sessions never engage the sandbox mount', async () => {
// npm-provenance-publisher@best runs on codex; codex has no sandbox mount
// support, so the run continues down the non-mount spawn path (which then
Expand Down
158 changes: 154 additions & 4 deletions packages/cli/src/cli.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ import {
PERSONA_TAGS,
PERSONA_TIERS,
personaCatalog,
resolveSidecar,
routingProfiles,
useSelection,
type Harness,
Expand All@@ -27,7 +28,8 @@ import {
type PersonaSelection,
type PersonaSpec,
type PersonaTag,
type PersonaTier
type PersonaTier,
type SidecarMdMode
} from '@agentworkforce/workload-router';
import {
buildInteractiveSpec,
Expand DownExpand Up@@ -240,6 +242,7 @@ function buildSelection(spec: PersonaSpec, tier: PersonaTier, kind: 'repo' | 'lo
...rawRuntime,
systemPrompt: resolveSystemPromptPlaceholders(rawRuntime.systemPrompt, rawRuntime.harness)
};
const sidecar = resolveSidecar(spec, tier);
return {
personaId: spec.id,
tier,
Expand All@@ -250,7 +253,17 @@ function buildSelection(spec: PersonaSpec, tier: PersonaTier, kind: 'repo' | 'lo
...(spec.env ? { env: spec.env } : {}),
...(spec.mcpServers ? { mcpServers: spec.mcpServers } : {}),
...(spec.permissions ? { permissions: spec.permissions } : {}),
...(spec.mount ? { mount: spec.mount } : {})
...(spec.mount ? { mount: spec.mount } : {}),
...(sidecar.claudeMd ? { claudeMd: sidecar.claudeMd } : {}),
...(sidecar.claudeMdContent ? { claudeMdContent: sidecar.claudeMdContent } : {}),
...(sidecar.claudeMd || sidecar.claudeMdContent
? { claudeMdMode: sidecar.claudeMdMode }
: {}),
...(sidecar.agentsMd ? { agentsMd: sidecar.agentsMd } : {}),
...(sidecar.agentsMdContent ? { agentsMdContent: sidecar.agentsMdContent } : {}),
...(sidecar.agentsMd || sidecar.agentsMdContent
? { agentsMdMode: sidecar.agentsMdMode }
: {})
};
}

Expand DownExpand Up@@ -431,7 +444,12 @@ export const CLEAN_IGNORED_PATTERNS = [
'CLAUDE.md',
'CLAUDE.local.md',
'.claude',
'.mcp.json'
'.mcp.json',
// Per-persona AGENTS.md sidecars get materialized into the mount when
// running under opencode; without this the user's real-cwd AGENTS.md
// would copy in (masking the persona content) and writes from
// onBeforeLaunch would sync back out.
'AGENTS.md'
] as const;

/**
Expand All@@ -456,7 +474,11 @@ export const SKILL_INSTALL_IGNORED_PATTERNS = [
'.skills',
// provider lockfiles written at the repo root
'prpm.lock',
'skills-lock.json'
'skills-lock.json',
// Per-persona AGENTS.md sidecars (opencode harness) get materialized
// into the mount; hide so the real-cwd AGENTS.md isn't copied in and
// the persona-written copy doesn't sync back out.
'AGENTS.md'
] as const;

export interface RelayfileMountPatterns {
Expand DownExpand Up@@ -570,6 +592,113 @@ export function configureGitForMount(mountDir: string, patterns: readonly string
}
}

/**
* Persona-supplied sidecar markdown materialized into a sandbox mount.
* Pure data carrier — `runInteractive` translates it into the on-disk
* write inside `onBeforeLaunch` (mount path) and warns/skips when the
* harness has no mount (codex / `--install-in-repo`).
*/
export interface ResolvedSidecar {
/** Filename inside the mount: `CLAUDE.md` (claude) or `AGENTS.md` (opencode). */
mountFile: 'CLAUDE.md' | 'AGENTS.md';
/** Persona-author content. Already inlined for built-ins; read from disk for local. */
personaContent: string;
mode: SidecarMdMode;
}

/**
* Resolve the sidecar for a given selection + harness, returning the
* persona-author content the runtime should materialize into the mount.
* Returns `{}` when no sidecar applies (no path/content set, or harness
* doesn't support sidecar files at all). Read errors surface as a warning
* string so the caller can drop the sidecar gracefully rather than
* failing the whole session.
*/
export function loadSidecarForSelection(
selection: PersonaSelection
): { sidecar?: ResolvedSidecar; warning?: string } {
const harness = selection.runtime.harness;
if (harness !== 'claude' && harness !== 'opencode') return {};
if (harness === 'claude') {
if (selection.claudeMdContent) {
return {
sidecar: {
mountFile: 'CLAUDE.md',
personaContent: selection.claudeMdContent,
mode: selection.claudeMdMode ?? 'overwrite'
}
};
}
if (selection.claudeMd) {
try {
const content = readFileSync(selection.claudeMd, 'utf8');
return {
sidecar: {
mountFile: 'CLAUDE.md',
personaContent: content,
mode: selection.claudeMdMode ?? 'overwrite'
}
};
} catch (err) {
return { warning: `claudeMd: could not read ${selection.claudeMd}: ${(err as Error).message}` };
}
}
return {};
}
if (selection.agentsMdContent) {
return {
sidecar: {
mountFile: 'AGENTS.md',
personaContent: selection.agentsMdContent,
mode: selection.agentsMdMode ?? 'overwrite'
}
};
}
if (selection.agentsMd) {
try {
const content = readFileSync(selection.agentsMd, 'utf8');
return {
sidecar: {
mountFile: 'AGENTS.md',
personaContent: content,
mode: selection.agentsMdMode ?? 'overwrite'
}
};
} catch (err) {
return { warning: `agentsMd: could not read ${selection.agentsMd}: ${(err as Error).message}` };
}
}
return {};
}

/**
* Compute the bytes to write into the mount for a sidecar. In `extend`
* mode, prepends the user's real-cwd file (if any) joined to the persona
* content with `\n\n---\n\n`. Pure — exposed for unit tests.
*/
export function buildSidecarBody(
sidecar: ResolvedSidecar,
realCwdDir: string
): string {
if (sidecar.mode === 'extend') {
const realPath = join(realCwdDir, sidecar.mountFile);
try {
const realContent = readFileSync(realPath, 'utf8');
return `${realContent}\n\n---\n\n${sidecar.personaContent}`;
} catch (err) {
// Only "missing path" errors degrade to overwrite. Real I/O
// problems (EACCES, EISDIR, …) propagate so callers see them
// instead of silently dropping the user's CLAUDE.md/AGENTS.md.
const code = (err as NodeJS.ErrnoException).code;
if (code === 'ENOENT' || code === 'ENOTDIR') {
return sidecar.personaContent;
}
throw err;
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}
return sidecar.personaContent;
}

/**
* Decide whether to run the interactive session inside a
* `@relayfile/local-mount` sandbox.
Expand DownExpand Up@@ -622,6 +751,23 @@ async function runInteractive(
runtime.harness,
options.installInRepo === true
).useClean;
// Per-persona CLAUDE.md / AGENTS.md: load the author content if any. The
// file is materialized into the mount inside onBeforeLaunch (claude/
// opencode default). Without a mount (codex, --install-in-repo) we
// skip-and-warn — writing into the real cwd would pollute the user's
// repo and is explicitly out of scope.
const sidecarLookup = loadSidecarForSelection(effectiveSelection);
if (sidecarLookup.warning) {
process.stderr.write(`warning: ${sidecarLookup.warning}\n`);
}
const resolvedSidecar = useClean ? sidecarLookup.sidecar : undefined;
if (sidecarLookup.sidecar && !useClean) {
process.stderr.write(
`warning: persona declares ${sidecarLookup.sidecar.mountFile} but no sandbox mount is available (` +
`${runtime.harness === 'codex' ? 'codex harness has no mount' : '--install-in-repo disengages the mount'})` +
`; skipping sidecar materialization to avoid writing into your repo.\n`
);
}
// A session dir is needed whenever we either (a) stage skills out-of-repo
// via claude's installRoot, or (b) open a mount. Both engage for claude/
// opencode by default; --install-in-repo disengages both.
Expand DownExpand Up@@ -884,6 +1030,10 @@ async function runInteractive(
mkdirSync(dirname(target), { recursive: true });
writeFileSync(target, file.contents, 'utf8');
}
if (resolvedSidecar) {
const body = buildSidecarBody(resolvedSidecar, process.cwd());
writeFileSync(join(dir, resolvedSidecar.mountFile), body, 'utf8');
}
}
});
return result.exitCode;
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
112 changes: 109 additions & 3 deletions packages/cli/src/cli.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,13 +12,16 @@ import {
assertSafeRelativePath,
buildRelayfileMountPatterns,
buildMountGitExcludeBlock,
buildSidecarBody,
configureGitForMount,
decideCleanMode,
loadSidecarForSelection,
parseAgentArgs,
parseInstallArgs,
parseCreateArgs,
resolveSystemPromptPlaceholders,
stripAgentFlag
stripAgentFlag,
type ResolvedSidecar
} from './cli.js';

// The conflict-detection path inside parseAgentArgs uses the module-local
Expand DownExpand Up@@ -279,7 +282,10 @@ test('CLEAN_IGNORED_PATTERNS: covers the declared repo-level claude config files
'CLAUDE.md',
'CLAUDE.local.md',
'.claude',
'.mcp.json'
'.mcp.json',
// AGENTS.md hidden so per-persona sidecar materialization into the
// mount doesn't leak the user's real-cwd file in or sync back out.
'AGENTS.md'
]);
});

Expand DownExpand Up@@ -319,7 +325,11 @@ test('SKILL_INSTALL_IGNORED_PATTERNS: keeps skill-install artifacts out of the r
'.opencode',
'.skills',
'prpm.lock',
'skills-lock.json'
'skills-lock.json',
// AGENTS.md (opencode sidecar) materialized into the mount; hide so
// the user's real-cwd file doesn't copy in and the persona-written
// file doesn't sync back.
'AGENTS.md'
]);
});

Expand DownExpand Up@@ -602,6 +612,102 @@ test('configureGitForMount: empty patterns is a no-op', () => {
assert.doesNotThrow(() => configureGitForMount('/nonexistent-path', []));
});

test('buildSidecarBody: overwrite mode returns persona content as-is', () => {
const sidecar: ResolvedSidecar = {
mountFile: 'CLAUDE.md',
personaContent: '# Persona\n',
mode: 'overwrite'
};
// Even if a real-cwd file exists, overwrite must ignore it.
const dir = mkdtempSync(join(tmpdir(), 'aw-sidecar-'));
try {
writeFileSync(join(dir, 'CLAUDE.md'), '# Real\n', 'utf8');
assert.equal(buildSidecarBody(sidecar, dir), '# Persona\n');
} finally {
rmSync(dir, { recursive: true, force: true });
}
});

test('buildSidecarBody: extend mode prepends real-cwd content with separator', () => {
const sidecar: ResolvedSidecar = {
mountFile: 'CLAUDE.md',
personaContent: '# Persona\n',
mode: 'extend'
};
const dir = mkdtempSync(join(tmpdir(), 'aw-sidecar-'));
try {
writeFileSync(join(dir, 'CLAUDE.md'), '# Real\n', 'utf8');
assert.equal(buildSidecarBody(sidecar, dir), '# Real\n\n\n---\n\n# Persona\n');
} finally {
rmSync(dir, { recursive: true, force: true });
}
});

test('buildSidecarBody: extend mode degrades to overwrite when real file is missing', () => {
const sidecar: ResolvedSidecar = {
mountFile: 'AGENTS.md',
personaContent: '# Only persona\n',
mode: 'extend'
};
const dir = mkdtempSync(join(tmpdir(), 'aw-sidecar-'));
try {
assert.equal(buildSidecarBody(sidecar, dir), '# Only persona\n');
} finally {
rmSync(dir, { recursive: true, force: true });
}
});

test('loadSidecarForSelection: prefers inlined Content over path; selects by harness', () => {
const baseRuntime = {
harness: 'claude' as const,
model: 'claude-3-5-sonnet',
systemPrompt: 'You are a test persona.',
harnessSettings: { reasoning: 'medium' as const, timeoutSeconds: 300 }
};
const selection = {
personaId: 'p',
tier: 'best' as const,
runtime: baseRuntime,
skills: [],
rationale: 'test',
claudeMdContent: '# Inlined\n',
claudeMdMode: 'overwrite' as const
};
const { sidecar } = loadSidecarForSelection(selection);
assert.ok(sidecar);
assert.equal(sidecar.mountFile, 'CLAUDE.md');
assert.equal(sidecar.personaContent, '# Inlined\n');
assert.equal(sidecar.mode, 'overwrite');

// codex harness gets nothing
const codexSelection = {
...selection,
runtime: { ...baseRuntime, harness: 'codex' as const }
};
const out = loadSidecarForSelection(codexSelection);
assert.equal(out.sidecar, undefined);
});

test('loadSidecarForSelection: opencode picks agentsMd, not claudeMd', () => {
const selection = {
personaId: 'p',
tier: 'best' as const,
runtime: {
harness: 'opencode' as const,
model: 'gpt-5.2',
systemPrompt: 'X',
harnessSettings: { reasoning: 'medium' as const, timeoutSeconds: 300 }
},
skills: [],
rationale: 'test',
claudeMdContent: '# claude\n',
agentsMdContent: '# agents\n'
};
const { sidecar } = loadSidecarForSelection(selection);
assert.equal(sidecar?.mountFile, 'AGENTS.md');
assert.equal(sidecar?.personaContent, '# agents\n');
});

test('main: codex sessions never engage the sandbox mount', async () => {
// npm-provenance-publisher@best runs on codex; codex has no sandbox mount
// support, so the run continues down the non-mount spawn path (which then
Expand Down
158 changes: 154 additions & 4 deletions packages/cli/src/cli.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ import {
PERSONA_TAGS,
PERSONA_TIERS,
personaCatalog,
resolveSidecar,
routingProfiles,
useSelection,
type Harness,
Expand All@@ -27,7 +28,8 @@ import {
type PersonaSelection,
type PersonaSpec,
type PersonaTag,
type PersonaTier
type PersonaTier,
type SidecarMdMode
} from '@agentworkforce/workload-router';
import {
buildInteractiveSpec,
Expand DownExpand Up@@ -240,6 +242,7 @@ function buildSelection(spec: PersonaSpec, tier: PersonaTier, kind: 'repo' | 'lo
...rawRuntime,
systemPrompt: resolveSystemPromptPlaceholders(rawRuntime.systemPrompt, rawRuntime.harness)
};
const sidecar = resolveSidecar(spec, tier);
return {
personaId: spec.id,
tier,
Expand All@@ -250,7 +253,17 @@ function buildSelection(spec: PersonaSpec, tier: PersonaTier, kind: 'repo' | 'lo
...(spec.env ? { env: spec.env } : {}),
...(spec.mcpServers ? { mcpServers: spec.mcpServers } : {}),
...(spec.permissions ? { permissions: spec.permissions } : {}),
...(spec.mount ? { mount: spec.mount } : {})
...(spec.mount ? { mount: spec.mount } : {}),
...(sidecar.claudeMd ? { claudeMd: sidecar.claudeMd } : {}),
...(sidecar.claudeMdContent ? { claudeMdContent: sidecar.claudeMdContent } : {}),
...(sidecar.claudeMd || sidecar.claudeMdContent
? { claudeMdMode: sidecar.claudeMdMode }
: {}),
...(sidecar.agentsMd ? { agentsMd: sidecar.agentsMd } : {}),
...(sidecar.agentsMdContent ? { agentsMdContent: sidecar.agentsMdContent } : {}),
...(sidecar.agentsMd || sidecar.agentsMdContent
? { agentsMdMode: sidecar.agentsMdMode }
: {})
};
}

Expand DownExpand Up@@ -431,7 +444,12 @@ export const CLEAN_IGNORED_PATTERNS = [
'CLAUDE.md',
'CLAUDE.local.md',
'.claude',
'.mcp.json'
'.mcp.json',
// Per-persona AGENTS.md sidecars get materialized into the mount when
// running under opencode; without this the user's real-cwd AGENTS.md
// would copy in (masking the persona content) and writes from
// onBeforeLaunch would sync back out.
'AGENTS.md'
] as const;

/**
Expand All@@ -456,7 +474,11 @@ export const SKILL_INSTALL_IGNORED_PATTERNS = [
'.skills',
// provider lockfiles written at the repo root
'prpm.lock',
'skills-lock.json'
'skills-lock.json',
// Per-persona AGENTS.md sidecars (opencode harness) get materialized
// into the mount; hide so the real-cwd AGENTS.md isn't copied in and
// the persona-written copy doesn't sync back out.
'AGENTS.md'
] as const;

export interface RelayfileMountPatterns {
Expand DownExpand Up@@ -570,6 +592,113 @@ export function configureGitForMount(mountDir: string, patterns: readonly string
}
}

/**
* Persona-supplied sidecar markdown materialized into a sandbox mount.
* Pure data carrier — `runInteractive` translates it into the on-disk
* write inside `onBeforeLaunch` (mount path) and warns/skips when the
* harness has no mount (codex / `--install-in-repo`).
*/
export interface ResolvedSidecar {
/** Filename inside the mount: `CLAUDE.md` (claude) or `AGENTS.md` (opencode). */
mountFile: 'CLAUDE.md' | 'AGENTS.md';
/** Persona-author content. Already inlined for built-ins; read from disk for local. */
personaContent: string;
mode: SidecarMdMode;
}

/**
* Resolve the sidecar for a given selection + harness, returning the
* persona-author content the runtime should materialize into the mount.
* Returns `{}` when no sidecar applies (no path/content set, or harness
* doesn't support sidecar files at all). Read errors surface as a warning
* string so the caller can drop the sidecar gracefully rather than
* failing the whole session.
*/
export function loadSidecarForSelection(
selection: PersonaSelection
): { sidecar?: ResolvedSidecar; warning?: string } {
const harness = selection.runtime.harness;
if (harness !== 'claude' && harness !== 'opencode') return {};
if (harness === 'claude') {
if (selection.claudeMdContent) {
return {
sidecar: {
mountFile: 'CLAUDE.md',
personaContent: selection.claudeMdContent,
mode: selection.claudeMdMode ?? 'overwrite'
}
};
}
if (selection.claudeMd) {
try {
const content = readFileSync(selection.claudeMd, 'utf8');
return {
sidecar: {
mountFile: 'CLAUDE.md',
personaContent: content,
mode: selection.claudeMdMode ?? 'overwrite'
}
};
} catch (err) {
return { warning: `claudeMd: could not read ${selection.claudeMd}: ${(err as Error).message}` };
}
}
return {};
}
if (selection.agentsMdContent) {
return {
sidecar: {
mountFile: 'AGENTS.md',
personaContent: selection.agentsMdContent,
mode: selection.agentsMdMode ?? 'overwrite'
}
};
}
if (selection.agentsMd) {
try {
const content = readFileSync(selection.agentsMd, 'utf8');
return {
sidecar: {
mountFile: 'AGENTS.md',
personaContent: content,
mode: selection.agentsMdMode ?? 'overwrite'
}
};
} catch (err) {
return { warning: `agentsMd: could not read ${selection.agentsMd}: ${(err as Error).message}` };
}
}
return {};
}

/**
* Compute the bytes to write into the mount for a sidecar. In `extend`
* mode, prepends the user's real-cwd file (if any) joined to the persona
* content with `\n\n---\n\n`. Pure — exposed for unit tests.
*/
export function buildSidecarBody(
sidecar: ResolvedSidecar,
realCwdDir: string
): string {
if (sidecar.mode === 'extend') {
const realPath = join(realCwdDir, sidecar.mountFile);
try {
const realContent = readFileSync(realPath, 'utf8');
return `${realContent}\n\n---\n\n${sidecar.personaContent}`;
} catch (err) {
// Only "missing path" errors degrade to overwrite. Real I/O
// problems (EACCES, EISDIR, …) propagate so callers see them
// instead of silently dropping the user's CLAUDE.md/AGENTS.md.
const code = (err as NodeJS.ErrnoException).code;
if (code === 'ENOENT' || code === 'ENOTDIR') {
return sidecar.personaContent;
}
throw err;
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}
return sidecar.personaContent;
}

/**
* Decide whether to run the interactive session inside a
* `@relayfile/local-mount` sandbox.
Expand DownExpand Up@@ -622,6 +751,23 @@ async function runInteractive(
runtime.harness,
options.installInRepo === true
).useClean;
// Per-persona CLAUDE.md / AGENTS.md: load the author content if any. The
// file is materialized into the mount inside onBeforeLaunch (claude/
// opencode default). Without a mount (codex, --install-in-repo) we
// skip-and-warn — writing into the real cwd would pollute the user's
// repo and is explicitly out of scope.
const sidecarLookup = loadSidecarForSelection(effectiveSelection);
if (sidecarLookup.warning) {
process.stderr.write(`warning: ${sidecarLookup.warning}\n`);
}
const resolvedSidecar = useClean ? sidecarLookup.sidecar : undefined;
if (sidecarLookup.sidecar && !useClean) {
process.stderr.write(
`warning: persona declares ${sidecarLookup.sidecar.mountFile} but no sandbox mount is available (` +
`${runtime.harness === 'codex' ? 'codex harness has no mount' : '--install-in-repo disengages the mount'})` +
`; skipping sidecar materialization to avoid writing into your repo.\n`
);
}
// A session dir is needed whenever we either (a) stage skills out-of-repo
// via claude's installRoot, or (b) open a mount. Both engage for claude/
// opencode by default; --install-in-repo disengages both.
Expand DownExpand Up@@ -884,6 +1030,10 @@ async function runInteractive(
mkdirSync(dirname(target), { recursive: true });
writeFileSync(target, file.contents, 'utf8');
}
if (resolvedSidecar) {
const body = buildSidecarBody(resolvedSidecar, process.cwd());
writeFileSync(join(dir, resolvedSidecar.mountFile), body, 'utf8');
}
}
});
return result.exitCode;
Expand Down
Loading
Loading