infra-kit 0.1.110 → 0.1.113

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "infra-kit",
   "type": "module",
-  "version": "0.1.110",
+  "version": "0.1.113",
   "description": "infra-kit",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/src/.omc/state/agent-replay-8dd0ad2f-3a90-4158-b9de-ec8e19a7c983.jsonl

@@ -0,0 +1,11 @@
+{"t":0,"agent":"a5fb1bc","agent_type":"architect","event":"agent_start","parent_mode":"none"}
+{"t":0,"agent":"a5fb1bc","agent_type":"architect","event":"agent_stop","success":true,"duration_ms":171283}
+{"t":0,"agent":"ad5fb86","agent_type":"critic","event":"agent_start","parent_mode":"none"}
+{"t":0,"agent":"ad5fb86","agent_type":"critic","event":"agent_stop","success":true,"duration_ms":150448}
+{"t":0,"agent":"ad5fb86","agent_type":"critic","event":"agent_start","parent_mode":"none"}
+{"t":0,"agent":"ad5fb86","agent_type":"critic","event":"agent_stop","success":true,"duration_ms":34852}
+{"t":0,"agent":"system","event":"keyword_detected","keyword":"ralph"}
+{"t":0,"agent":"system","event":"mode_change","mode_from":"none","mode_to":"ralph"}
+{"t":0,"agent":"system","event":"skill_invoked","skill_name":"oh-my-claudecode:cancel"}
+{"t":0,"agent":"system","event":"keyword_detected","keyword":"ralph"}
+{"t":0,"agent":"system","event":"mode_change","mode_from":"none","mode_to":"ralph"}

package/src/.omc/state/idle-notif-cooldown.json

@@ -0,0 +1,3 @@
+{
+  "lastSentAt": "2026-06-21T11:09:39.757Z"
+}

package/src/.omc/state/sessions/8dd0ad2f-3a90-4158-b9de-ec8e19a7c983/mission-state.json

@@ -0,0 +1,79 @@
+{
+  "updatedAt": "2026-06-21T11:08:54.543Z",
+  "missions": [
+    {
+      "id": "session:8dd0ad2f-3a90-4158-b9de-ec8e19a7c983:none",
+      "source": "session",
+      "name": "none",
+      "objective": "Session mission",
+      "createdAt": "2026-06-21T11:00:23.527Z",
+      "updatedAt": "2026-06-21T11:08:54.543Z",
+      "status": "done",
+      "workerCount": 2,
+      "taskCounts": {
+        "total": 2,
+        "pending": 0,
+        "blocked": 0,
+        "inProgress": 0,
+        "completed": 2,
+        "failed": 0
+      },
+      "agents": [
+        {
+          "name": "architect:a5fb1bc",
+          "role": "architect",
+          "ownership": "a5fb1bc4dd2207983",
+          "status": "done",
+          "currentStep": null,
+          "latestUpdate": "completed",
+          "completedSummary": null,
+          "updatedAt": "2026-06-21T11:03:14.810Z"
+        },
+        {
+          "name": "critic:ad5fb86",
+          "role": "critic",
+          "ownership": "ad5fb865bf84b1924",
+          "status": "done",
+          "currentStep": null,
+          "latestUpdate": "completed",
+          "completedSummary": null,
+          "updatedAt": "2026-06-21T11:08:54.543Z"
+        }
+      ],
+      "timeline": [
+        {
+          "id": "session-start:ad5fb865bf84b1924:2026-06-21T11:04:55.259Z",
+          "at": "2026-06-21T11:04:55.259Z",
+          "kind": "update",
+          "agent": "critic:ad5fb86",
+          "detail": "started critic:ad5fb86",
+          "sourceKey": "session-start:ad5fb865bf84b1924"
+        },
+        {
+          "id": "session-stop:ad5fb865bf84b1924:2026-06-21T11:07:25.707Z",
+          "at": "2026-06-21T11:07:25.707Z",
+          "kind": "completion",
+          "agent": "critic:ad5fb86",
+          "detail": "completed",
+          "sourceKey": "session-stop:ad5fb865bf84b1924"
+        },
+        {
+          "id": "session-start:ad5fb865bf84b1924:2026-06-21T11:08:19.691Z",
+          "at": "2026-06-21T11:08:19.691Z",
+          "kind": "update",
+          "agent": "critic:ad5fb86",
+          "detail": "started critic:ad5fb86",
+          "sourceKey": "session-start:ad5fb865bf84b1924"
+        },
+        {
+          "id": "session-stop:ad5fb865bf84b1924:2026-06-21T11:08:54.543Z",
+          "at": "2026-06-21T11:08:54.543Z",
+          "kind": "completion",
+          "agent": "critic:ad5fb86",
+          "detail": "completed",
+          "sourceKey": "session-stop:ad5fb865bf84b1924"
+        }
+      ]
+    }
+  ]
+}

