Turbocharge Claude Code, Cursor, Codex, Gemini & every coding agent: faster, cheaper, with contextual understanding specific to your codebase.
TypeScript ai-agentsanthropicclaude-codeclicode-graphcodexcontext-engineeringcursordeveloper-toolsgeminiknowledge-graphllmmcpmcp-serveropen-sourceopenaitree-sitter
feat(claude): non-clobbering, idempotent settings merge for graft init
Shrish Dwivedi67362c973e0a
diff --git a/src/claude/settings-merge.ts b/src/claude/settings-merge.tsnew file mode 100644index 00000000..560568ca--- /dev/null+++ b/src/claude/settings-merge.ts@@ -0,0 +1,45 @@+type Json = Record<string, any>;++const SL_CMD = 'node "${CLAUDE_PROJECT_DIR:-.}/.claude/helpers/graft-statusline.cjs"';+const FOOTER = 'graft/[\\w./-]+\\.md';++function hookCmd(arg: string): string {+ return `node "\${CLAUDE_PROJECT_DIR:-.}/.claude/helpers/graft-hooks.cjs" ${arg}`;+}+function graftBlocks(): Record<string, Json> {+ return {+ PostToolUse: { matcher: 'Write|Edit|MultiEdit', hooks: [{ type: 'command', command: hookCmd('post-edit'), timeout: 10000 }] },+ UserPromptSubmit: { hooks: [{ type: 'command', command: hookCmd('prompt'), timeout: 8000 }] },+ SessionStart: { hooks: [{ type: 'command', command: hookCmd('session-start'), timeout: 8000 }] },+ Stop: { hooks: [{ type: 'command', command: hookCmd('stop'), timeout: 8000 }] },+ };+}+function isGraftHookEntry(entry: Json): boolean {+ return JSON.stringify(entry ?? '').includes('graft-hooks.cjs');+}++export function mergeGraftSettings(existing: Json): { merged: Json; warnings: string[] } {+ const merged: Json = { ...(existing ?? {}) };+ const warnings: string[] = [];++ if (!merged.statusLine) merged.statusLine = { type: 'command', command: SL_CMD };+ else if (merged.statusLine.command !== SL_CMD)+ warnings.push('Existing statusLine left untouched (a session allows only one). To use Graft, point it at .claude/helpers/graft-statusline.cjs.');++ if (!merged.subagentStatusLine) merged.subagentStatusLine = { type: 'command', command: SL_CMD };+ else if (merged.subagentStatusLine.command !== SL_CMD)+ warnings.push('Existing subagentStatusLine left untouched.');++ merged.hooks = { ...(merged.hooks ?? {}) };+ for (const [event, block] of Object.entries(graftBlocks())) {+ const prior = Array.isArray(merged.hooks[event]) ? merged.hooks[event] : [];+ const foreign = prior.filter((e: Json) => !isGraftHookEntry(e)); // drop old Graft entries → idempotent+ merged.hooks[event] = [...foreign, block];+ }++ const footer = Array.isArray(merged.footerLinksRegexes) ? [...merged.footerLinksRegexes] : [];+ if (!footer.includes(FOOTER)) footer.push(FOOTER);+ merged.footerLinksRegexes = footer;++ return { merged, warnings };+}diff --git a/test/claude-settings-merge.test.ts b/test/claude-settings-merge.test.tsnew file mode 100644index 00000000..310e2ef6--- /dev/null+++ b/test/claude-settings-merge.test.ts@@ -0,0 +1,47 @@+import { test } from 'node:test';+import assert from 'node:assert/strict';+import { mergeGraftSettings } from '../src/claude/settings-merge.js';++const SL = 'node "${CLAUDE_PROJECT_DIR:-.}/.claude/helpers/graft-statusline.cjs"';++test('empty settings gets the full Graft blocks', () => {+ const { merged, warnings } = mergeGraftSettings({});+ assert.equal(merged.statusLine.command, SL);+ assert.equal(merged.subagentStatusLine.command, SL);+ assert.ok(Array.isArray(merged.hooks.PostToolUse));+ assert.equal(merged.hooks.PostToolUse[0].matcher, 'Write|Edit|MultiEdit');+ for (const e of ['PostToolUse', 'UserPromptSubmit', 'SessionStart', 'Stop']) {+ assert.ok(merged.hooks[e][0].hooks[0].command.includes('graft-hooks.cjs'), `${e} wired`);+ }+ assert.ok(merged.footerLinksRegexes.includes('graft/[\\w./-]+\\.md'));+ assert.deepEqual(warnings, []);+});++test('foreign statusLine is preserved with a warning; Graft not forced in', () => {+ const { merged, warnings } = mergeGraftSettings({ statusLine: { type: 'command', command: 'my-bar.sh' } });+ assert.equal(merged.statusLine.command, 'my-bar.sh');+ assert.equal(warnings.length, 1);+ assert.match(warnings[0], /statusLine/);+});++test('existing foreign hooks are preserved; Graft appended', () => {+ const existing = { hooks: { PostToolUse: [{ matcher: 'Bash', hooks: [{ type: 'command', command: 'mine.sh' }] }] } };+ const { merged } = mergeGraftSettings(existing);+ assert.equal(merged.hooks.PostToolUse.length, 2);+ assert.equal(merged.hooks.PostToolUse[0].hooks[0].command, 'mine.sh');+ assert.ok(merged.hooks.PostToolUse[1].hooks[0].command.includes('graft-hooks.cjs'));+});++test('re-running is idempotent (no duplicate Graft entries or footer)', () => {+ const once = mergeGraftSettings({}).merged;+ const twice = mergeGraftSettings(once).merged;+ assert.equal(twice.hooks.PostToolUse.length, 1);+ assert.equal(twice.hooks.Stop.length, 1);+ assert.equal(twice.footerLinksRegexes.filter((r: string) => r === 'graft/[\\w./-]+\\.md').length, 1);+});++test('foreign top-level keys survive', () => {+ const { merged } = mergeGraftSettings({ model: 'claude-sonnet-5', permissions: { allow: ['Bash(ls)'] } });+ assert.equal(merged.model, 'claude-sonnet-5');+ assert.deepEqual(merged.permissions.allow, ['Bash(ls)']);+});