@cat-factory/app 0.60.3 → 0.62.0

package/app/components/panels/inspector/ServiceTestConfig.vue

@@ -7,7 +7,12 @@ import type {
   ProvisionType,
   ServiceProvisioning,
 } from '~/types/domain'
-import type { KubernetesManifestSource, KubernetesRenderer } from '@cat-factory/contracts'
+import type {
+  KubernetesManifestSource,
+  KubernetesRenderer,
+  ProvisioningOverlayCandidate,
+  ProvisioningRecommendation,
+} from '@cat-factory/contracts'
 import RepoTreeBrowser from '~/components/github/RepoTreeBrowser.vue'
 
 // Service-level (frame) configuration: the service-owned PROVISIONING — the provision
@@ -32,7 +37,11 @@ const infra = useInfraConfigStore()
 const { t } = useI18n()
 
 // The custom-manifest-type catalog feeds the `custom` picker. Cheap + shared (coalesced).
-onMounted(() => void infra.ensureLoaded())
+// The repo list backs the detect-from-repo affordance (owner/name lookup).
+onMounted(() => {
+  void infra.ensureLoaded()
+  void github.ensureLoaded()
+})
 
 // The service's declared provision type (absent ⇒ treated as `infraless`: no environment
 // is stood up for the Tester). Switching type MERGES onto the existing provisioning so each
@@ -52,17 +61,22 @@ const kubeRepo = ref('')
 const kubeRef = ref('')
 const kubePath = ref('')
 const kubeRenderer = ref<KubernetesRenderer>('raw')