package/src/.omc/state/sessions/8dd0ad2f-3a90-4158-b9de-ec8e19a7c983/pre-tool-advisory-throttle.json

@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "entries": {
+    "79a93d4a2f8f50b95f852280616242fee1855dc99a3c75211917f55e72e95fae": {
+      "last_emitted_at_ms": 1782045856683,
+      "message": "Use parallel execution for independent tasks. Use run_in_background for long operations (npm install, builds, tests)."
+    },
+    "445ed27a3872b681d98190bae61ccb84954e1bc4e140df5370be958dee776b3a": {
+      "last_emitted_at_ms": 1782045791692,
+      "message": "Verify changes work after editing. Test functionality before marking complete."
+    },
+    "466399dafa2d20f60587180bad0a07358eb7f2bce724df0ff682f038ad33f5ad": {
+      "last_emitted_at_ms": 1782045769114,
+      "message": "Read multiple files in parallel when possible for faster analysis."
+    },
+    "1bb6914bc42b891c26d46c8ae2fd4f44071f59862e89dc550f4c82877b700216": {
+      "last_emitted_at_ms": 1782045534124,
+      "message": "The boulder never stops. Continue until all tasks complete."
+    }
+  },
+  "updated_at": "2026-06-21T12:44:16.683Z"
+}

package/src/.omc/state/sessions/8dd0ad2f-3a90-4158-b9de-ec8e19a7c983/ralph-state.json

@@ -0,0 +1,13 @@
+{
+  "active": true,
+  "iteration": 1,
+  "max_iterations": 100,
+  "started_at": "2026-06-21T12:41:30.413Z",
+  "prompt": "/ralph do it",
+  "session_id": "8dd0ad2f-3a90-4158-b9de-ec8e19a7c983",
+  "project_path": "/Users/arthur/projects/infra-kit/apps/infra-kit/cli/src",
+  "linked_ultrawork": true,
+  "awaiting_confirmation": true,
+  "awaiting_confirmation_set_at": "2026-06-21T12:41:30.413Z",
+  "last_checked_at": "2026-06-21T12:41:30.413Z"
+}

package/src/.omc/state/sessions/8dd0ad2f-3a90-4158-b9de-ec8e19a7c983/subagent-tracking-state.json

@@ -0,0 +1,26 @@
+{
+  "agents": [
+    {
+      "agent_id": "a5fb1bc4dd2207983",
+      "agent_type": "oh-my-claudecode:architect",
+      "started_at": "2026-06-21T11:00:23.527Z",
+      "parent_mode": "none",
+      "status": "completed",
+      "completed_at": "2026-06-21T11:03:14.810Z",
+      "duration_ms": 171283
+    },
+    {
+      "agent_id": "ad5fb865bf84b1924",
+      "agent_type": "oh-my-claudecode:critic",
+      "started_at": "2026-06-21T11:08:19.691Z",
+      "parent_mode": "none",
+      "status": "completed",
+      "completed_at": "2026-06-21T11:08:54.543Z",
+      "duration_ms": 34852
+    }
+  ],
+  "total_spawned": 3,
+  "total_completed": 3,
+  "total_failed": 0,
+  "last_updated": "2026-06-21T11:08:54.646Z"
+}

