@cat-factory/app 0.61.0 → 0.63.0

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

@@ -230,6 +230,9 @@ async function detectFromRepo() {
       owner: repo.owner,
       repo: repo.name,
       ...(ctx.directory ? { directory: ctx.directory } : {}),
+      // Prioritize the option matching the currently-selected tab (kubernetes vs
+      // docker-compose); the detector falls back to the other when the preferred isn't found.
+      prefer: provisionType.value,
     })
     detectResult.value = rec
     // Only prefill when the detector actually inferred something. A `detected: false`

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/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 }
+}

package/app/pages/index.vue

@@ -62,6 +62,10 @@ const FragmentLibraryPanel = defineAsyncComponent(
 const PipelineHealthModal = defineAsyncComponent(
   () => import('~/components/pipeline/PipelineHealthModal.vue'),
 )
+// Startup advisory for new / outdated built-in merge presets — same once-per-session pattern.
+const MergePresetHealthModal = defineAsyncComponent(
+  () => import('~/components/settings/MergePresetHealthModal.vue'),
+)
 const IntegrationsHub = defineAsyncComponent(
   () => import('~/components/layout/IntegrationsHub.vue'),
 )
@@ -150,6 +154,18 @@ watch(
   },
   { immediate: true },
 )
+// Same advisory for built-in merge presets: surface new / outdated ones once per session. Defers
+// to the pipeline advisory when both fire, so at most one modal auto-opens on a given load.
+const { hasIssues: mergePresetIssues } = useMergePresetHealth()
+watch(
+  () => [workspace.ready, mergePresetIssues.value, ui.pipelineHealthOpen],
+  () => {
+    if (workspace.ready && mergePresetIssues.value && !ui.pipelineHealthOpen) {
+      ui.maybeOpenMergePresetHealth()
+    }
+  },
+  { immediate: true },
+)
 
 // Auto-open the right AI-onboarding dialog once per session: the no-source prompt takes
 // precedence over the preset-mismatch prompt. Honour the per-session dismissed flags so a
