infra-kit 0.1.113 → 0.1.115

package/src/commands/init/__tests__/migrate-config.test.ts

@@ -6,7 +6,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 // Import AFTER the mock is declared so the module picks up the mocked dep.
 import { getProjectRoot, getRepoName } from 'src/lib/git-utils'
 
-import { migrateLegacyConfig, normalizeLegacyIdeStructures } from '../migrate-config'
+import { migrateLegacyConfig, migrateUserGlobalConfigFilename, normalizeLegacyIdeStructures } from '../migrate-config'
 
 vi.mock('src/lib/git-utils', () => {
   return {
@@ -105,8 +105,10 @@ describe('migrateLegacyConfig', () => {
     await withTmpRepo(async (tmp) => {
       const mainYml = path.join(tmp, 'infra-kit.yml')
       const mainJson = path.join(tmp, 'infra-kit.json')
+      // The user-global legacy YAML keeps the old `config.yml` name; its JSON
+      // target is the renamed canonical `infra-kit.json`.
       const userGlobalYml = path.join(tmp, '.infra-kit', 'config.yml')
-      const userGlobalJson = path.join(tmp, '.infra-kit', 'config.json')
+      const userGlobalJson = path.join(tmp, '.infra-kit', 'infra-kit.json')
 
       writeFile(mainYml, MAIN_YML)
       // Invalid override: environments present but empty (min(1) fails).
@@ -151,9 +153,17 @@ describe('migrateLegacyConfig', () => {
 
       await migrateLegacyConfig()
 
-      for (const yml of [mainYml, userGlobalYml, userProjectYml]) {
+      // The user-global legacy `config.yml` migrates to the renamed canonical
+      // `infra-kit.json`; main/userProject keep their `.yml`→`.json` sibling name.
+      const pairs: [yml: string, json: string][] = [
+        [mainYml, path.join(tmp, 'infra-kit.json')],
+        [userGlobalYml, path.join(tmp, '.infra-kit', 'infra-kit.json')],
+        [userProjectYml, path.join(tmp, '.infra-kit', 'projects', projectName, 'infra-kit.json')],
+      ]
+
+      for (const [yml, json] of pairs) {
         expect(fs.existsSync(yml)).toBe(false)
-        expect(fs.existsSync(yml.replace(/\.yml$/, '.json'))).toBe(true)
+        expect(fs.existsSync(json)).toBe(true)
       }
     })
   })
@@ -221,7 +231,7 @@ describe('normalizeLegacyIdeStructures', () => {
 
   it('normalizes the user-global config layer too', async () => {
     await withTmpRepo(async (tmp) => {
-      const userGlobalJson = path.join(tmp, '.infra-kit', 'config.json')
+      const userGlobalJson = path.join(tmp, '.infra-kit', 'infra-kit.json')
 
       writeFile(userGlobalJson, JSON.stringify({ ide: { provider: 'zed', config: { mode: 'windows' } } }))
 
@@ -289,3 +299,124 @@ describe('normalizeLegacyIdeStructures', () => {
     })
   })
 })
+
+describe('migrateUserGlobalConfigFilename', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  afterEach(() => {
+    vi.clearAllMocks()
+  })
+
+  const userGlobalPaths = (tmp: string) => {
+    const dir = path.join(tmp, '.infra-kit')
+
+    return {
+      legacyConfig: path.join(dir, 'config.json'),
+      newConfig: path.join(dir, 'infra-kit.json'),
+      legacyExample: path.join(dir, 'config.example.jsonc'),
+      newExample: path.join(dir, 'infra-kit.example.jsonc'),
+    }
+  }
+
+  it('renames config.json → infra-kit.json (and the example) preserving content', async () => {
+    await withTmpRepo(async (tmp) => {
+      const p = userGlobalPaths(tmp)
+      const configBody = JSON.stringify({ worktrees: { openInCmux: true } })
+      const exampleBody = '// example\n{}\n'
+
+      writeFile(p.legacyConfig, configBody)
+      writeFile(p.legacyExample, exampleBody)
+
+      await migrateUserGlobalConfigFilename()
+
+      expect(fs.existsSync(p.legacyConfig)).toBe(false)
+      expect(fs.existsSync(p.legacyExample)).toBe(false)
+      expect(fs.readFileSync(p.newConfig, 'utf-8')).toBe(configBody)
+      expect(fs.readFileSync(p.newExample, 'utf-8')).toBe(exampleBody)
+    })
+  })
+
+  it('is a no-op when there is no legacy config.json (idempotent)', async () => {
+    await withTmpRepo(async (tmp) => {
+      const p = userGlobalPaths(tmp)
+
+      await expect(migrateUserGlobalConfigFilename()).resolves.toBeUndefined()
+
+      expect(fs.existsSync(p.legacyConfig)).toBe(false)
+      expect(fs.existsSync(p.newConfig)).toBe(false)
+    })
+  })
+
+  it('never overwrites an existing infra-kit.json; leaves the stale config.json in place', async () => {
+    await withTmpRepo(async (tmp) => {
+      const p = userGlobalPaths(tmp)
+      const legacyBody = JSON.stringify({ worktrees: { openInCmux: false } })
+      const activeBody = JSON.stringify({ worktrees: { openInCmux: true } })
+
+      writeFile(p.legacyConfig, legacyBody)
+      writeFile(p.newConfig, activeBody)
+
+      await migrateUserGlobalConfigFilename()
+
+      // Active config untouched (NOT clobbered); legacy file preserved for the user.
+      expect(fs.readFileSync(p.newConfig, 'utf-8')).toBe(activeBody)
+      expect(fs.readFileSync(p.legacyConfig, 'utf-8')).toBe(legacyBody)
+    })
+  })
+
+  it('migrates each file independently (example present, config absent)', async () => {
+    await withTmpRepo(async (tmp) => {
+      const p = userGlobalPaths(tmp)
+      const exampleBody = '// example only\n{}\n'
+
+      writeFile(p.legacyExample, exampleBody)
+
+      await migrateUserGlobalConfigFilename()
+
+      expect(fs.existsSync(p.legacyExample)).toBe(false)
+      expect(fs.readFileSync(p.newExample, 'utf-8')).toBe(exampleBody)
+      // No config.json existed → nothing created on that side.
+      expect(fs.existsSync(p.newConfig)).toBe(false)
+    })
+  })
+
+  it('yAML-legacy upgrade: migrateLegacyConfig + rename land config at infra-kit.json', async () => {
+    await withTmpRepo(async (tmp) => {
+      const p = userGlobalPaths(tmp)
+      const legacyYml = path.join(tmp, '.infra-kit', 'config.yml')
+
+      writeFile(legacyYml, 'worktrees:\n  openInCmux: true\n')
+
+      // migrateLegacyConfig converts the pinned config.yml source → infra-kit.json;
+      // the rename then has nothing left to do for the user-global config.
+      await migrateLegacyConfig()
+      await migrateUserGlobalConfigFilename()
+
+      expect(fs.existsSync(legacyYml)).toBe(false)
+      expect(fs.existsSync(p.legacyConfig)).toBe(false)
+      expect(JSON.parse(fs.readFileSync(p.newConfig, 'utf-8')).worktrees.openInCmux).toBe(true)
+    })
+  })
+
+  it('both-legacy files: YAML wins via migrateLegacyConfig, config.json is left untouched', async () => {
+    await withTmpRepo(async (tmp) => {
+      const p = userGlobalPaths(tmp)
+      const legacyYml = path.join(tmp, '.infra-kit', 'config.yml')
+      const jsonBody = JSON.stringify({ worktrees: { openInCmux: false } })
+
+      writeFile(legacyYml, 'worktrees:\n  openInCmux: true\n')
+      writeFile(p.legacyConfig, jsonBody)
+
+      // init() order: migrateLegacyConfig (yml→infra-kit.json) then the rename.
+      await migrateLegacyConfig()
+      await migrateUserGlobalConfigFilename()
+
+      // YAML content won at infra-kit.json; the rename's no-overwrite guard then
+      // skipped config.json, leaving it untouched (no data loss).
+      expect(JSON.parse(fs.readFileSync(p.newConfig, 'utf-8')).worktrees.openInCmux).toBe(true)
+      expect(fs.readFileSync(p.legacyConfig, 'utf-8')).toBe(jsonBody)
+    })
+  })
+})

package/src/commands/init/__tests__/migrate-factory-config.test.ts

@@ -0,0 +1,93 @@
+import fs from 'node:fs'
+import os from 'node:os'
+import path from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { logger } from 'src/lib/logger'
+
+import { migrateFactoryConfigToJson } from '../migrate-config'
+
+let home: string
+let dir: string
+let oldTs: string
+let newJson: string
+let infoSpy: ReturnType<typeof vi.spyOn>
+
+const messages = (): string => {
+  return infoSpy.mock.calls
+    .map((c: unknown[]) => {
+      return String(c[0])
+    })
+    .join('\n')
+}
+
+beforeEach(() => {
+  home = fs.mkdtempSync(path.join(os.tmpdir(), 'migrate-factory-test-'))
+  vi.spyOn(os, 'homedir').mockReturnValue(home)
+  dir = path.join(home, '.infra-kit')
+  oldTs = path.join(dir, 'vendor.config.ts')
+  newJson = path.join(dir, 'vendor.json')
+  fs.mkdirSync(dir, { recursive: true })
+  infoSpy = vi.spyOn(logger, 'info').mockImplementation(() => {})
+})
+
+afterEach(() => {
+  vi.restoreAllMocks()
+  fs.rmSync(home, { recursive: true, force: true })
+})
+
+describe('migrateFactoryConfigToJson', () => {
+  it('converts an object-form vendor.config.ts to vendor.json and removes the .ts (plain ✓, no warning)', async () => {
+    fs.writeFileSync(oldTs, `export default { workspaceDir: '~/projects', targets: ['repo-a'] }`)
+
+    await migrateFactoryConfigToJson()
+
+    expect(fs.existsSync(oldTs)).toBe(false)
+    expect(JSON.parse(fs.readFileSync(newJson, 'utf-8'))).toEqual({ workspaceDir: '~/projects', targets: ['repo-a'] })
+    expect(messages()).toMatch(/✓ Migrated/)
+    expect(messages()).not.toMatch(/STATIC SNAPSHOT/)
+  })
+
+  it('converts a factory-function form AND emits the STATIC SNAPSHOT warning (not a plain ✓)', async () => {
+    fs.writeFileSync(oldTs, `export default () => ({ workspaceDir: '/abs/repos', targets: ['repo-b'] })`)
+
+    await migrateFactoryConfigToJson()
+
+    expect(fs.existsSync(oldTs)).toBe(false)
+    expect(JSON.parse(fs.readFileSync(newJson, 'utf-8'))).toEqual({ workspaceDir: '/abs/repos', targets: ['repo-b'] })
+    expect(messages()).toMatch(/STATIC SNAPSHOT/)
+    expect(messages()).not.toMatch(/✓ Migrated/)
+  })
+
+  it('is a no-op when there is no legacy vendor.config.ts (idempotent)', async () => {
+    await migrateFactoryConfigToJson()
+
+    expect(fs.existsSync(newJson)).toBe(false)
+    expect(infoSpy).not.toHaveBeenCalled()
+  })
+
+  it('never overwrites an existing vendor.json; leaves the .ts in place and warns', async () => {
+    const existing = { workspaceDir: '~/active', targets: ['keep-me'] }
+
+    fs.writeFileSync(oldTs, `export default { workspaceDir: '~/stale', targets: ['old'] }`)
+    fs.writeFileSync(newJson, JSON.stringify(existing))
+
+    await migrateFactoryConfigToJson()
+
+    // Active vendor.json untouched; the stale .ts is preserved (not deleted).
+    expect(JSON.parse(fs.readFileSync(newJson, 'utf-8'))).toEqual(existing)
+    expect(fs.existsSync(oldTs)).toBe(true)
+    expect(messages()).toMatch(/already exists/)
+  })
+
+  it('leaves an invalid old .ts in place (non-fatal) and writes no vendor.json', async () => {
+    // Missing required `targets` → fails factoryConfigSchema.
+    fs.writeFileSync(oldTs, `export default { workspaceDir: '~/projects' }`)
+
+    await expect(migrateFactoryConfigToJson()).resolves.toBeUndefined()
+
+    expect(fs.existsSync(oldTs)).toBe(true)
+    expect(fs.existsSync(newJson)).toBe(false)
+    expect(messages()).toMatch(/invalid factory config/)
+  })
+})

package/src/commands/init/__tests__/seed-user-global-config.test.ts

@@ -0,0 +1,64 @@
+import fs from 'node:fs'
+import os from 'node:os'
+import path from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { seedUserGlobalConfig } from '../init'
+
+let home: string
+let dir: string
+
+beforeEach(() => {
+  home = fs.mkdtempSync(path.join(os.tmpdir(), 'seed-user-global-test-'))
+  vi.spyOn(os, 'homedir').mockReturnValue(home)
+  dir = path.join(home, '.infra-kit')
+})
+
+afterEach(() => {
+  vi.restoreAllMocks()
+  fs.rmSync(home, { recursive: true, force: true })
+})
+
+describe('seedUserGlobalConfig', () => {
+  it('seeds the infra-kit.json stub and both fully-commented example files', () => {
+    seedUserGlobalConfig()
+
+    expect(fs.readFileSync(path.join(dir, 'infra-kit.json'), 'utf-8')).toBe('{}\n')
+
+    const infraExample = fs.readFileSync(path.join(dir, 'infra-kit.example.jsonc'), 'utf-8')
+
+    // Every recognized infra-kit property is documented.
+    for (const key of ['environments', 'envManagement', 'ide', 'taskManager', 'worktrees']) {
+      expect(infraExample).toContain(key)
+    }
+
+    const vendorExample = fs.readFileSync(path.join(dir, 'vendor.example.jsonc'), 'utf-8')
+
+    expect(vendorExample).toContain('workspaceDir')
+    expect(vendorExample).toContain('targets')
+  })
+
+  it('never seeds a real vendor.json (only the example)', () => {
+    seedUserGlobalConfig()
+
+    expect(fs.existsSync(path.join(dir, 'vendor.example.jsonc'))).toBe(true)
+    expect(fs.existsSync(path.join(dir, 'vendor.json'))).toBe(false)
+  })
+
+  it('refreshes the example files on a re-run while leaving an existing infra-kit.json byte-unchanged', () => {
+    fs.mkdirSync(dir, { recursive: true })
+    const realConfig = '{ "environments": ["dev"] }\n'
+
+    fs.writeFileSync(path.join(dir, 'infra-kit.json'), realConfig)
+    // Stale example a previous version might have written.
+    fs.writeFileSync(path.join(dir, 'infra-kit.example.jsonc'), '// stale\n')
+
+    seedUserGlobalConfig()
+
+    // Real config preserved exactly…
+    expect(fs.readFileSync(path.join(dir, 'infra-kit.json'), 'utf-8')).toBe(realConfig)
+    // …examples refreshed to the current template (no longer "stale").
+    expect(fs.readFileSync(path.join(dir, 'infra-kit.example.jsonc'), 'utf-8')).not.toBe('// stale\n')
+    expect(fs.existsSync(path.join(dir, 'vendor.example.jsonc'))).toBe(true)
+  })
+})

package/src/commands/init/__tests__/shell-body.test.ts

@@ -0,0 +1,30 @@
+import { describe, expect, it } from 'vitest'
+
+import { buildShellBody } from '../init'
+
+describe('buildShellBody — env auto-load shell-startup block', () => {
+  const body = buildShellBody()
+
+  it('defines and invokes the one-shot startup autoload function', () => {
+    expect(body).toContain('_infra_kit_startup_autoload()')
+    expect(body).toContain('_infra_kit_startup_autoload\n')
+  })
+
+  it('gates on a session and skips subshells that already inherited an env', () => {
+    expect(body).toContain('[[ -z "$INFRA_KIT_SESSION" ]] && return')
+    expect(body).toContain('[[ -n "$INFRA_KIT_ENV_CONFIG" ]] && return')
+  })
+
+  it('walks up for infra-kit.json (project/worktree gate) before spawning node', () => {
+    expect(body).toContain('[[ -f "$dir/infra-kit.json" ]]')
+    expect(body).toContain('while [[ "$dir" != / ]]')
+  })
+
+  it('spawns env-autoload backgrounded and silenced (precmd does the sourcing)', () => {
+    expect(body).toContain('infra-kit env-autoload & ) >/dev/null 2>&1')
+  })
+
+  it('keeps the precmd hook as the sole sourcer of env-load.sh', () => {
+    expect(body).toContain('add-zsh-hook precmd _infra_kit_autoload')
+  })
+})

package/src/commands/init/agent-files.ts

@@ -3,7 +3,7 @@ import path from 'node:path'
 
 import { getInfraKitConfigPaths } from 'src/lib/infra-kit-config'
 import { logger } from 'src/lib/logger'
-import { hasManagedBlock, upsertManagedBlock } from 'src/lib/managed-block'
+import { hasManagedBlock, removeManagedBlock, upsertManagedBlock } from 'src/lib/managed-block'
 
 import packageJson from '../../../package.json' with { type: 'json' }
 
@@ -13,23 +13,18 @@ export const AGENTS_MARKER_END = '<!-- infra-kit:end -->'
 /** The version line lives on its own line (OMC `OMC:VERSION:` precedent) so the markers stay constant-matchable. */
 const AGENTS_VERSION_PREFIX = '<!-- infra-kit:version '
 
-/** Separate marker pair for the small `@AGENTS.md` import region injected into CLAUDE.md. */
+/**
+ * Marker pair for the legacy `@AGENTS.md` import region once injected into CLAUDE.md.
+ * Migration-only now: `writeAgentFiles` strips this region so the full guidance body
+ * can take its place. TODO(remove after ~2 release cycles once repos have re-run init).
+ */
 export const AGENTS_IMPORT_START = '<!-- infra-kit:import:begin -->'
 export const AGENTS_IMPORT_END = '<!-- infra-kit:import:end -->'
 
 const AGENTS_FILE = 'AGENTS.md'
 const CLAUDE_FILE = 'CLAUDE.md'
-const CURSOR_RULE_REL = path.join('.cursor', 'rules', 'infra-kit.mdc')
 
-const CURSOR_FRONTMATTER = [
-  '---',
-  'description: infra-kit CLI usage and conventions',
-  'alwaysApply: true',
-  '---',
-  '',
-].join('\n')
-
-export type WriteAction = 'created' | 'updated' | 'unchanged'
+export type WriteAction = 'created' | 'updated' | 'unchanged' | 'removed'
 
 export interface AgentFileWrite {
   path: string
@@ -66,9 +61,9 @@ const buildAgentsBody = (version: string): string => {
     '## Commands (`ik` = `pnpm exec infra-kit`)',
     '',
     '- `ik env-load -c <config>` / `ik env-clear` / `ik env-status` — load, clear, or inspect Doppler env vars for a config (e.g. `dev`). Source the returned file to apply.',
-    '- `ik worktrees-add` / `worktrees-list` / `worktrees-open` / `worktrees-remove` / `worktrees-sync` — manage release and feature git worktrees.',
-    '- `ik release-create` / `release-list` / `release-deploy-all` / `release-deploy-selected` / `release-deliver` / `release-desc-edit` — release-branch and deploy flow.',
-    '- `ik merge-dev` — merge the dev branch into every release branch.',
+    '- `ik worktrees add` / `worktrees list` / `worktrees reload` / `worktrees remove` / `worktrees sync` — manage release and feature git worktrees.',
+    '- `ik release create` / `release list` / `release deploy-all` / `release deploy-selected` / `release deliver` / `release desc-edit` — release-branch and deploy flow.',
+    '- `ik release merge-dev` — merge the dev branch into every release branch.',
     '- `ik audit` — audit packages against `infra-kit.config.ts` rules.',
     '- `ik doctor` — check gh / doppler / aws / rtk install + auth and repo setup.',
     '- `ik init` — (re)install shell integration and regenerate these agent-instruction files.',
@@ -86,6 +81,13 @@ const assertNotSymlink = (filePath: string): void => {
   }
 }
 
+/** Copy a file to a timestamped `<file>.backup.<timestamp>` sibling. */
+const backupFile = (filePath: string): void => {
+  const stamp = new Date().toISOString().replace(/[:.]/g, '-')
+
+  fs.copyFileSync(filePath, `${filePath}.backup.${stamp}`)
+}
+
 /**
  * Write `nextContent` to `filePath` with OMC-style safety: refuse symlinks,
  * back up the prior file with a timestamp before overwriting, and skip the
@@ -99,11 +101,7 @@ const writeManaged = (filePath: string, nextContent: string): WriteAction => {
 
   if (previous === nextContent) return 'unchanged'
 
-  if (existed) {
-    const stamp = new Date().toISOString().replace(/[:.]/g, '-')
-
-    fs.copyFileSync(filePath, `${filePath}.backup.${stamp}`)
-  }
+  if (existed) backupFile(filePath)
 
   fs.mkdirSync(path.dirname(filePath), { recursive: true })
   fs.writeFileSync(filePath, nextContent, 'utf-8')
@@ -124,10 +122,39 @@ const assertBlockPresent = (filePath: string, start: string, end: string): void
 }
 
 /**
- * Generate (or refresh) the repo agent-instruction files: the `AGENTS.md`
- * guidance block, a managed `@AGENTS.md` import region in `CLAUDE.md`
- * (preserving existing content), and a `.cursor/rules` rule file. Repo-gated:
- * a no-op outside an infra-kit repo. Idempotent and non-destructive.
+ * Migrate a legacy `AGENTS.md` now that the guidance lives solely in `CLAUDE.md`.
+ * Strips the infra-kit managed block, then asymmetrically:
+ * - no infra-kit block at all (hand-authored, not ours) → leave untouched (`unchanged`),
+ * - file was purely generated (nothing but whitespace remains) → back up + delete (`removed`),
+ * - hand-authored content surrounds the block → back up + write the block-free remainder (`updated`).
+ * Every destructive path leaves a timestamped `.backup.` first.
+ */
+const migrateLegacyAgentsFile = (agentsPath: string): WriteAction => {
+  if (!fs.existsSync(agentsPath)) return 'unchanged'
+
+  assertNotSymlink(agentsPath)
+
+  const content = fs.readFileSync(agentsPath, 'utf-8')
+  const stripped = removeManagedBlock(content, AGENTS_MARKER_START, AGENTS_MARKER_END)
+
+  if (stripped === null) return 'unchanged'
+
+  if (stripped.trim() === '') {
+    backupFile(agentsPath)
+    fs.rmSync(agentsPath)
+
+    return 'removed'
+  }
+
+  return writeManaged(agentsPath, stripped)
+}
+
+/**
+ * Generate (or refresh) the repo agent-instruction guidance, now hosted solely in
+ * `CLAUDE.md` (preserving hand-authored content outside the markers). Also migrates
+ * legacy setups — stripping the old `@AGENTS.md` import region from `CLAUDE.md` and
+ * backing up/removing a now-redundant `AGENTS.md`. Repo-gated: a no-op outside an
+ * infra-kit repo. Idempotent (within a CLI version) and non-destructive.
  *
  * @example
  * await writeAgentFiles()
@@ -156,40 +183,33 @@ export const writeAgentFiles = async (): Promise<WriteAgentFilesResult> => {
 
   const agentsPath = path.join(root, AGENTS_FILE)
   const claudePath = path.join(root, CLAUDE_FILE)
-  const cursorPath = path.join(root, CURSOR_RULE_REL)
 
-  const agentsContent = upsertManagedBlock({
-    content: readOr(agentsPath, ''),
-    body,
-    startMarker: AGENTS_MARKER_START,
-    endMarker: AGENTS_MARKER_END,
-  })
+  // CLAUDE.md now hosts the full guidance body. Strip the legacy `@AGENTS.md`
+  // import region first (if present), then upsert the body under the begin/end
+  // markers — disjoint marker pairs, so the two operations never collide.
+  let claudeContent = readOr(claudePath, '')
 
-  const claudeContent = upsertManagedBlock({
-    content: readOr(claudePath, ''),
-    body: `@${AGENTS_FILE}`,
-    startMarker: AGENTS_IMPORT_START,
-    endMarker: AGENTS_IMPORT_END,
-  })
-
-  const cursorContent = upsertManagedBlock({
-    content: readOr(cursorPath, CURSOR_FRONTMATTER),
+  claudeContent = removeManagedBlock(claudeContent, AGENTS_IMPORT_START, AGENTS_IMPORT_END) ?? claudeContent
+  claudeContent = upsertManagedBlock({
+    content: claudeContent,
     body,
     startMarker: AGENTS_MARKER_START,
     endMarker: AGENTS_MARKER_END,
+    placement: 'replace-in-place',
   })
 
+  // CLAUDE.md is the only file we manage. A legacy AGENTS.md is migrated away.
   const written: AgentFileWrite[] = [
-    { path: agentsPath, action: writeManaged(agentsPath, agentsContent) },
     { path: claudePath, action: writeManaged(claudePath, claudeContent) },
-    { path: cursorPath, action: writeManaged(cursorPath, cursorContent) },
+    { path: agentsPath, action: migrateLegacyAgentsFile(agentsPath) },
   ]
 
-  assertBlockPresent(agentsPath, AGENTS_MARKER_START, AGENTS_MARKER_END)
-  assertBlockPresent(claudePath, AGENTS_IMPORT_START, AGENTS_IMPORT_END)
-  assertBlockPresent(cursorPath, AGENTS_MARKER_START, AGENTS_MARKER_END)
+  assertBlockPresent(claudePath, AGENTS_MARKER_START, AGENTS_MARKER_END)
 
   for (const file of written) {
+    // Always report CLAUDE.md; only mention a migrated file when it actually changed.
+    if (file.action === 'unchanged' && file.path !== claudePath) continue
+
     logger.info(`  ${file.action.padEnd(9)} ${path.relative(root, file.path)}`)
   }