package/src/.omc/state/sessions/8dd0ad2f-3a90-4158-b9de-ec8e19a7c983/ultrawork-state.json

@@ -0,0 +1,11 @@
+{
+  "active": true,
+  "started_at": "2026-06-21T12:41:30.430Z",
+  "original_prompt": "/ralph do it",
+  "session_id": "8dd0ad2f-3a90-4158-b9de-ec8e19a7c983",
+  "project_path": "/Users/arthur/projects/infra-kit/apps/infra-kit/cli/src",
+  "reinforcement_count": 0,
+  "awaiting_confirmation": true,
+  "awaiting_confirmation_set_at": "2026-06-21T12:41:30.430Z",
+  "last_checked_at": "2026-06-21T12:41:30.430Z"
+}

package/src/commands/doctor/.omc/state/sessions/8dd0ad2f-3a90-4158-b9de-ec8e19a7c983/pre-tool-advisory-throttle.json

@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "entries": {
+    "79a93d4a2f8f50b95f852280616242fee1855dc99a3c75211917f55e72e95fae": {
+      "last_emitted_at_ms": 1782040957960,
+      "message": "Use parallel execution for independent tasks. Use run_in_background for long operations (npm install, builds, tests)."
+    },
+    "445ed27a3872b681d98190bae61ccb84954e1bc4e140df5370be958dee776b3a": {
+      "last_emitted_at_ms": 1782040931719,
+      "message": "Verify changes work after editing. Test functionality before marking complete."
+    }
+  },
+  "updated_at": "2026-06-21T11:22:37.960Z"
+}

package/src/commands/doctor/__tests__/check-ide-installed.test.ts