+// Seed the local kube edit refs from a persisted manifest source. Reused by the per-block
+// watch AND after a detect-from-repo run (which mutates provisioning without changing block.id,
+// so the watch wouldn't re-fire on its own).
+function seedKubeSource(src?: KubernetesManifestSource) {
+  kubeSourceType.value = src?.type ?? 'colocated'
+  kubePath.value = src?.path ?? ''
+  kubeRenderer.value = src?.renderer ?? 'raw'
+  kubeRepo.value = src?.type === 'separate' ? src.repo : ''
+  kubeRef.value = src?.type === 'separate' ? (src.ref ?? '') : ''
+}
 watch(
   () => props.block.id,
-  () => {
-    const src = props.block.provisioning?.manifestSource
-    kubeSourceType.value = src?.type ?? 'colocated'
-    kubePath.value = src?.path ?? ''
-    kubeRenderer.value = src?.renderer ?? 'raw'
-    kubeRepo.value = src?.type === 'separate' ? src.repo : ''
-    kubeRef.value = src?.type === 'separate' ? (src.ref ?? '') : ''
+  () => seedKubeSource(props.block.provisioning?.manifestSource),
+  {
+    immediate: true,
   },
-  { immediate: true },
 )
 const customManifestId = computed(() => props.block.provisioning?.manifestId ?? '')
 const customManifestPath = computed(() => props.block.provisioning?.manifestPath ?? '')
@@ -183,6 +197,65 @@ function applyPicked() {
   browseOpen.value = false
 }
 
+// Auto-detect (slice 11): read the repo checkout-free and propose a NON-BINDING provisioning
+// config. The user always confirms — the result prefills the form (and the kube edit refs) but
+// every field stays editable, and the engine-level URL/namespace suggestions are surfaced
+// read-only (the workspace handler owns them). Nothing is persisted server-side by detection.
+const detecting = ref(false)
+const detectError = ref(false)
+const detectResult = ref<ProvisioningRecommendation | null>(null)
+
+// A detection result is scoped to the inspected block — clear it (and any error) when the
+// selection changes, so block B never shows block A's stale recommendation / overlay chips.
+watch(
+  () => props.block.id,
+  () => {
+    detectResult.value = null
+    detectError.value = false
+  },
+)
+
+async function detectFromRepo() {
+  const ctx = repoContext.value
+  if (!ctx) return
+  const repo = github.repoFor(ctx.githubId)
+  if (!repo) {
+    detectError.value = true
+    return
+  }
+  detecting.value = true
+  detectError.value = false
+  try {
+    const rec = await infra.detectProvisioning({
+      owner: repo.owner,
+      repo: repo.name,
+      ...(ctx.directory ? { directory: ctx.directory } : {}),
+    })
+    detectResult.value = rec
+    // Only prefill when the detector actually inferred something. A `detected: false`
+    // recommendation is `infraless`; applying it would WIPE the service's existing
+    // provisioning (board.updateBlock persists immediately). Leave the current config
+    // untouched and just surface the "nothing found" note.
+    if (rec.detected) {
+      board.updateBlock(props.block.id, { provisioning: rec.provisioning })
+      if (rec.provisioning.type === 'kubernetes') seedKubeSource(rec.provisioning.manifestSource)
+    }
+  } catch {
+    detectError.value = true
+  } finally {
+    detecting.value = false
+  }
+}
+
+// Switch the recommended manifest path to a different overlay candidate (the user's pick).
+function applyOverlay(candidate: ProvisioningOverlayCandidate) {
+  setKubePath(candidate.path)
+}
+
+function provisionTypeLabel(type: ProvisionType): string {
+  return t(`inspector.testConfig.provisionTypes.${type}`)
+}
+
 // A service with no explicit provider inherits the active account's default (else the
 // built-in `cloudflare`); show that as the selected chip so the inherited value is visible.
 const effectiveProvider = computed<CloudProvider>(
@@ -237,6 +310,90 @@ function setSize(value: InstanceSize) {
       </p>
     </div>
 
+    <!-- Auto-detect a recommended provisioning config from the repo (slice 11). Non-binding:
+         it prefills the form below + the kube edit refs; the user confirms/edits everything. -->
+    <div v-if="repoContext" class="space-y-2 rounded border border-slate-800 bg-slate-900/40 p-2">
+      <div class="flex items-center justify-between gap-2">
+        <span class="text-[11px] text-slate-400">{{ t('inspector.testConfig.detect.title') }}</span>
+        <UButton
+          size="xs"
+          variant="soft"
+          color="primary"
+          icon="i-lucide-wand-sparkles"
+          :loading="detecting"
+          @click="detectFromRepo"
+        >
+          {{ t('inspector.testConfig.detect.button') }}
+        </UButton>
+      </div>
+      <p class="text-[11px] leading-snug text-slate-500">
+        {{ t('inspector.testConfig.detect.hint') }}
+      </p>
+
+      <p v-if="detectError" class="text-[11px] text-rose-300/80">
+        {{ t('inspector.testConfig.detect.error') }}
+      </p>
+
+      <template v-if="detectResult && !detecting">
+        <p v-if="!detectResult.detected" class="text-[11px] text-amber-300/80">
+          {{ t('inspector.testConfig.detect.none') }}
+        </p>
+        <template v-else>
+          <p class="text-[11px] text-emerald-300/80">
+            {{
+              t('inspector.testConfig.detect.applied', {
+                type: provisionTypeLabel(detectResult.provisioning.type),
+              })
+            }}
+          </p>
+
+          <div v-if="detectResult.overlayCandidates?.length" class="space-y-1">
+            <span class="text-[11px] text-slate-400">{{
+              t('inspector.testConfig.detect.overlayTitle')
+            }}</span>
+            <div class="flex flex-wrap gap-1">
+              <UButton
+                v-for="o in detectResult.overlayCandidates"
+                :key="o.path"
+                :color="kubePath === o.path ? 'primary' : 'neutral'"
+                :variant="kubePath === o.path ? 'soft' : 'ghost'"
+                size="xs"
+                @click="applyOverlay(o)"
+              >
+                {{ o.name }}
+              </UButton>
+            </div>
+          </div>
+
+          <p v-if="detectResult.urlSource" class="text-[11px] text-slate-500">
+            {{
+              t('inspector.testConfig.detect.urlSource', { source: detectResult.urlSource.source })
+            }}
+          </p>
+          <p v-if="detectResult.namespace" class="text-[11px] text-slate-500">
+            {{ t('inspector.testConfig.detect.namespace', { namespace: detectResult.namespace }) }}
+          </p>
+
+          <ul v-if="detectResult.notes.length" class="space-y-0.5">
+            <li
+              v-for="(n, i) in detectResult.notes"
+              :key="i"
+              class="flex items-start gap-1.5 text-[11px] leading-snug text-slate-500"
+            >
+              <span :class="n.confidence === 'high' ? 'text-emerald-400/70' : 'text-amber-400/70'">
+                {{
+                  n.confidence === 'high'
+                    ? t('inspector.testConfig.detect.confidenceHigh')
+                    : t('inspector.testConfig.detect.confidenceLow')
+                }}
+              </span>
+              <span>{{ n.message }}</span>
+            </li>
+          </ul>
+        </template>
+      </template>
+    </div>
+
     <div v-if="provisionType === 'docker-compose'" class="space-y-2">
       <div class="space-y-1">
         <label class="text-[11px] text-slate-400">{{

package/app/components/sandbox/SandboxPanel.vue

@@ -61,13 +61,14 @@ const name = ref('')
 const selectedPromptIds = ref<string[]>([])
 const selectedModelIds = ref<string[]>([])
 const selectedFixtureIds = ref<string[]>([])
-// The judge model. Empty string = the deployment's routing default (resolved server-side);
+// The judge model. 'default' = the deployment's routing default (resolved server-side);
 // picking one explicitly is the recourse on a deployment that has no default model wired,
-// where leaving it on default makes every run fail at create time.
-const selectedJudgeModel = ref<string>('')
+// where leaving it on default makes every run fail at create time. ('default' is a non-empty
+// sentinel because reka-ui's SelectItem reserves the empty string to clear a selection.)
+const selectedJudgeModel = ref<string>('default')
 
 const judgeModelItems = computed(() => [
-  { label: t('sandbox.deploymentDefault'), value: '' },
+  { label: t('sandbox.deploymentDefault'), value: 'default' },
   ...store.selectableModels.map((m) => ({ label: m.label, value: m.id })),
 ])
 
@@ -112,7 +113,7 @@ async function createAndRun() {
     const created = await store.createExperiment({
       name: name.value.trim() || t('sandbox.defaultRunName', { kind: agentKind.value }),
       agentKind: agentKind.value,
-      judgeModel: selectedJudgeModel.value || undefined,
+      judgeModel: selectedJudgeModel.value === 'default' ? undefined : selectedJudgeModel.value,
       matrix: {
         promptVersionIds: selectedPromptIds.value,
         models: selectedModelIds.value,

package/app/components/settings/KubernetesEngineForm.vue

@@ -60,7 +60,10 @@ const form = reactive({
   servicePort: '',
   gatewayName: '',
   httpRouteName: '',
-  urlScheme: '' as '' | 'http' | 'https',
+  // 'default' is a non-empty sentinel for "let the apiserver/derivation decide the scheme":
+  // reka-ui's SelectItem reserves the empty string to clear a selection, so it can't be an
+  // option value. buildUrl() omits `scheme` entirely when this is 'default'.
+  urlScheme: 'default' as 'default' | 'http' | 'https',
 })
 const apiToken = ref('')
 
@@ -78,7 +81,7 @@ const urlSourceItems = computed(() => [
   },
 ])
 const schemeItems = computed(() => [
-  { label: t('settings.infrastructure.kubernetesEngine.schemeDefault'), value: '' },
+  { label: t('settings.infrastructure.kubernetesEngine.schemeDefault'), value: 'default' },
   { label: 'https', value: 'https' },
   { label: 'http', value: 'http' },
 ])
@@ -107,7 +110,7 @@ watch(
     form.servicePort = typeof url?.port === 'number' ? String(url.port) : ''
     form.gatewayName = typeof url?.gatewayName === 'string' ? url.gatewayName : ''
     form.httpRouteName = typeof url?.httpRouteName === 'string' ? url.httpRouteName : ''
-    if (url?.scheme === 'http' || url?.scheme === 'https') form.urlScheme = url.scheme
+    form.urlScheme = url?.scheme === 'http' || url?.scheme === 'https' ? url.scheme : 'default'
   },
   { immediate: true },
 )
@@ -145,7 +148,7 @@ function buildUrl(): Record<string, unknown> {
   } else {
     if (form.httpRouteName.trim()) url.httpRouteName = form.httpRouteName.trim()
   }
-  if (form.urlScheme) url.scheme = form.urlScheme
+  if (form.urlScheme !== 'default') url.scheme = form.urlScheme
   return url
 }
 

package/app/components/settings/KubernetesEnvironmentForm.vue

@@ -43,7 +43,10 @@ const form = reactive({
   ingressName: '',
   serviceName: '',
   servicePort: '',
-  urlScheme: '' as '' | 'http' | 'https',
+  // 'default' is a non-empty sentinel for "let the apiserver/derivation decide the scheme":
+  // reka-ui's SelectItem reserves the empty string to clear a selection, so it can't be an
+  // option value. The url builder omits `scheme` entirely when this is 'default'.
+  urlScheme: 'default' as 'default' | 'http' | 'https',
 })
 const apiToken = ref('')
 
@@ -66,7 +69,7 @@ const urlSourceItems = computed(() => [
   },
 ])
 const schemeItems = computed(() => [
-  { label: t('settings.providerConnection.kubernetesEnv.schemeDefault'), value: '' },
+  { label: t('settings.providerConnection.kubernetesEnv.schemeDefault'), value: 'default' },
   { label: 'https', value: 'https' },
   { label: 'http', value: 'http' },
 ])
@@ -111,7 +114,8 @@ watch(
       form.serviceName = typeof url.serviceName === 'string' ? url.serviceName : ''
       form.servicePort = typeof url.port === 'number' ? String(url.port) : ''
     }
-    if (url && (url.scheme === 'http' || url.scheme === 'https')) form.urlScheme = url.scheme
+    form.urlScheme =
+      url && (url.scheme === 'http' || url.scheme === 'https') ? url.scheme : 'default'
   },
   { immediate: true },
 )
@@ -171,7 +175,7 @@ function buildUrl(): Record<string, unknown> {
     const port = Number(form.servicePort)
     if (form.servicePort.trim() && Number.isInteger(port)) url.port = port
   }
-  if (form.urlScheme) url.scheme = form.urlScheme
+  if (form.urlScheme !== 'default') url.scheme = form.urlScheme
   return url
 }
 

package/app/components/settings/MergePresetHealthModal.vue

@@ -0,0 +1,166 @@
+<script setup lang="ts">
+// Startup advisory for built-in merge presets that drifted from the catalog. Opened once per
+// session from the board page when `useMergePresetHealth` reports any issue. Lists:
+//   • new built-in presets the workspace doesn't have yet (ADD them);
+//   • built-ins with a newer catalog version available (RESEED to adopt it).
+// Both fixes are the same reseed call (it creates or updates by catalog id). Detection is
+// client-side (see useMergePresetHealth); the actions hit the mergePresets store.
+const { t } = useI18n()
+const ui = useUiStore()
+const presets = useMergePresetsStore()
+const { newPresets, outdated, hasIssues } = useMergePresetHealth()
+const toast = useToast()
+
+const open = computed({
+  get: () => ui.mergePresetHealthOpen,
+  set: (v: boolean) => {
+    if (!v) ui.closeMergePresetHealth()
+  },
+})
+
+// Per-preset in-flight ids, so each row's button shows its own spinner.
+const busy = ref<Set<string>>(new Set())
+const isBusy = (id: string) => busy.value.has(id)
+const anyBusy = computed(() => busy.value.size > 0)
+
+async function reseed(id: string) {
+  busy.value = new Set(busy.value).add(id)
+  try {
+    await presets.reseed(id)
+  } catch (e) {
+    toast.add({
+      title: t('mergePreset.health.toast.reseedFailed'),
+      description: e instanceof Error ? e.message : String(e),
+      icon: 'i-lucide-triangle-alert',
+      color: 'error',
+    })
+  } finally {
+    const next = new Set(busy.value)
+    next.delete(id)
+    busy.value = next
+  }
+}
+
+/** Reseed every advised preset (new + outdated built-ins) in one go. */
+async function reseedAll() {
+  const ids = [...newPresets.value, ...outdated.value].map((i) => i.id)
+  for (const id of new Set(ids)) await reseed(id)
+}
+
+const reseedableCount = computed(
+  () => new Set([...newPresets.value, ...outdated.value].map((i) => i.id)).size,
+)
+</script>
+
+<template>
+  <UModal v-model:open="open" :title="t('mergePreset.health.title')" :ui="{ content: 'max-w-2xl' }">
+    <template #body>
+      <div v-if="!hasIssues" class="py-6 text-center text-sm text-slate-400">
+        <UIcon name="i-lucide-check-circle-2" class="mx-auto mb-2 h-8 w-8 text-emerald-400" />
+        {{ t('mergePreset.health.allValid') }}
+      </div>
+
+      <div v-else class="space-y-5">
+        <!-- New built-in presets the workspace can add. -->
+        <section v-if="newPresets.length" class="space-y-2">
+          <div class="flex items-center gap-2">
+            <UIcon name="i-lucide-sparkles" class="h-4 w-4 text-emerald-400" />
+            <h3 class="text-sm font-semibold text-slate-200">
+              {{ t('mergePreset.health.newHeading') }}
+            </h3>
+          </div>
+          <p class="text-[11px] text-slate-500">{{ t('mergePreset.health.newDescription') }}</p>
+          <ul class="space-y-2">
+            <li
+              v-for="i in newPresets"
+              :key="i.id"
+              class="flex items-center justify-between gap-3 rounded-lg border border-slate-800 bg-slate-900/40 p-3"
+            >
+              <div class="min-w-0">
+                <span class="truncate text-sm font-medium text-slate-100 capitalize">{{
+                  i.name
+                }}</span>
+              </div>
+              <UButton
+                size="xs"
+                color="primary"
+                variant="subtle"
+                icon="i-lucide-plus"
+                :loading="isBusy(i.id)"
+                :disabled="anyBusy"
+                @click="reseed(i.id)"
+              >
+                {{ t('mergePreset.health.add') }}
+              </UButton>
+            </li>
+          </ul>
+        </section>
+
+        <!-- Outdated built-ins: a newer catalog version is available. -->
+        <section v-if="outdated.length" class="space-y-2">
+          <div class="flex items-center gap-2">
+            <UIcon name="i-lucide-arrow-up-circle" class="h-4 w-4 text-amber-400" />
+            <h3 class="text-sm font-semibold text-slate-200">
+              {{ t('mergePreset.health.updatesHeading') }}
+            </h3>
+          </div>
+          <p class="text-[11px] text-slate-500">{{ t('mergePreset.health.updatesDescription') }}</p>
+          <ul class="space-y-2">
+            <li
+              v-for="i in outdated"
+              :key="i.id"
+              class="flex items-center justify-between gap-3 rounded-lg border border-slate-800 bg-slate-900/40 p-3"
+            >
+              <div class="min-w-0">
+                <span class="truncate text-sm font-medium text-slate-100">{{ i.name }}</span>
+                <p class="text-[11px] text-amber-400/80">
+                  {{
+                    t('mergePreset.health.versionAvailable', {
+                      from: i.fromVersion ?? 0,
+                      to: i.toVersion ?? 0,
+                    })
+                  }}
+                </p>
+              </div>
+              <UButton
+                size="xs"
+                color="primary"
+                variant="subtle"
+                icon="i-lucide-rotate-ccw"
+                :loading="isBusy(i.id)"
+                :disabled="anyBusy"
+                @click="reseed(i.id)"
+              >
+                {{ t('mergePreset.health.reseed') }}
+              </UButton>
+            </li>
+          </ul>
+        </section>
+      </div>
+    </template>
+
+    <template #footer>
+      <div class="flex w-full items-center justify-between gap-2">
+        <UButton
+          v-if="reseedableCount > 1"
+          color="primary"
+          variant="ghost"
+          icon="i-lucide-rotate-ccw"
+          :loading="anyBusy"
+          @click="reseedAll"
+        >
+          {{ t('mergePreset.health.reseedAll', { count: reseedableCount }) }}
+        </UButton>
+        <span v-else />
+        <UButton
+          color="neutral"
+          variant="ghost"
+          :disabled="anyBusy"
+          @click="ui.closeMergePresetHealth()"
+        >
+          {{ hasIssues ? t('mergePreset.health.dismiss') : t('mergePreset.health.done') }}
+        </UButton>
+      </div>
+    </template>
+  </UModal>
+</template>

package/app/components/settings/MergeThresholdsPanel.vue

@@ -40,6 +40,7 @@ interface Draft {
   ciMaxAttempts: number
   maxRequirementIterations: number
   maxRequirementConcernAllowed: RequirementConcernLevel
+  autoMergeEnabled: boolean
 }
 const drafts = reactive<Record<string, Draft>>({})
 
@@ -52,6 +53,7 @@ function toDraft(p: MergeThresholdPreset): Draft {
     ciMaxAttempts: p.ciMaxAttempts,
     maxRequirementIterations: p.maxRequirementIterations,
     maxRequirementConcernAllowed: p.maxRequirementConcernAllowed,
+    autoMergeEnabled: p.autoMergeEnabled,
   }
 }
 
@@ -88,6 +90,7 @@ async function save(p: MergeThresholdPreset) {
       ciMaxAttempts: d.ciMaxAttempts,
       maxRequirementIterations: d.maxRequirementIterations,
       maxRequirementConcernAllowed: d.maxRequirementConcernAllowed,
+      autoMergeEnabled: d.autoMergeEnabled,
     })
     toast.add({
       title: t('settings.mergeThresholds.toast.saved'),
@@ -133,6 +136,7 @@ const draft = reactive<Draft>({
   ciMaxAttempts: 10,
   maxRequirementIterations: 6,
   maxRequirementConcernAllowed: 'none',
+  autoMergeEnabled: true,
 })
 
 async function create() {
@@ -147,8 +151,10 @@ async function create() {
       ciMaxAttempts: draft.ciMaxAttempts,
       maxRequirementIterations: draft.maxRequirementIterations,
       maxRequirementConcernAllowed: draft.maxRequirementConcernAllowed,
+      autoMergeEnabled: draft.autoMergeEnabled,
     })
     draft.name = ''
+    draft.autoMergeEnabled = true
     toast.add({
       title: t('settings.mergeThresholds.toast.created'),
       icon: 'i-lucide-check',
@@ -290,7 +296,17 @@ async function create() {
         </label>
       </div>
 
-      <div class="mt-3 flex justify-end">
+      <div class="mt-3 flex items-center justify-between gap-3">
+        <USwitch
+          v-model="drafts[p.id]!.autoMergeEnabled"
+          size="sm"
+          :label="t('settings.mergeThresholds.field.autoMerge')"
+          :description="
+            drafts[p.id]!.autoMergeEnabled
+              ? t('settings.mergeThresholds.autoMergeOnHint')
+              : t('settings.mergeThresholds.autoMergeOffHint')
+          "
+        />
         <UButton
           color="primary"
           variant="soft"
@@ -373,6 +389,11 @@ async function create() {
             size="sm"
           />
         </label>
+        <USwitch
+          v-model="draft.autoMergeEnabled"
+          size="sm"
+          :label="t('settings.mergeThresholds.field.autoMerge')"
+        />
         <UButton
           color="primary"
           size="sm"

package/app/composables/api/infraHandlers.ts

@@ -1,4 +1,5 @@
 import {
+  detectServiceProvisioningContract,
   listEnvironmentHandlersContract,
   listEnvironmentUserHandlersContract,
   registerEnvironmentHandlerContract,
@@ -9,6 +10,7 @@ import {
   upsertEnvironmentUserHandlerContract,
 } from '@cat-factory/contracts'
 import type {
+  DetectServiceProvisioningInput,
   ProvisionType,
   RegisterEnvironmentHandlerInput,
   UpsertCustomManifestTypeInput,
@@ -33,6 +35,10 @@ export function infraHandlersApi({ send, ws }: ApiContext) {
     registerEnvironmentHandler: (workspaceId: string, body: RegisterEnvironmentHandlerInput) =>
       send(registerEnvironmentHandlerContract, { pathPrefix: ws(workspaceId), body }),
 
+    // Auto-detect a non-binding recommended provisioning config from a service's repo.
+    detectServiceProvisioning: (workspaceId: string, body: DetectServiceProvisioningInput) =>
+      send(detectServiceProvisioningContract, { pathPrefix: ws(workspaceId), body }),
+
     // `manifestId` (for a `custom` handler) rides as a query param; absent ⇒ the bare handler.
     unregisterEnvironmentHandler: (
       workspaceId: string,

package/app/composables/api/presets.ts

@@ -5,6 +5,7 @@ import {
   deleteModelPresetContract,
   listMergePresetsContract,
   listModelPresetsContract,
+  reseedMergePresetContract,
   updateMergePresetContract,
   updateModelPresetContract,
 } from '@cat-factory/contracts'
@@ -38,6 +39,11 @@ export function presetsApi({ send, ws }: ApiContext) {
     deleteMergePreset: (workspaceId: string, presetId: string) =>
       send(deleteMergePresetContract, { pathPrefix: ws(workspaceId), pathParams: { presetId } }),
 
+    // Restore a built-in preset to its current catalog definition (adopt an update, repair a
+    // drifted one, or materialise a new built-in that appeared). Custom presets reject this.
+    reseedMergePreset: (workspaceId: string, presetId: string) =>
+      send(reseedMergePresetContract, { pathPrefix: ws(workspaceId), pathParams: { presetId } }),
+
     // ---- model presets (per-task model->agent mapping library) ------------
     listModelPresets: (workspaceId: string) =>
       send(listModelPresetsContract, { pathPrefix: ws(workspaceId) }),

package/app/composables/useMergePresetHealth.ts

@@ -0,0 +1,65 @@
+import { computed } from 'vue'
+import type { MergeThresholdPreset } from '~/types/merge'
+import { useMergePresetsStore } from '~/stores/mergePresets'
+
+export type MergePresetIssueType = 'outdated' | 'new'
+
+/** A built-in merge preset that the workspace should reseed (an update, or a new one to add). */
+export interface MergePresetIssue {
+  type: MergePresetIssueType
+  /** The catalog (built-in) id — what the reseed endpoint is keyed by. */
+  id: string
+  /** The preset name (the stored copy's for `outdated`, the built-in id for a `new` one). */
+  name: string
+  /** For an `outdated` issue: the persisted copy's version (the display copy renders it via i18n). */
+  fromVersion?: number
+  /** For an `outdated` issue: the newer catalog version available. */
+  toVersion?: number
+}
+
+/** A built-in's display name for an issue message (humanise its catalog id as a fallback). */
+function builtinName(id: string, stored: MergeThresholdPreset | undefined): string {
+  if (stored) return stored.name
+  // `mp_manual_review` -> "Manual review" — only used until the row is reseeded into existence.
+  return id.replace(/^mp_/, '').replace(/_/g, ' ')
+}
+
+/**
+ * Detect built-in merge presets the workspace should reseed for the startup advisory: a stored
+ * built-in whose catalog definition moved ahead (offer to adopt it) and a brand-new built-in
+ * that appeared in the catalog but isn't in the workspace yet (offer to add it). The catalog
+ * versions the snapshot ships ARE the set of built-in ids, so detection is entirely client-side:
+ * a stored preset is a built-in iff its id is a catalog key, and a catalog key with no stored
+ * preset is a new built-in.
+ */
+export function useMergePresetHealth() {
+  const store = useMergePresetsStore()
+
+  const issues = computed<MergePresetIssue[]>(() => {
+    const out: MergePresetIssue[] = []
+    const byId = new Map(store.presets.map((p) => [p.id, p]))
+    for (const [id, catalogVersion] of Object.entries(store.catalogVersions)) {
+      const stored = byId.get(id)
+      if (!stored) {
+        out.push({ type: 'new', id, name: builtinName(id, undefined) })
+        continue
+      }
+      if (catalogVersion > (stored.version ?? 0)) {
+        out.push({
+          type: 'outdated',
+          id,
+          name: stored.name,
+          fromVersion: stored.version ?? 0,
+          toVersion: catalogVersion,
+        })
+      }
+    }
+    return out
+  })
+
+  const hasIssues = computed(() => issues.value.length > 0)
+  const newPresets = computed(() => issues.value.filter((i) => i.type === 'new'))
+  const outdated = computed(() => issues.value.filter((i) => i.type === 'outdated'))
+
+  return { issues, hasIssues, newPresets, outdated }
+}