@cat-factory/app 0.121.1 → 0.121.2

package/app/stores/agentRuns.spec.ts

@@ -1,5 +1,5 @@
 import { describe, it, expect, beforeEach } from 'vitest'
-import type { BootstrapJob } from '~/types/domain'
+import type { BootstrapJob, EnvConfigRepairJob } from '~/types/domain'
 import { useAgentRunsStore } from '~/stores/agentRuns'
 
 /** Minimal BootstrapJob factory — only the fields the store's reconcile logic touches. */
@@ -72,3 +72,56 @@ describe('agentRuns store — monotonic bootstrap reconcile', () => {
     expect(store.bootstrapJobs[0]!.status).toBe('succeeded')
   })
 })
+
+/** Minimal EnvConfigRepairJob factory — only the fields the store touches. */
+function repairJob(id: string, over: Partial<EnvConfigRepairJob> = {}): EnvConfigRepairJob {
+  return {
+    id,
+    workspaceId: 'ws_test',
+    owner: 'acme',
+    repo: 'svc',
+    branch: 'main',
+    status: 'running',
+    ok: null,
+    issues: [],
+    subtasks: null,
+    error: null,
+    failure: null,
+    createdAt: 1,
+    updatedAt: 1,
+    ...over,
+  }
+}
+
+describe('agentRuns store — env-config-repair (plain useUpsertList adoption, candidate #3)', () => {
+  let store: ReturnType<typeof useAgentRunsStore>
+  beforeEach(() => {
+    store = useAgentRunsStore()
+  })
+
+  it('upsertEnvConfigRepair prepends a new run (newest-first) and replaces in place by id', () => {
+    store.upsertEnvConfigRepair(repairJob('r1'))
+    store.upsertEnvConfigRepair(repairJob('r2'))
+    // Newest prepended, so r2 leads r1.
+    expect(store.envConfigRepairJobs.map((j) => j.id)).toEqual(['r2', 'r1'])
+    // A later event for r1 replaces it IN PLACE (no reorder), unlike a monotonic-guarded list.
+    store.upsertEnvConfigRepair(repairJob('r1', { status: 'succeeded' }))
+    expect(store.envConfigRepairJobs.map((j) => j.id)).toEqual(['r2', 'r1'])
+    expect(store.envConfigRepairById('r1')?.status).toBe('succeeded')
+  })
+
+  it('envConfigRepairById looks a run up by id (absent → undefined)', () => {
+    store.upsertEnvConfigRepair(repairJob('r1'))
+    expect(store.envConfigRepairById('r1')?.id).toBe('r1')
+    expect(store.envConfigRepairById('nope')).toBeUndefined()
+  })
+
+  it('hydrateEnvConfigRepair replaces the cache newest-first', () => {
+    store.upsertEnvConfigRepair(repairJob('stale'))
+    store.hydrateEnvConfigRepair([
+      repairJob('old', { createdAt: 1 }),
+      repairJob('new', { createdAt: 9 }),
+    ])
+    expect(store.envConfigRepairJobs.map((j) => j.id)).toEqual(['new', 'old'])
+  })
+})

package/app/stores/agentRuns.ts

@@ -9,6 +9,7 @@ import type {
 } from '~/types/domain'
 import { useWorkspaceStore } from '~/stores/workspace'
 import { useExecutionStore } from '~/stores/execution'
+import { useUpsertList } from '~/composables/useUpsertList'
 
 /**
  * A coarse, per-block view of the current "agent run" against a block, regardless
@@ -62,9 +63,15 @@ export const useAgentRunsStore = defineStore('agentRuns', () => {
    * Env-config-repair runs for this workspace, newest-first. These have NO board block —
    * they're surfaced only on the infrastructure-providers window (looked up by the
    * `repairJobId` the `bootstrapRepo` response returned), so they're held separately and
-   * NOT merged into {@link byBlock}.
+   * NOT merged into {@link byBlock}. Unlike the bootstrap list this is a PLAIN find-by-id
+   * upsert (no `updatedAt` monotonic guard), so it routes through the shared
+   * {@link useUpsertList} helper (the last plain-upsert holdout, refactoring candidate #3).
    */
-  const envConfigRepairJobs = ref<EnvConfigRepairJob[]>([])
+  const {
+    items: envConfigRepairJobs,
+    upsert: upsertEnvConfigRepair,
+    get: envConfigRepairById,
+  } = useUpsertList<EnvConfigRepairJob>({ key: (j) => j.id, prepend: true })
 
   /**
    * Reconcile the cached bootstrap runs with a server snapshot for `workspaceId`. A snapshot is
@@ -96,27 +103,11 @@ export const useAgentRunsStore = defineStore('agentRuns', () => {
     bootstrapJobs.value = [...reconciled, ...preserved].sort((a, b) => b.createdAt - a.createdAt)
   }
 
-  /** Replace the cached env-config-repair runs with a server snapshot. */
+  /** Replace the cached env-config-repair runs with a server snapshot (newest-first). */
   function hydrateEnvConfigRepair(jobs: EnvConfigRepairJob[]) {
     envConfigRepairJobs.value = [...jobs].sort((a, b) => b.createdAt - a.createdAt)
   }
 
-  /**
-   * Patch an env-config-repair run from a real-time `env-config-repair` event (or after
-   * launching one): replace it in place by id, else prepend it. Keeps the infra window's
-   * "repairing…" indicator reactive to live progress / outcome without a refetch.
-   */
-  function upsertEnvConfigRepair(job: EnvConfigRepairJob) {
-    const i = envConfigRepairJobs.value.findIndex((j) => j.id === job.id)
-    if (i >= 0) envConfigRepairJobs.value[i] = job
-    else envConfigRepairJobs.value.unshift(job)
-  }
-
-  /** Look up a single env-config-repair run by id (the infra window tracks one by `repairJobId`). */
-  function envConfigRepairById(id: string): EnvConfigRepairJob | undefined {
-    return envConfigRepairJobs.value.find((j) => j.id === id)
-  }
-
   /**
    * Patch a bootstrap run from a real-time `bootstrap` event (or after launching
    * one): replace it in place by id, else prepend it. Keeps the service card