@@ -0,0 +1,142 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { checkIdeInstalled } from '../doctor'
+
+const config = vi.hoisted(() => {
+  return { value: {} as { ide?: unknown }, shouldThrow: false }
+})
+
+vi.mock('src/lib/infra-kit-config', () => {
+  return {
+    resetInfraKitConfigCache: vi.fn(),
+    getInfraKitConfig: vi.fn(() => {
+      if (config.shouldThrow) {
+        return Promise.reject(new Error('bad config'))
+      }
+
+      return Promise.resolve(config.value)
+    }),
+    // Mirror the real normalizer (single → [ide], array → as-is, undefined → []).
+    resolveConfiguredIdes: vi.fn((cfg: { ide?: unknown }) => {
+      const ide = cfg.ide
+
+      if (!ide) return []
+
+      return Array.isArray(ide) ? ide : [ide]
+    }),
+  }
+})
+
+const zx = vi.hoisted(() => {
+  return { shouldThrow: false }
+})
+
+vi.mock('zx', () => {
+  return {
+    $: vi.fn(() => {
+      if (zx.shouldThrow) {
+        return Promise.reject(new Error('command not found'))
+      }
+
+      return Promise.resolve({ stdout: '' })
+    }),
+  }
+})
+
+vi.mock('src/lib/logger', () => {
+  return { logger: { info: vi.fn(), warn: vi.fn(), error: vi.fn() } }
+})
+
+describe('checkIdeInstalled', () => {
+  beforeEach(() => {
+    config.value = {}
+    config.shouldThrow = false
+    zx.shouldThrow = false
+    vi.clearAllMocks()
+  })
+
+  it('passes informationally when no IDE is configured', async () => {
+    config.value = { ide: undefined }
+
+    const result = await checkIdeInstalled()
+
+    expect(result.status).toBe('pass')
+    expect(result.message).toMatch(/No IDE configured/)
+  })
+
+  it('passes when the configured Cursor binary is present', async () => {
+    config.value = { ide: { provider: 'cursor', config: { workspaceConfigPath: 'ws' } } }
+
+    const result = await checkIdeInstalled()
+
+    expect(result.status).toBe('pass')
+    expect(result.message).toMatch(/Installed: Cursor/)
+  })
+
+  it('fails when the configured Cursor binary is missing', async () => {
+    config.value = { ide: { provider: 'cursor', config: { workspaceConfigPath: 'ws' } } }
+    zx.shouldThrow = true
+
+    const result = await checkIdeInstalled()
+
+    expect(result.status).toBe('fail')
+    expect(result.message).toMatch(/Cursor is not installed/)
+  })
+
+  it('passes when the configured Zed binary is present', async () => {
+    config.value = { ide: { provider: 'zed', config: {} } }
+
+    const result = await checkIdeInstalled()
+
+    expect(result.status).toBe('pass')
+    expect(result.message).toMatch(/Installed: Zed/)
+  })
+
+  it('fails when the configured Zed binary is missing', async () => {
+    config.value = { ide: { provider: 'zed', config: {} } }
+    zx.shouldThrow = true
+
+    const result = await checkIdeInstalled()
+
+    expect(result.status).toBe('fail')
+    expect(result.message).toMatch(/Zed is not installed/)
+  })
+
+  it('passes listing all editors when multiple are configured and present', async () => {
+    config.value = {
+      ide: [
+        { provider: 'cursor', config: { workspaceConfigPath: 'ws' } },
+        { provider: 'zed', config: {} },
+      ],
+    }
+
+    const result = await checkIdeInstalled()
+
+    expect(result.status).toBe('pass')
+    expect(result.message).toMatch(/Installed: Cursor, Zed/)
+  })
+
+  it('fails when one of several configured editors is missing', async () => {
+    config.value = {
+      ide: [
+        { provider: 'cursor', config: { workspaceConfigPath: 'ws' } },
+        { provider: 'zed', config: {} },
+      ],
+    }
+    zx.shouldThrow = true
+
+    const result = await checkIdeInstalled()
+
+    expect(result.status).toBe('fail')
+    expect(result.message).toMatch(/Cursor is not installed/)
+  })
+
+  it('passes informationally when the config cannot be read', async () => {
+    config.shouldThrow = true
+
+    const result = await checkIdeInstalled()
+
+    expect(result.status).toBe('pass')
+    expect(result.message).toMatch(/Skipped/)
+  })
+})

package/src/commands/doctor/doctor.ts

@@ -12,7 +12,12 @@ import {
 } from 'src/commands/init/agent-files'
 import { MARKER_END, MARKER_START, buildShellBlock } from 'src/commands/init/init'
 import { getProjectRoot } from 'src/lib/git-utils/git-utils'
-import { getInfraKitConfig, getInfraKitConfigPaths, resetInfraKitConfigCache } from 'src/lib/infra-kit-config'
+import {
+  getInfraKitConfig,
+  getInfraKitConfigPaths,
+  resetInfraKitConfigCache,
+  resolveConfiguredIdes,
+} from 'src/lib/infra-kit-config'
 import { logger } from 'src/lib/logger'
 import { hasManagedBlock } from 'src/lib/managed-block'
 import { defineMcpTool, textContent } from 'src/types'
@@ -155,6 +160,97 @@ const checkUserOverridePath = async (): Promise<CheckResult> => {
   }
 }
 
