@cat-factory/app 0.109.4 → 0.110.0

package/app/composables/api/presets.ts

@@ -1,49 +1,49 @@
 import {
-  createMergePresetContract,
+  createRiskPolicyContract,
   createModelPresetContract,
-  deleteMergePresetContract,
+  deleteRiskPolicyContract,
   deleteModelPresetContract,
-  listMergePresetsContract,
+  listRiskPoliciesContract,
   listModelPresetsContract,
-  reseedMergePresetContract,
+  reseedRiskPolicyContract,
   reseedModelPresetContract,
-  updateMergePresetContract,
+  updateRiskPolicyContract,
   updateModelPresetContract,
 } from '@cat-factory/contracts'
-import type { UpdateMergePresetInput } from '~/types/merge'
+import type { UpdateRiskPolicyInput } from '~/types/merge'
 import type { CreateModelPresetInput, UpdateModelPresetInput } from '~/types/model-presets'
 import type { SendParams } from './client'
 import type { ApiContext } from './context'
 
 // The merge-preset create body is typed from the contract's INPUT shape so the
 // valibot-defaulted fields (release/grace windows, isDefault) stay optional for callers
-// (the exported `CreateMergePresetInput` is the post-default OUTPUT shape).
-type CreateMergePresetBody = NonNullable<SendParams<typeof createMergePresetContract>['body']>
+// (the exported `CreateRiskPolicyInput` is the post-default OUTPUT shape).
+type CreateRiskPolicyBody = NonNullable<SendParams<typeof createRiskPolicyContract>['body']>
 
 /** The per-workspace preset libraries: merge-threshold policy + model->agent mapping. */
 export function presetsApi({ send, ws }: ApiContext) {
   return {
     // ---- merge threshold presets (per-task auto-merge policy library) -----
-    listMergePresets: (workspaceId: string) =>
-      send(listMergePresetsContract, { pathPrefix: ws(workspaceId) }),
+    listRiskPolicies: (workspaceId: string) =>
+      send(listRiskPoliciesContract, { pathPrefix: ws(workspaceId) }),
 
-    createMergePreset: (workspaceId: string, body: CreateMergePresetBody) =>
-      send(createMergePresetContract, { pathPrefix: ws(workspaceId), body }),
+    createRiskPolicy: (workspaceId: string, body: CreateRiskPolicyBody) =>
+      send(createRiskPolicyContract, { pathPrefix: ws(workspaceId), body }),
 
-    updateMergePreset: (workspaceId: string, presetId: string, body: UpdateMergePresetInput) =>
-      send(updateMergePresetContract, {
+    updateRiskPolicy: (workspaceId: string, presetId: string, body: UpdateRiskPolicyInput) =>
+      send(updateRiskPolicyContract, {
         pathPrefix: ws(workspaceId),
         pathParams: { presetId },
         body,
       }),
 
-    deleteMergePreset: (workspaceId: string, presetId: string) =>
-      send(deleteMergePresetContract, { pathPrefix: ws(workspaceId), pathParams: { presetId } }),
+    deleteRiskPolicy: (workspaceId: string, presetId: string) =>
+      send(deleteRiskPolicyContract, { 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 } }),
+    reseedRiskPolicy: (workspaceId: string, presetId: string) =>
+      send(reseedRiskPolicyContract, { pathPrefix: ws(workspaceId), pathParams: { presetId } }),
 
     // ---- model presets (per-task model->agent mapping library) ------------
     listModelPresets: (workspaceId: string) =>

package/app/composables/api/reviews.ts

@@ -27,6 +27,7 @@ import {
   updateRequirementItemStatusContract,
 } from '@cat-factory/contracts'
 import type {
+  RequestRecommendationItem,
   UpdateBrainstormItemStatusInput,
   UpdateClarityItemStatusInput,
 } from '@cat-factory/contracts'
@@ -109,19 +110,19 @@ export function reviewsApi({ send, ws }: ApiContext) {
         body: { choice },
       }),
 
-    // Ask the Requirement Writer to recommend grounded answers for a batch of findings (by
-    // item id). Returns the review with `pending` placeholder recommendations; they fill in
-    // (`ready`) asynchronously via the `requirements` stream as the Writer produces each.
+    // Ask the Requirement Writer to recommend grounded answers for a batch of findings. Each
+    // item carries its finding id plus optional per-finding guidance (the note the human typed
+    // before choosing "recommend something"). Returns the review with `pending` placeholder
+    // recommendations; they fill in (`ready`) asynchronously via the `requirements` stream.
     requestRecommendations: (
       workspaceId: string,
       blockId: string,
-      itemIds: string[],
-      note?: string,
+      items: RequestRecommendationItem[],
     ) =>
       send(requestRequirementRecommendationsContract, {
         pathPrefix: ws(workspaceId),
         pathParams: { blockId },
-        body: { itemIds, ...(note ? { note } : {}) },
+        body: { items },
       }),
 
     // Accept a recommendation (becomes the finding's answer), reject it, or re-request it

package/app/composables/{useMergePresetHealth.ts → useRiskPolicyHealth.ts}

@@ -1,12 +1,12 @@
 import { computed } from 'vue'
-import type { MergeThresholdPreset } from '~/types/merge'
-import { useMergePresetsStore } from '~/stores/mergePresets'
+import type { RiskPolicy } from '~/types/merge'
+import { useRiskPoliciesStore } from '~/stores/riskPolicies'
 
-export type MergePresetIssueType = 'outdated' | 'new'
+export type RiskPolicyIssueType = '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
+export interface RiskPolicyIssue {
+  type: RiskPolicyIssueType
   /** 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). */
@@ -18,7 +18,7 @@ export interface MergePresetIssue {
 }
 
 /** 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 {
+function builtinName(id: string, stored: RiskPolicy | 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, ' ')
@@ -32,11 +32,11 @@ function builtinName(id: string, stored: MergeThresholdPreset | undefined): stri
  * 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()
+export function useRiskPolicyHealth() {
+  const store = useRiskPoliciesStore()
 
-  const issues = computed<MergePresetIssue[]>(() => {
-    const out: MergePresetIssue[] = []
+  const issues = computed<RiskPolicyIssue[]>(() => {
+    const out: RiskPolicyIssue[] = []
     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)

package/app/pages/index.vue

@@ -71,8 +71,8 @@ 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 RiskPolicyHealthModal = defineAsyncComponent(
+  () => import('~/components/settings/RiskPolicyHealthModal.vue'),
 )
 // Startup advisory for new / outdated built-in model presets — same once-per-session pattern.
 const ModelPresetHealthModal = defineAsyncComponent(
@@ -185,12 +185,12 @@ watch(
 )
 // 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()
+const { hasIssues: riskPolicyIssues } = useRiskPolicyHealth()
 watch(
-  () => [workspace.ready, mergePresetIssues.value, ui.pipelineHealthOpen],
+  () => [workspace.ready, riskPolicyIssues.value, ui.pipelineHealthOpen],
   () => {
-    if (workspace.ready && mergePresetIssues.value && !ui.pipelineHealthOpen) {
-      ui.maybeOpenMergePresetHealth()
+    if (workspace.ready && riskPolicyIssues.value && !ui.pipelineHealthOpen) {
+      ui.maybeOpenRiskPolicyHealth()
     }
   },
   { immediate: true },
@@ -200,13 +200,13 @@ watch(
 // to the pipeline + merge-preset advisories when they fire, so at most one modal auto-opens.
 const { hasIssues: modelPresetIssues } = useModelPresetHealth()
 watch(
-  () => [workspace.ready, modelPresetIssues.value, ui.pipelineHealthOpen, ui.mergePresetHealthOpen],
+  () => [workspace.ready, modelPresetIssues.value, ui.pipelineHealthOpen, ui.riskPolicyHealthOpen],
   () => {
     if (
       workspace.ready &&
       modelPresetIssues.value &&
       !ui.pipelineHealthOpen &&
-      !ui.mergePresetHealthOpen
+      !ui.riskPolicyHealthOpen
     ) {
       ui.maybeOpenModelPresetHealth()
     }
@@ -390,7 +390,7 @@ watch(
       <SlackPanel v-if="ui.slackOpen" />
       <FragmentLibraryPanel v-if="ui.fragmentLibraryOpen" />
       <PipelineHealthModal v-if="ui.pipelineHealthOpen" />
-      <MergePresetHealthModal v-if="ui.mergePresetHealthOpen" />
+      <RiskPolicyHealthModal v-if="ui.riskPolicyHealthOpen" />
       <ModelPresetHealthModal v-if="ui.modelPresetHealthOpen" />
       <IntegrationsHub v-if="ui.integrationsOpen" />
       <PersonalSetupModal v-if="ui.personalSetupOpen" />

package/app/stores/board.ts

@@ -169,7 +169,7 @@ export const useBoardStore = defineStore('board', () => {
     options?: {
       taskType?: CreateTaskType
       taskTypeFields?: TaskTypeFields
-      mergePresetId?: string
+      riskPolicyId?: string
       modelPresetId?: string
       pipelineId?: string
       agentConfig?: Record<string, string>
@@ -182,7 +182,7 @@ export const useBoardStore = defineStore('board', () => {
       description,
       ...(options?.taskType ? { taskType: options.taskType } : {}),
       ...(options?.taskTypeFields ? { taskTypeFields: options.taskTypeFields } : {}),
-      ...(options?.mergePresetId ? { mergePresetId: options.mergePresetId } : {}),
+      ...(options?.riskPolicyId ? { riskPolicyId: options.riskPolicyId } : {}),
       ...(options?.modelPresetId ? { modelPresetId: options.modelPresetId } : {}),
       ...(options?.pipelineId ? { pipelineId: options.pipelineId } : {}),
       ...(options?.agentConfig ? { agentConfig: options.agentConfig } : {}),

package/app/stores/pipelines.ts

@@ -2,7 +2,7 @@ import { defineStore } from 'pinia'
 import { computed, ref } from 'vue'
 import type { AgentKind, Pipeline } from '~/types/domain'
 import type { ConsensusStepConfig, StepGating } from '~/types/consensus'
-import type { TesterQualityConfig } from '@cat-factory/contracts'
+import type { StepOptions, TesterQualityConfig } from '@cat-factory/contracts'
 import { companionForProducer, uid } from '~/utils/catalog'
 import { useWorkspaceStore } from '~/stores/workspace'
 
@@ -67,6 +67,13 @@ export const usePipelinesStore = defineStore('pipelines', () => {
    * entry with `gating` makes it conditional on the task estimate.
    */
   const draftTesterQuality = ref<(TesterQualityConfig | null)[]>([])
+  /**
+   * Per-step options bag, kept index-aligned with `draft`: the extensible home for new per-step
+   * parameters (see `StepOptions`). `null`/absent per step ⇒ that step's defaults. Today the only
+   * field is `autoRecommend` (requirements-review); by convention we store ONLY deviations from a
+   * default, so an entry exists only when a step opts out of something.
+   */
+  const draftStepOptions = ref<(StepOptions | null)[]>([])
   /** Organizational labels for the pipeline being assembled/edited. */
   const draftLabels = ref<string[]>([])
   const draftName = ref('New pipeline')
@@ -93,6 +100,7 @@ export const usePipelinesStore = defineStore('pipelines', () => {
     draftGating.value.splice(index, 0, null)
     draftFollowUps.value.splice(index, 0, null)
     draftTesterQuality.value.splice(index, 0, null)
+    draftStepOptions.value.splice(index, 0, null)
   }
 
   function addToDraft(kind: AgentKind) {
@@ -108,6 +116,7 @@ export const usePipelinesStore = defineStore('pipelines', () => {
     draftGating.value.splice(index, 1)
     draftFollowUps.value.splice(index, 1)
     draftTesterQuality.value.splice(index, 1)
+    draftStepOptions.value.splice(index, 1)
   }
 
   function moveInDraft(from: number, to: number) {
@@ -128,6 +137,8 @@ export const usePipelinesStore = defineStore('pipelines', () => {
     draftFollowUps.value.splice(to, 0, fu ?? null)
     const [tq] = draftTesterQuality.value.splice(from, 1)
     draftTesterQuality.value.splice(to, 0, tq ?? null)
+    const [so] = draftStepOptions.value.splice(from, 1)
+    draftStepOptions.value.splice(to, 0, so ?? null)
   }
 
   /** Whether the producer step at `index` currently has its companion attached after it. */
@@ -204,6 +215,7 @@ export const usePipelinesStore = defineStore('pipelines', () => {
     draftGating.value = reorder(draftGating.value)
     draftFollowUps.value = reorder(draftFollowUps.value)
     draftTesterQuality.value = reorder(draftTesterQuality.value)
+    draftStepOptions.value = reorder(draftStepOptions.value)
   }
 
   /** Toggle the consensus mechanism on the draft step at `index` (default config / off). */
@@ -259,6 +271,23 @@ export const usePipelinesStore = defineStore('pipelines', () => {
     draftEnabled.value[index] = draftEnabled.value[index] === false
   }
 
+  /** Whether auto-recommendation is on for the draft (requirements-review) step at `index`. */
+  function draftAutoRecommendEnabled(index: number): boolean {
+    return draftStepOptions.value[index]?.autoRecommend !== false
+  }
+
+  /**
+   * Toggle the requirements-review auto-recommendation on the draft step at `index`. It is on by
+   * default, so we store ONLY the opt-out (`{ autoRecommend: false }`); toggling back drops the
+   * flag. Merges with any other future StepOptions fields rather than clobbering the whole bag.
+   */
+  function toggleDraftAutoRecommend(index: number) {
+    const next: StepOptions = { ...draftStepOptions.value[index] }
+    if (draftAutoRecommendEnabled(index)) next.autoRecommend = false
+    else delete next.autoRecommend
+    draftStepOptions.value[index] = Object.keys(next).length ? next : null
+  }
+
   function clearDraft() {
     draft.value = []
     draftGates.value = []
@@ -268,6 +297,7 @@ export const usePipelinesStore = defineStore('pipelines', () => {
     draftGating.value = []
     draftFollowUps.value = []
     draftTesterQuality.value = []
+    draftStepOptions.value = []
     draftLabels.value = []
     draftName.value = 'New pipeline'
     editingId.value = null
@@ -285,6 +315,7 @@ export const usePipelinesStore = defineStore('pipelines', () => {
     draftTesterQuality.value = pipeline.agentKinds.map(
       (_, i) => pipeline.testerQuality?.[i] ?? null,
     )
+    draftStepOptions.value = pipeline.agentKinds.map((_, i) => pipeline.stepOptions?.[i] ?? null)
     draftLabels.value = [...(pipeline.labels ?? [])]
     draftName.value = pipeline.name
     editingId.value = pipeline.id
@@ -320,6 +351,12 @@ export const usePipelinesStore = defineStore('pipelines', () => {
       ...(draftTesterQuality.value.some((q) => q?.enabled === false || q?.gating?.enabled)
         ? { testerQuality: [...draftTesterQuality.value] }
         : {}),
+      // ALWAYS send stepOptions, unlike the legacy per-step arrays above. Those omit-when-default,
+      // which means an update can never CLEAR them (an omitted field reads as "keep existing"), so
+      // toggling the last opt-out back to its default on a saved pipeline would silently not
+      // persist. Sending the aligned array always lets `update` overwrite; the backend normalizes
+      // an all-default array away (stores nothing), so this is a no-op on create / all-default.
+      stepOptions: draftStepOptions.value.map((o) => o ?? null),
       // Only send labels when there are any.
       ...(draftLabels.value.length ? { labels: [...draftLabels.value] } : {}),
     }
@@ -393,6 +430,7 @@ export const usePipelinesStore = defineStore('pipelines', () => {
     draftGating,
     draftFollowUps,
     draftTesterQuality,
+    draftStepOptions,
     draftLabels,
     draftName,
     editingId,
@@ -410,6 +448,8 @@ export const usePipelinesStore = defineStore('pipelines', () => {
     toggleDraftFollowUps,
     toggleDraftTesterQuality,
     toggleDraftTesterQualityGating,
+    draftAutoRecommendEnabled,
+    toggleDraftAutoRecommend,
     toggleDraftEnabled,
     toggleDraftConsensus,
     setDraftConsensus,

package/app/stores/requirements.ts

@@ -1,6 +1,7 @@
 import { defineStore } from 'pinia'
 import { ref } from 'vue'
 import type {
+  RequestRecommendationItem,
   RequirementReview,
   ResolveRequirementsExceededChoice,
   ReviewItemStatus,
@@ -208,22 +209,17 @@ export const useRequirementsStore = defineStore('requirements', () => {
   }
 
   /**
-   * Ask the Requirement Writer to recommend answers for a batch of findings (by item id).
-   * ASYNCHRONOUS: returns at once with `pending` placeholder recommendations (the Writer runs
-   * per finding in the durable driver), which fill in (`ready`) via live `requirements` stream
-   * events; a notification calls the user back when the batch is ready. The board shows the
-   * `recommending` background stage while any placeholder is pending. Optional `note` steers the
-   * whole batch.
+   * Ask the Requirement Writer to recommend answers for a batch of findings. Each item carries
+   * its finding id plus optional per-finding guidance (the note the human typed before choosing
+   * "recommend something"). ASYNCHRONOUS: returns at once with `pending` placeholder
+   * recommendations (the Writer runs per finding in the durable driver), which fill in (`ready`)
+   * via live `requirements` stream events; a notification calls the user back when the batch is
+   * ready. The board shows the `recommending` background stage while any placeholder is pending.
    */
-  async function requestRecommendations(blockId: string, itemIds: string[], note?: string) {
+  async function requestRecommendations(blockId: string, items: RequestRecommendationItem[]) {
     withFlag(recommending, blockId, true)
     try {
-      const updated = await api.requestRecommendations(
-        workspace.requireId(),
-        blockId,
-        itemIds,
-        note,
-      )
+      const updated = await api.requestRecommendations(workspace.requireId(), blockId, items)
       if (updated) store(updated)
       return updated
     } finally {

package/app/stores/{mergePresets.ts → riskPolicies.ts}

@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia'
 import { computed, ref } from 'vue'
-import type { MergeThresholdPreset, UpdateMergePresetInput } from '~/types/domain'
+import type { RiskPolicy, UpdateRiskPolicyInput } from '~/types/domain'
 import { useWorkspaceStore } from '~/stores/workspace'
 
 /**
@@ -9,20 +9,20 @@ import { useWorkspaceStore } from '~/stores/workspace'
  * resolved preset). Hydrated from the workspace snapshot; managed via a small
  * settings UI. The backend always keeps at least one default preset.
  */
-export const useMergePresetsStore = defineStore('mergePresets', () => {
+export const useRiskPoliciesStore = defineStore('riskPolicies', () => {
   const api = useApi()
 
-  const presets = ref<MergeThresholdPreset[]>([])
+  const presets = ref<RiskPolicy[]>([])
   /**
-   * Current built-in catalog versions (`seedMergePresets()`), keyed by preset id, from the
+   * Current built-in catalog versions (`seedRiskPolicies()`), 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`.
+   * `useRiskPolicyHealth`.
    */
   const catalogVersions = ref<Record<string, number>>({})
 
-  function hydrate(list: MergeThresholdPreset[], versions?: Record<string, number>) {
+  function hydrate(list: RiskPolicy[], versions?: Record<string, number>) {
     presets.value = [...list].sort((a, b) => a.createdAt - b.createdAt)
     if (versions) catalogVersions.value = versions
   }
@@ -31,7 +31,7 @@ export const useMergePresetsStore = defineStore('mergePresets', () => {
   const defaultPreset = computed(() => presets.value.find((p) => p.isDefault) ?? null)
 
   /** Resolve a task's effective preset by id, falling back to the default. */
-  function resolve(presetId: string | undefined): MergeThresholdPreset | null {
+  function resolve(presetId: string | undefined): RiskPolicy | null {
     if (presetId) {
       const picked = presets.value.find((p) => p.id === presetId)
       if (picked) return picked
@@ -39,23 +39,23 @@ export const useMergePresetsStore = defineStore('mergePresets', () => {
     return defaultPreset.value
   }
 
-  async function create(input: Parameters<typeof api.createMergePreset>[1]) {
+  async function create(input: Parameters<typeof api.createRiskPolicy>[1]) {
     const ws = useWorkspaceStore()
-    const created = await api.createMergePreset(ws.requireId(), input)
+    const created = await api.createRiskPolicy(ws.requireId(), input)
     await ws.refresh()
     return created
   }
 
-  async function update(presetId: string, patch: UpdateMergePresetInput) {
+  async function update(presetId: string, patch: UpdateRiskPolicyInput) {
     const ws = useWorkspaceStore()
-    const updated = await api.updateMergePreset(ws.requireId(), presetId, patch)
+    const updated = await api.updateRiskPolicy(ws.requireId(), presetId, patch)
     await ws.refresh()
     return updated
   }
 
   async function remove(presetId: string) {
     const ws = useWorkspaceStore()
-    await api.deleteMergePreset(ws.requireId(), presetId)
+    await api.deleteRiskPolicy(ws.requireId(), presetId)
     await ws.refresh()
   }
 
@@ -66,7 +66,7 @@ export const useMergePresetsStore = defineStore('mergePresets', () => {
    */
   async function reseed(presetId: string) {
     const ws = useWorkspaceStore()
-    const updated = await api.reseedMergePreset(ws.requireId(), presetId)
+    const updated = await api.reseedRiskPolicy(ws.requireId(), presetId)
     await ws.refresh()
     return updated
   }

package/app/stores/ui.ts

@@ -40,10 +40,10 @@ export const useUiStore = defineStore('ui', () => {
   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
+  // and new built-in presets the workspace can add. `riskPolicyHealthSeen` 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 riskPolicyHealthOpen = ref(false)
+  const riskPolicyHealthSeen = ref(false)
   // Model-preset health startup advisory: lists built-ins with a newer catalog version (reseed)
   // and new built-in presets the workspace can add. `modelPresetHealthSeen` gates auto-open to
   // once per session so it does not re-pop on every snapshot re-hydration (mirrors pipelines).
@@ -313,19 +313,19 @@ export const useUiStore = defineStore('ui', () => {
   }
 
   /** 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 maybeOpenRiskPolicyHealth() {
+    if (riskPolicyHealthSeen.value) return
+    riskPolicyHealthSeen.value = true
+    riskPolicyHealthOpen.value = true
   }
 
-  function openMergePresetHealth() {
-    mergePresetHealthSeen.value = true
-    mergePresetHealthOpen.value = true
+  function openRiskPolicyHealth() {
+    riskPolicyHealthSeen.value = true
+    riskPolicyHealthOpen.value = true
   }
 
-  function closeMergePresetHealth() {
-    mergePresetHealthOpen.value = false
+  function closeRiskPolicyHealth() {
+    riskPolicyHealthOpen.value = false
   }
 
   /** Auto-open the model-preset health advisory once per session (no-op after it's been shown). */
@@ -839,8 +839,8 @@ export const useUiStore = defineStore('ui', () => {
     builderOpen,
     pipelineHealthOpen,
     pipelineHealthSeen,
-    mergePresetHealthOpen,
-    mergePresetHealthSeen,
+    riskPolicyHealthOpen,
+    riskPolicyHealthSeen,
     modelPresetHealthOpen,
     modelPresetHealthSeen,
     decisionContext,
@@ -907,9 +907,9 @@ export const useUiStore = defineStore('ui', () => {
     maybeOpenPipelineHealth,
     openPipelineHealth,
     closePipelineHealth,
-    maybeOpenMergePresetHealth,
-    openMergePresetHealth,
-    closeMergePresetHealth,
+    maybeOpenRiskPolicyHealth,
+    openRiskPolicyHealth,
+    closeRiskPolicyHealth,
     maybeOpenModelPresetHealth,
     openModelPresetHealth,
     closeModelPresetHealth,

package/app/stores/usage.ts

@@ -0,0 +1,60 @@
+import { defineStore } from 'pinia'
+import { computed, ref } from 'vue'
+import type { UsageReport } from '@cat-factory/contracts'
+
+/**
+ * The workspace's token-usage report for the current billing period (the "Usage" settings
+ * tab). Loaded on demand from `GET /workspaces/:ws/usage`; covers BOTH metered API/proxy
+ * calls and flat-rate subscription harness usage (Claude Code / Codex / GLM / pooled Kimi &
+ * DeepSeek). Reporting only — the spend budget still counts only the metered rows.
+ */
+export const useUsageStore = defineStore('usage', () => {
+  const api = useApi()
+  const report = ref<UsageReport | null>(null)
+  const loading = ref(false)
+  const error = ref<string | null>(null)
+
+  async function load(ws: string) {
+    loading.value = true
+    error.value = null
+    try {
+      report.value = await api.getUsage(ws)
+    } catch (e) {
+      error.value = e instanceof Error ? e.message : String(e)
+    } finally {
+      loading.value = false
+    }
+  }
+
+  const rows = computed(() => report.value?.rows ?? [])
+  const metered = computed(() => rows.value.filter((r) => r.billing === 'metered'))
+  const subscription = computed(() => rows.value.filter((r) => r.billing === 'subscription'))
+
+  /** Summed input/output tokens + cost for a set of rows. */
+  function totalOf(list: UsageReport['rows']) {
+    return list.reduce(
+      (acc, r) => ({
+        inputTokens: acc.inputTokens + r.inputTokens,
+        outputTokens: acc.outputTokens + r.outputTokens,
+        costEstimate: acc.costEstimate + r.costEstimate,
+        calls: acc.calls + r.calls,
+      }),
+      { inputTokens: 0, outputTokens: 0, costEstimate: 0, calls: 0 },
+    )
+  }
+
+  const meteredTotal = computed(() => totalOf(metered.value))
+  const subscriptionTotal = computed(() => totalOf(subscription.value))
+
+  return {
+    report,
+    loading,
+    error,
+    load,
+    rows,
+    metered,
+    subscription,
+    meteredTotal,
+    subscriptionTotal,
+  }
+})

package/app/stores/workspace.spec.ts

@@ -19,7 +19,7 @@ const INERT_STORES = [
   'useFragmentsStore',
   'useGitHubStore',
   'useInitiativesStore',
-  'useMergePresetsStore',
+  'useRiskPoliciesStore',
   'useModelPresetsStore',
   'useNotificationsStore',
   'usePipelinesStore',

package/app/stores/workspace.ts

@@ -13,7 +13,7 @@ import { usePipelinesStore } from '~/stores/pipelines'
 import { useExecutionStore } from '~/stores/execution'
 import { useAgentRunsStore } from '~/stores/agentRuns'
 import { useNotificationsStore } from '~/stores/notifications'
-import { useMergePresetsStore } from '~/stores/mergePresets'
+import { useRiskPoliciesStore } from '~/stores/riskPolicies'
 import { useSharedStacksStore } from '~/stores/sharedStacks'
 import { useWorkspaceSettingsStore } from '~/stores/workspaceSettings'
 import { useAgentConfigStore } from '~/stores/agentConfig'
@@ -120,9 +120,9 @@ export const useWorkspaceStore = defineStore(
       useAgentRunsStore().hydrate(snapshot.bootstrapJobs ?? [], snapshot.workspace.id)
       useAgentRunsStore().hydrateEnvConfigRepair(snapshot.envConfigRepairJobs ?? [])
       useNotificationsStore().hydrate(snapshot.notifications ?? [])
-      useMergePresetsStore().hydrate(
-        snapshot.mergePresets ?? [],
-        snapshot.mergePresetCatalogVersions,
+      useRiskPoliciesStore().hydrate(
+        snapshot.riskPolicies ?? [],
+        snapshot.riskPolicyCatalogVersions,
       )
       useSharedStacksStore().hydrate(snapshot.sharedStacks ?? [])
       useWorkspaceSettingsStore().hydrate(snapshot.settings)

package/app/types/merge.ts

@@ -7,7 +7,7 @@
 export type {
   MergeAssessment,
   RequirementConcernLevel,
-  MergeThresholdPreset,
-  CreateMergePresetInput,
-  UpdateMergePresetInput,
+  RiskPolicy,
+  CreateRiskPolicyInput,
+  UpdateRiskPolicyInput,
 } from '@cat-factory/contracts'

package/app/types/requirements.ts

@@ -18,4 +18,5 @@ export type {
   RecommendationStatus,
   RequirementRecommendation,
   RequirementReview,
+  RequestRecommendationItem,
 } from '@cat-factory/contracts'