@@ -303,6 +319,7 @@ watch(
       <SlackPanel v-if="ui.slackOpen" />
       <FragmentLibraryPanel v-if="ui.fragmentLibraryOpen" />
       <PipelineHealthModal v-if="ui.pipelineHealthOpen" />
+      <MergePresetHealthModal v-if="ui.mergePresetHealthOpen" />
       <IntegrationsHub v-if="ui.integrationsOpen" />
       <PersonalSetupModal v-if="ui.personalSetupOpen" />
       <WorkspaceSettingsPanel v-if="ui.workspaceSettingsOpen" />

package/app/stores/mergePresets.ts

@@ -13,9 +13,18 @@ export const useMergePresetsStore = defineStore('mergePresets', () => {
   const api = useApi()
 
   const presets = ref<MergeThresholdPreset[]>([])
+  /**
+   * Current built-in catalog versions (`seedMergePresets()`), keyed by preset id, from the
+   * workspace snapshot. The keys ARE the set of built-in ids: a stored preset whose id is a
+   * key here is a built-in (and is outdated when its `version` is below the catalog value),
+   * and a key with no matching stored preset is a NEW built-in the workspace can add. Drives
+   * `useMergePresetHealth`.
+   */
+  const catalogVersions = ref<Record<string, number>>({})
 
-  function hydrate(list: MergeThresholdPreset[]) {
+  function hydrate(list: MergeThresholdPreset[], versions?: Record<string, number>) {
     presets.value = [...list].sort((a, b) => a.createdAt - b.createdAt)
+    if (versions) catalogVersions.value = versions
   }
 
   /** The workspace default (fallback for a task that picks none). */
@@ -50,5 +59,27 @@ export const useMergePresetsStore = defineStore('mergePresets', () => {
     await ws.refresh()
   }
 
-  return { presets, defaultPreset, resolve, hydrate, create, update, remove }
+  /**
+   * Reseed a built-in preset from the backend's current catalog: adopt an updated definition,
+   * repair a drifted one, or materialise a NEW built-in that appeared after the workspace was
+   * created. The `presetId` is the catalog id (e.g. `mp_balanced`). Refreshes the snapshot.
+   */
+  async function reseed(presetId: string) {
+    const ws = useWorkspaceStore()
+    const updated = await api.reseedMergePreset(ws.requireId(), presetId)
+    await ws.refresh()
+    return updated
+  }
+
+  return {
+    presets,
+    catalogVersions,
+    defaultPreset,
+    resolve,
+    hydrate,
+    create,
+    update,
+    remove,
+    reseed,
+  }
 })

package/app/stores/ui.ts

@@ -24,6 +24,11 @@ export const useUiStore = defineStore('ui', () => {
   // session so it does not re-pop on every snapshot re-hydration.
   const pipelineHealthOpen = ref(false)
   const pipelineHealthSeen = ref(false)
+  // Merge-preset health startup advisory: lists built-ins with a newer catalog version (reseed)
+  // and new built-in presets the workspace can add. `mergePresetHealthSeen` gates auto-open to
+  // once per session so it does not re-pop on every snapshot re-hydration (mirrors pipelines).
+  const mergePresetHealthOpen = ref(false)
+  const mergePresetHealthSeen = ref(false)
   const decisionContext = ref<{ instanceId: string; decisionId: string } | null>(null)
 
   // Document-source integration modals, keyed by source. `documentImport` and
@@ -250,6 +255,22 @@ export const useUiStore = defineStore('ui', () => {
     pipelineHealthOpen.value = false
   }
 
+  /** Auto-open the merge-preset health advisory once per session (no-op after it's been shown). */
+  function maybeOpenMergePresetHealth() {
+    if (mergePresetHealthSeen.value) return
+    mergePresetHealthSeen.value = true
+    mergePresetHealthOpen.value = true
+  }
+
+  function openMergePresetHealth() {
+    mergePresetHealthSeen.value = true
+    mergePresetHealthOpen.value = true
+  }
+
+  function closeMergePresetHealth() {
+    mergePresetHealthOpen.value = false
+  }
+
   function openDecision(instanceId: string, decisionId: string) {
     decisionContext.value = { instanceId, decisionId }
   }
@@ -658,6 +679,8 @@ export const useUiStore = defineStore('ui', () => {
     builderOpen,
     pipelineHealthOpen,
     pipelineHealthSeen,
+    mergePresetHealthOpen,
+    mergePresetHealthSeen,
     decisionContext,
     documentConnect,
     documentImport,
@@ -715,6 +738,9 @@ export const useUiStore = defineStore('ui', () => {
     maybeOpenPipelineHealth,
     openPipelineHealth,
     closePipelineHealth,
+    maybeOpenMergePresetHealth,
+    openMergePresetHealth,
+    closeMergePresetHealth,
     openDecision,
     closeDecision,
     openApprovalDetail,

package/app/stores/workspace.ts

@@ -88,7 +88,10 @@ export const useWorkspaceStore = defineStore(
       useAgentRunsStore().hydrate(snapshot.bootstrapJobs ?? [])
       useAgentRunsStore().hydrateEnvConfigRepair(snapshot.envConfigRepairJobs ?? [])
       useNotificationsStore().hydrate(snapshot.notifications ?? [])
-      useMergePresetsStore().hydrate(snapshot.mergePresets ?? [])
+      useMergePresetsStore().hydrate(
+        snapshot.mergePresets ?? [],
+        snapshot.mergePresetCatalogVersions,
+      )
       useWorkspaceSettingsStore().hydrate(snapshot.settings)
       useAgentConfigStore().hydrate(snapshot.agentConfigCatalog ?? [])
       useModelPresetsStore().hydrate(snapshot.modelPresets ?? [])

package/app/utils/mergePreset.ts

@@ -7,6 +7,8 @@ import type { MergeThresholdPreset } from '~/types/merge'
  * rendered as whole percents.
  */
 export function mergePresetThresholds(p: MergeThresholdPreset): string {
+  // Auto-merge disabled: the thresholds don't apply, every PR goes to human review.
+  if (!p.autoMergeEnabled) return `manual review only · ${p.ciMaxAttempts} CI fixes`
   const pct = (n: number) => `${Math.round(n * 100)}%`
   return `cx ≤${pct(p.maxComplexity)} · risk ≤${pct(p.maxRisk)} · impact ≤${pct(
     p.maxImpact,

package/i18n/locales/en.json

@@ -1643,8 +1643,11 @@
         "maxImpact": "Max impact %",
         "ciMaxAttempts": "CI-fix attempts",
         "maxRequirementIterations": "Requirement iterations",
-        "maxRequirementConcernAllowed": "Auto-pass concerns at or below"
+        "maxRequirementConcernAllowed": "Auto-pass concerns at or below",
+        "autoMerge": "Auto-merge"
       },
+      "autoMergeOnHint": "Merge automatically when within thresholds.",
+      "autoMergeOffHint": "Always route the PR to a human review.",
       "newPreset": "New preset",
       "create": {
         "name": "Name",
@@ -2529,6 +2532,25 @@
       }
     }
   },
+  "mergePreset": {
+    "health": {
+      "title": "Merge preset updates",
+      "allValid": "All built-in merge presets are up to date.",
+      "newHeading": "New presets available",
+      "newDescription": "New built-in merge presets have shipped. Add them to this board's library.",
+      "add": "Add",
+      "updatesHeading": "Updates available",
+      "updatesDescription": "A newer version of these built-in merge presets has shipped. Reseed to adopt it (the default and ordering are kept).",
+      "versionAvailable": "Version {from} → {to} available.",
+      "reseed": "Reseed",
+      "reseedAll": "Update all ({count})",
+      "dismiss": "Dismiss",
+      "done": "Done",
+      "toast": {
+        "reseedFailed": "Could not reseed merge preset"
+      }
+    }
+  },
   "palette": {
     "hint": "Click an agent to append it to the pipeline.",
     "customAgents": "Custom agents"

package/i18n/locales/es.json

@@ -1499,7 +1499,8 @@
         "maxImpact": "Impacto máx. %",
         "ciMaxAttempts": "Intentos de corrección de CI",
         "maxRequirementIterations": "Iteraciones de requisitos",
-        "maxRequirementConcernAllowed": "Aprobación automática de inquietudes hasta"
+        "maxRequirementConcernAllowed": "Aprobación automática de inquietudes hasta",
+        "autoMerge": "Fusión automática"
       },
       "newPreset": "Nuevo ajuste",
       "create": {
@@ -1520,7 +1521,9 @@
         "createFailed": "No se pudo crear el ajuste",
         "defaultFailed": "No se pudo establecer el predeterminado",
         "deleteFailed": "No se pudo eliminar el ajuste"
-      }
+      },
+      "autoMergeOnHint": "Fusionar automáticamente cuando esté dentro de los umbrales.",
+      "autoMergeOffHint": "Enviar siempre el PR a revisión humana."
     },
     "observabilityConnection": {
       "title": "Salud posterior al lanzamiento",
@@ -3498,5 +3501,24 @@
       "saveArchFailed": "No se pudo guardar la arquitectura de referencia",
       "deleteFailed": "No se pudo eliminar"
     }
+  },
+  "mergePreset": {
+    "health": {
+      "title": "Actualizaciones de presets de fusión",
+      "allValid": "Todos los presets de fusión integrados están actualizados.",
+      "newHeading": "Nuevos presets disponibles",
+      "newDescription": "Hay nuevos presets de fusión integrados. Añádelos a la biblioteca de este tablero.",
+      "add": "Añadir",
+      "updatesHeading": "Actualizaciones disponibles",
+      "updatesDescription": "Hay una versión más reciente de estos presets de fusión integrados. Regenera para adoptarla (se conservan el predeterminado y el orden).",
+      "versionAvailable": "Versión {from} → {to} disponible.",
+      "reseed": "Regenerar",
+      "reseedAll": "Actualizar todos ({count})",
+      "dismiss": "Descartar",
+      "done": "Hecho",
+      "toast": {
+        "reseedFailed": "No se pudo regenerar el preset de fusión"
+      }
+    }
   }
 }

package/i18n/locales/fr.json

@@ -1499,7 +1499,8 @@
         "maxImpact": "Impact max %",
         "ciMaxAttempts": "Tentatives de correction CI",
         "maxRequirementIterations": "Itérations d'exigences",
-        "maxRequirementConcernAllowed": "Validation auto. des préoccupations jusqu'à"
+        "maxRequirementConcernAllowed": "Validation auto. des préoccupations jusqu'à",
+        "autoMerge": "Fusion automatique"
       },
       "newPreset": "Nouveau préréglage",
       "create": {
@@ -1520,7 +1521,9 @@
         "createFailed": "Impossible de créer le préréglage",
         "defaultFailed": "Impossible de définir par défaut",
         "deleteFailed": "Impossible de supprimer le préréglage"
-      }
+      },
+      "autoMergeOnHint": "Fusionner automatiquement si dans les seuils.",
+      "autoMergeOffHint": "Toujours envoyer la PR en revue humaine."
     },
     "observabilityConnection": {
       "title": "Santé post-publication",
@@ -3498,5 +3501,24 @@
       "saveArchFailed": "Impossible d'enregistrer l'architecture de référence",
       "deleteFailed": "Impossible de supprimer"
     }
+  },
+  "mergePreset": {
+    "health": {
+      "title": "Mises à jour des presets de fusion",
+      "allValid": "Tous les presets de fusion intégrés sont à jour.",
+      "newHeading": "Nouveaux presets disponibles",
+      "newDescription": "De nouveaux presets de fusion intégrés sont arrivés. Ajoutez-les à la bibliothèque de ce tableau.",
+      "add": "Ajouter",
+      "updatesHeading": "Mises à jour disponibles",
+      "updatesDescription": "Une version plus récente de ces presets de fusion intégrés est arrivée. Régénérez pour l'adopter (le preset par défaut et l'ordre sont conservés).",
+      "versionAvailable": "Version {from} → {to} disponible.",
+      "reseed": "Régénérer",
+      "reseedAll": "Tout mettre à jour ({count})",
+      "dismiss": "Ignorer",
+      "done": "Terminé",
+      "toast": {
+        "reseedFailed": "Impossible de régénérer le preset de fusion"
+      }
+    }
   }
 }

package/i18n/locales/he.json

@@ -1598,7 +1598,8 @@
         "maxImpact": "השפעה מרבית %",
         "ciMaxAttempts": "ניסיונות תיקון CI",
         "maxRequirementIterations": "איטרציות דרישות",
-        "maxRequirementConcernAllowed": "מעבר אוטומטי בחששות ברף או מתחתיו"
+        "maxRequirementConcernAllowed": "מעבר אוטומטי בחששות ברף או מתחתיו",
+        "autoMerge": "מיזוג אוטומטי"
       },
       "newPreset": "תצורה חדשה",
       "create": {
@@ -1619,7 +1620,9 @@
         "createFailed": "לא ניתן היה ליצור תצורה",
         "defaultFailed": "לא ניתן היה להגדיר ברירת מחדל",
         "deleteFailed": "לא ניתן היה למחוק את התצורה"
-      }
+      },
+      "autoMergeOnHint": "מזג אוטומטית כשבתוך הספים.",
+      "autoMergeOffHint": "נתב תמיד את ה-PR לבדיקה אנושית."
     },
     "observabilityConnection": {
       "title": "בריאות שלאחר שחרור",
@@ -3509,5 +3512,24 @@
       "saveArchFailed": "לא ניתן היה לשמור ארכיטקטורת ייחוס",
       "deleteFailed": "לא ניתן היה למחוק"
     }
+  },
+  "mergePreset": {
+    "health": {
+      "title": "עדכוני קביעות מיזוג",
+      "allValid": "כל קביעות המיזוג המובנות מעודכנות.",
+      "newHeading": "קביעות חדשות זמינות",
+      "newDescription": "הגיעו קביעות מיזוג מובנות חדשות. הוסף אותן לספריית הלוח הזה.",
+      "add": "הוסף",
+      "updatesHeading": "עדכונים זמינים",
+      "updatesDescription": "גרסה חדשה יותר של קביעות המיזוג המובנות האלה הגיעה. זרע מחדש כדי לאמץ אותה (ברירת המחדל והסדר נשמרים).",
+      "versionAvailable": "גרסה {from} → {to} זמינה.",
+      "reseed": "זרע מחדש",
+      "reseedAll": "עדכן הכל ({count})",
+      "dismiss": "התעלם",
+      "done": "בוצע",
+      "toast": {
+        "reseedFailed": "לא ניתן לזרוע מחדש את קביעת המיזוג"
+      }
+    }
   }
 }

package/i18n/locales/ja.json

@@ -1600,7 +1600,8 @@
         "maxImpact": "最大影響度 %",
         "ciMaxAttempts": "CI 修正の試行回数",
         "maxRequirementIterations": "要件のイテレーション回数",
-        "maxRequirementConcernAllowed": "この水準以下の懸念を自動承認"
+        "maxRequirementConcernAllowed": "この水準以下の懸念を自動承認",
+        "autoMerge": "自動マージ"
       },
       "newPreset": "新しいプリセット",
       "create": {
@@ -1621,7 +1622,9 @@
         "createFailed": "プリセットを作成できませんでした",
         "defaultFailed": "デフォルトを設定できませんでした",
         "deleteFailed": "プリセットを削除できませんでした"
-      }
+      },
+      "autoMergeOnHint": "しきい値内なら自動的にマージします。",
+      "autoMergeOffHint": "常にPRを人間のレビューに回します。"
     },
     "observabilityConnection": {
       "title": "リリース後のヘルス",
@@ -3511,5 +3514,24 @@
       "saveArchFailed": "リファレンスアーキテクチャを保存できませんでした",
       "deleteFailed": "削除できませんでした"
     }
+  },
+  "mergePreset": {
+    "health": {
+      "title": "マージプリセットの更新",
+      "allValid": "組み込みのマージプリセットはすべて最新です。",
+      "newHeading": "新しいプリセットがあります",
+      "newDescription": "新しい組み込みマージプリセットが追加されました。このボードのライブラリに追加してください。",
+      "add": "追加",
+      "updatesHeading": "更新あり",
+      "updatesDescription": "これらの組み込みマージプリセットの新しいバージョンがあります。再シードして取り込みます（既定と並び順は保持されます）。",
+      "versionAvailable": "バージョン {from} → {to} が利用可能です。",
+      "reseed": "再シード",
+      "reseedAll": "すべて更新 ({count})",
+      "dismiss": "閉じる",
+      "done": "完了",
+      "toast": {
+        "reseedFailed": "マージプリセットを再シードできませんでした"
+      }
+    }
   }
 }

package/i18n/locales/pl.json

@@ -1499,7 +1499,8 @@
         "maxImpact": "Maks. wpływ %",
         "ciMaxAttempts": "Próby naprawy CI",
         "maxRequirementIterations": "Iteracje wymagań",
-        "maxRequirementConcernAllowed": "Automatyczne zaliczenie zastrzeżeń do"
+        "maxRequirementConcernAllowed": "Automatyczne zaliczenie zastrzeżeń do",
+        "autoMerge": "Auto-scalanie"
       },
       "newPreset": "Nowe ustawienie",
       "create": {
@@ -1520,7 +1521,9 @@
         "createFailed": "Nie można utworzyć ustawienia",
         "defaultFailed": "Nie można ustawić jako domyślne",
         "deleteFailed": "Nie można usunąć ustawienia"
-      }
+      },
+      "autoMergeOnHint": "Scalaj automatycznie, gdy mieści się w progach.",
+      "autoMergeOffHint": "Zawsze kieruj PR do recenzji człowieka."
     },
     "observabilityConnection": {
       "title": "Kondycja po wydaniu",
@@ -3498,5 +3501,24 @@
       "saveArchFailed": "Nie udało się zapisać architektury referencyjnej",
       "deleteFailed": "Nie udało się usunąć"
     }
+  },
+  "mergePreset": {
+    "health": {
+      "title": "Aktualizacje presetów scalania",
+      "allValid": "Wszystkie wbudowane presety scalania są aktualne.",
+      "newHeading": "Dostępne nowe presety",
+      "newDescription": "Pojawiły się nowe wbudowane presety scalania. Dodaj je do biblioteki tej tablicy.",
+      "add": "Dodaj",
+      "updatesHeading": "Dostępne aktualizacje",
+      "updatesDescription": "Dostępna jest nowsza wersja tych wbudowanych presetów scalania. Zregeneruj, aby ją przyjąć (domyślny i kolejność są zachowane).",
+      "versionAvailable": "Dostępna wersja {from} → {to}.",
+      "reseed": "Zregeneruj",
+      "reseedAll": "Zaktualizuj wszystkie ({count})",
+      "dismiss": "Odrzuć",
+      "done": "Gotowe",
+      "toast": {
+        "reseedFailed": "Nie udało się zregenerować presetu scalania"
+      }
+    }
   }
 }

package/i18n/locales/tr.json

@@ -1600,7 +1600,8 @@
         "maxImpact": "Maks. etki %",
         "ciMaxAttempts": "CI düzeltme denemeleri",
         "maxRequirementIterations": "Gereksinim yinelemeleri",
-        "maxRequirementConcernAllowed": "Şu düzeyde veya altında otomatik geç"
+        "maxRequirementConcernAllowed": "Şu düzeyde veya altında otomatik geç",
+        "autoMerge": "Otomatik birleştirme"
       },
       "newPreset": "Yeni ön ayar",
       "create": {
@@ -1621,7 +1622,9 @@
         "createFailed": "Ön ayar oluşturulamadı",
         "defaultFailed": "Varsayılan ayarlanamadı",
         "deleteFailed": "Ön ayar silinemedi"
-      }
+      },
+      "autoMergeOnHint": "Eşiklerin içindeyken otomatik birleştir.",
+      "autoMergeOffHint": "PR'yi her zaman insan incelemesine gönder."
     },
     "observabilityConnection": {
       "title": "Sürüm sonrası sağlık",
@@ -3511,5 +3514,24 @@
       "saveArchFailed": "Referans mimari kaydedilemedi",
       "deleteFailed": "Silinemedi"
     }
+  },
+  "mergePreset": {
+    "health": {
+      "title": "Birleştirme ön ayarı güncellemeleri",
+      "allValid": "Tüm yerleşik birleştirme ön ayarları güncel.",
+      "newHeading": "Yeni ön ayarlar mevcut",
+      "newDescription": "Yeni yerleşik birleştirme ön ayarları geldi. Bu panonun kütüphanesine ekleyin.",
+      "add": "Ekle",
+      "updatesHeading": "Güncellemeler mevcut",
+      "updatesDescription": "Bu yerleşik birleştirme ön ayarlarının daha yeni bir sürümü geldi. Benimsemek için yeniden tohumlayın (varsayılan ve sıralama korunur).",
+      "versionAvailable": "Sürüm {from} → {to} mevcut.",
+      "reseed": "Yeniden tohumla",
+      "reseedAll": "Tümünü güncelle ({count})",
+      "dismiss": "Yoksay",
+      "done": "Tamam",
+      "toast": {
+        "reseedFailed": "Birleştirme ön ayarı yeniden tohumlanamadı"
+      }
+    }
   }
 }

package/i18n/locales/uk.json

@@ -1499,7 +1499,8 @@
         "maxImpact": "Макс. вплив %",
         "ciMaxAttempts": "Спроби виправлення CI",
         "maxRequirementIterations": "Ітерації вимог",
-        "maxRequirementConcernAllowed": "Авто-пропуск зауважень до"
+        "maxRequirementConcernAllowed": "Авто-пропуск зауважень до",
+        "autoMerge": "Автозлиття"
       },
       "newPreset": "Новий набір",
       "create": {
@@ -1520,7 +1521,9 @@
         "createFailed": "Не вдалося створити набір",
         "defaultFailed": "Не вдалося встановити за замовчуванням",
         "deleteFailed": "Не вдалося видалити набір"
-      }
+      },
+      "autoMergeOnHint": "Зливати автоматично, коли в межах порогів.",
+      "autoMergeOffHint": "Завжди надсилати PR на перевірку людиною."
     },
     "observabilityConnection": {
       "title": "Стан після випуску",
@@ -3498,5 +3501,24 @@
       "saveArchFailed": "Не вдалося зберегти еталонну архітектуру",
       "deleteFailed": "Не вдалося видалити"
     }
+  },
+  "mergePreset": {
+    "health": {
+      "title": "Оновлення пресетів злиття",
+      "allValid": "Усі вбудовані пресети злиття актуальні.",
+      "newHeading": "Доступні нові пресети",
+      "newDescription": "З'явилися нові вбудовані пресети злиття. Додайте їх до бібліотеки цієї дошки.",
+      "add": "Додати",
+      "updatesHeading": "Доступні оновлення",
+      "updatesDescription": "Доступна новіша версія цих вбудованих пресетів злиття. Перегенеруйте, щоб застосувати її (стандартний пресет і порядок збережено).",
+      "versionAvailable": "Доступна версія {from} → {to}.",
+      "reseed": "Перегенерувати",
+      "reseedAll": "Оновити всі ({count})",
+      "dismiss": "Відхилити",
+      "done": "Готово",
+      "toast": {
+        "reseedFailed": "Не вдалося перегенерувати пресет злиття"
+      }
+    }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cat-factory/app",
-  "version": "0.61.0",
+  "version": "0.63.0",
   "description": "Reusable Nuxt layer for the Agent Architecture Board SPA (components, stores, composables, pages). Consume it from a thin deployment app via `extends: ['@cat-factory/app']` and point it at your backend with NUXT_PUBLIC_API_BASE. See deploy/frontend for an example.",
   "repository": {
     "type": "git",
@@ -34,7 +34,7 @@
     "valibot": "^1.4.2",
     "vue": "^3.5.39",
     "wretch": "^3.0.9",
-    "@cat-factory/contracts": "0.68.0"
+    "@cat-factory/contracts": "0.70.0"
   },
   "devDependencies": {
     "@toad-contracts/testing": "0.3.2",