+interface IdeProbe {
+  ok: boolean
+  label: string
+  failMsg: string
+}
+
+const IDE_PROBE_META: Record<'cursor' | 'zed', { command: string[]; label: string; failMsg: string }> = {
+  cursor: {
+    command: ['cursor', '--version'],
+    label: 'Cursor',
+    failMsg: 'Cursor is not installed. Install from: https://cursor.com/',
+  },
+  zed: {
+    command: ['zed', '--version'],
+    label: 'Zed',
+    failMsg: 'Zed is not installed. Install from: https://zed.dev/',
+  },
+}
+
+const probeIde = async (provider: 'cursor' | 'zed'): Promise<IdeProbe> => {
+  const meta = IDE_PROBE_META[provider]
+
+  try {
+    await $`${meta.command}`
+
+    return { ok: true, label: meta.label, failMsg: meta.failMsg }
+  } catch {
+    return { ok: false, label: meta.label, failMsg: meta.failMsg }
+  }
+}
+
+/**
+ * Check that every editor configured under `ide` is installed. Reads the merged
+ * infra-kit config and probes each matching binary (`cursor`/`zed`). Passes only
+ * if all configured editors are present; fails listing any that are missing.
+ * Informational pass when no IDE is configured or the config can't be read — an
+ * unconfigured editor is a valid setup, and config validity is reported
+ * separately by `checkInfraKitConfigValid`.
+ */
+export const checkIdeInstalled = async (): Promise<CheckResult> => {
+  const name = 'ide installed'
+
+  let providers: ('cursor' | 'zed')[]
+
+  try {
+    resetInfraKitConfigCache()
+    const config = await getInfraKitConfig()
+
+    providers = resolveConfiguredIdes(config).map((ide) => {
+      return ide.provider
+    })
+  } catch {
+    return { name, status: 'pass', message: 'Skipped — infra-kit config could not be read (see config check)' }
+  }
+
+  if (providers.length === 0) {
+    return { name, status: 'pass', message: 'No IDE configured (ide unset)' }
+  }
+
+  const probes = await Promise.all(
+    providers.map((provider) => {
+      return probeIde(provider)
+    }),
+  )
+  const missing = probes.filter((probe) => {
+    return !probe.ok
+  })
+
+  if (missing.length === 0) {
+    return {
+      name,
+      status: 'pass',
+      message: `Installed: ${probes
+        .map((probe) => {
+          return probe.label
+        })
+        .join(', ')}`,
+    }
+  }
+
+  return {
+    name,
+    status: 'fail',
+    message: missing
+      .map((probe) => {
+        return probe.failMsg
+      })
+      .join('; '),
+  }
+}
+
 const RTK_REQUIRED_INDEXES = [1, 2, 3, 5, 7] as const
 
 const checkRtkConfigured = async (): Promise<CheckResult> => {
@@ -312,6 +408,7 @@ export const doctor = async () => {
     checkPnpmWorkspaceVirtualStore(),
     checkInfraKitConfigValid(),
     checkUserOverridePath(),
+    checkIdeInstalled(),
   ])
 
   const checks: CheckResult[] = [...baseChecks, ...(await checkAgentFiles())]

package/src/commands/gh-release-deliver/gh-release-deliver.ts

@@ -11,7 +11,13 @@ import { WORKTREES_DIR_SUFFIX } from 'src/lib/constants'
 import { formatZxError } from 'src/lib/errors/format-zx-error'
 import { OperationError } from 'src/lib/errors/operation-error'
 import { assertManagementContext } from 'src/lib/git-guard'
-import { getCurrentWorktrees, getProjectRoot, getRepoName } from 'src/lib/git-utils'
+import {
+  deleteLocalBranch,
+  deleteRemoteBranch,
+  getCurrentWorktrees,
+  getProjectRoot,
+  getRepoName,
+} from 'src/lib/git-utils'
 import { logger } from 'src/lib/logger'
 import { displayLabel, formatJiraName, formatRcTitle, parseBranchName } from 'src/lib/release-id'
 import type { ReleaseId } from 'src/lib/release-id'
@@ -309,6 +315,30 @@ const syncMainIntoDev = async (): Promise<void> => {
   )
 }
 
+/**
+ * Best-effort cleanup of the delivered release branch, locally and on `origin`.
+ *
+ * Idempotent backstop to `gh pr merge --delete-branch` (in `mergeReleasePR`):
+ * that flag is skipped when the release PR was already merged on a prior
+ * attempt, so an idempotent re-run would otherwise leave the branch behind.
+ * Each delete is isolated — a failure (e.g. the branch checked out in a stray
+ * worktree, or a remote hiccup) logs a warning naming the branch and never
+ * aborts delivery, since the irreversible merge and deploy already happened.
+ */
+const removeDeliveredReleaseBranch = async (branch: string): Promise<void> => {
+  try {
+    await deleteLocalBranch(branch)
+  } catch (error) {
+    logger.warn({ err: formatZxError(error) }, `Failed to delete local branch ${branch} (non-blocking)`)
+  }
+
+  try {
+    await deleteRemoteBranch(branch)
+  } catch (error) {
+    logger.warn({ err: formatZxError(error) }, `Failed to delete remote branch ${branch} (non-blocking)`)
+  }
+}
+
 const deliverJiraReleaseSafely = async (id: ReleaseId): Promise<void> => {
   const jiraConfig = await loadJiraConfigOptional()
 
@@ -395,6 +425,7 @@ export const ghReleaseDeliver = async (args: GhReleaseDeliverArgs) => {
 
   await dispatchDeployWorkflow()
   await syncMainIntoDev()
+  await removeDeliveredReleaseBranch(selectedReleaseBranch)
 
   $.quiet = false
 

package/src/commands/init/.omc/state/sessions/8dd0ad2f-3a90-4158-b9de-ec8e19a7c983/pre-tool-advisory-throttle.json

@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "entries": {
+    "445ed27a3872b681d98190bae61ccb84954e1bc4e140df5370be958dee776b3a": {
+      "last_emitted_at_ms": 1782045486541,
+      "message": "Verify changes work after editing. Test functionality before marking complete."
+    },
+    "79a93d4a2f8f50b95f852280616242fee1855dc99a3c75211917f55e72e95fae": {
+      "last_emitted_at_ms": 1782045453587,
+      "message": "Use parallel execution for independent tasks. Use run_in_background for long operations (npm install, builds, tests)."
+    },
+    "466399dafa2d20f60587180bad0a07358eb7f2bce724df0ff682f038ad33f5ad": {
+      "last_emitted_at_ms": 1782045414993,
+      "message": "Read multiple files in parallel when possible for faster analysis."
+    }
+  },
+  "updated_at": "2026-06-21T12:38:06.541Z"
+}

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 } from '../migrate-config'
+import { migrateLegacyConfig, normalizeLegacyIdeStructures } from '../migrate-config'
 
 vi.mock('src/lib/git-utils', () => {
   return {
@@ -158,3 +158,134 @@ describe('migrateLegacyConfig', () => {
     })
   })
 })
+
+describe('normalizeLegacyIdeStructures', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  afterEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('strips a legacy ide.config.mode from infra-kit.json (single provider) and preserves the rest', async () => {
+    await withTmpRepo(async (tmp) => {
+      const jsonPath = path.join(tmp, 'infra-kit.json')
+
+      writeFile(
+        jsonPath,
+        JSON.stringify({
+          environments: ['dev'],
+          envManagement: { provider: 'doppler', config: { name: 'p' } },
+          ide: { provider: 'cursor', config: { mode: 'workspace', workspaceConfigPath: './ws.code-workspace' } },
+        }),
+      )
+
+      await normalizeLegacyIdeStructures()
+
+      const result = JSON.parse(fs.readFileSync(jsonPath, 'utf-8'))
+
+      expect(result.ide).toEqual({ provider: 'cursor', config: { workspaceConfigPath: './ws.code-workspace' } })
+      // Everything else preserved verbatim.
+      expect(result.environments).toEqual(['dev'])
+      expect(result.envManagement).toEqual({ provider: 'doppler', config: { name: 'p' } })
+    })
+  })
+
+  it('strips ide.config.mode from every entry of an array ide', async () => {
+    await withTmpRepo(async (tmp) => {
+      const jsonPath = path.join(tmp, 'infra-kit.json')
+
+      writeFile(
+        jsonPath,
+        JSON.stringify({
+          environments: ['dev'],
+          envManagement: { provider: 'doppler', config: { name: 'p' } },
+          ide: [
+            { provider: 'cursor', config: { mode: 'workspace', workspaceConfigPath: 'ws' } },
+            { provider: 'zed', config: { mode: 'windows' } },
+          ],
+        }),
+      )
+
+      await normalizeLegacyIdeStructures()
+
+      const result = JSON.parse(fs.readFileSync(jsonPath, 'utf-8'))
+
+      expect(result.ide).toEqual([
+        { provider: 'cursor', config: { workspaceConfigPath: 'ws' } },
+        { provider: 'zed', config: {} },
+      ])
+    })
+  })
+
+  it('normalizes the user-global config layer too', async () => {
+    await withTmpRepo(async (tmp) => {
+      const userGlobalJson = path.join(tmp, '.infra-kit', 'config.json')
+
+      writeFile(userGlobalJson, JSON.stringify({ ide: { provider: 'zed', config: { mode: 'windows' } } }))
+
+      await normalizeLegacyIdeStructures()
+
+      expect(JSON.parse(fs.readFileSync(userGlobalJson, 'utf-8')).ide).toEqual({ provider: 'zed', config: {} })
+    })
+  })
+
+  it('normalizes the user-project config layer too', async () => {
+    await withTmpRepo(async (tmp) => {
+      const projectName = path.basename(tmp)
+      const userProjectJson = path.join(tmp, '.infra-kit', 'projects', projectName, 'infra-kit.json')
+
+      writeFile(
+        userProjectJson,
+        JSON.stringify({ ide: { provider: 'cursor', config: { mode: 'workspace', workspaceConfigPath: 'ws' } } }),
+      )
+
+      await normalizeLegacyIdeStructures()
+
+      expect(JSON.parse(fs.readFileSync(userProjectJson, 'utf-8')).ide).toEqual({
+        provider: 'cursor',
+        config: { workspaceConfigPath: 'ws' },
+      })
+    })
+  })
+
+  it('leaves an already-clean config byte-for-byte untouched (idempotent)', async () => {
+    await withTmpRepo(async (tmp) => {
+      const jsonPath = path.join(tmp, 'infra-kit.json')
+      const json =
+        '{"environments":["dev"],"envManagement":{"provider":"doppler","config":{"name":"p"}},"ide":{"provider":"zed","config":{}}}'
+
+      writeFile(jsonPath, json)
+
+      await normalizeLegacyIdeStructures()
+
+      expect(fs.readFileSync(jsonPath, 'utf-8')).toBe(json)
+    })
+  })
+
+  it('is a no-op when there is no ide config', async () => {
+    await withTmpRepo(async (tmp) => {
+      const jsonPath = path.join(tmp, 'infra-kit.json')
+      const json = '{"environments":["dev"],"envManagement":{"provider":"doppler","config":{"name":"p"}}}'
+
+      writeFile(jsonPath, json)
+
+      await normalizeLegacyIdeStructures()
+
+      expect(fs.readFileSync(jsonPath, 'utf-8')).toBe(json)
+    })
+  })
+
+  it('warns and skips malformed JSON without throwing', async () => {
+    await withTmpRepo(async (tmp) => {
+      const jsonPath = path.join(tmp, 'infra-kit.json')
+
+      writeFile(jsonPath, '{ not valid json ')
+
+      await expect(normalizeLegacyIdeStructures()).resolves.toBeUndefined()
+
+      expect(fs.readFileSync(jsonPath, 'utf-8')).toBe('{ not valid json ')
+    })
+  })
+})