From 3ed8d5f2c39ba0619d6fb8035ace8ac149c5495c Mon Sep 17 00:00:00 2001
From: Vincent Koc <vincentkoc@ieee.org>
Date: Mon, 8 Jun 2026 14:14:56 +0200
Subject: [PATCH] fix(tasks): keep maintenance migration scoped

---
 src/commands/tasks.test.ts | 4 ----
 src/commands/tasks.ts      | 8 ++++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/commands/tasks.test.ts b/src/commands/tasks.test.ts
index 90b0eae9cd67..38e0b4a45a87 100644
--- a/src/commands/tasks.test.ts
+++ b/src/commands/tasks.test.ts
@@ -270,8 +270,6 @@ describe("tasks commands", () => {
 
       const sessionsDir = state.sessionsDir("main");
       const storePath = path.join(sessionsDir, "sessions.json");
-      await state.writeConfig({ session: { store: storePath } });
-      resetConfigRuntimeState();
       await writeTaskSessionStore(storePath, {
         [childSessionKey]: {
           sessionId: "old-run",
@@ -335,8 +333,6 @@ describe("tasks commands", () => {
   it("keeps session registry maintenance preview from importing legacy JSON stores", async () => {
     await withTaskCommandStateDir(async (state) => {
       const storePath = path.join(state.sessionsDir("main"), "sessions.json");
-      await state.writeConfig({ session: { store: storePath } });
-      resetConfigRuntimeState();
       await fs.mkdir(path.dirname(storePath), { recursive: true });
       await fs.writeFile(
         storePath,
diff --git a/src/commands/tasks.ts b/src/commands/tasks.ts
index a2ebc270b2d7..2e315986af63 100644
--- a/src/commands/tasks.ts
+++ b/src/commands/tasks.ts
@@ -45,7 +45,7 @@ import {
 import { summarizeTaskRecords } from "../tasks/task-registry.summary.js";
 import type { TaskNotifyPolicy, TaskRecord } from "../tasks/task-registry.types.js";
 import {
-  ensureSessionStateMigratedForCommand,
+  ensureExplicitSessionStoreMigratedForCommand,
   loadExplicitSessionStorePreviewForCommand,
 } from "./session-state-migration.js";
 import {
@@ -151,12 +151,12 @@ async function runSessionRegistryMaintenance(params: {
   apply: boolean;
 }): Promise<SessionRegistryMaintenanceSummary> {
   const cfg = getRuntimeConfig();
-  if (params.apply) {
-    await ensureSessionStateMigratedForCommand(cfg);
-  }
   const runningCronJobIds = readRunningCronJobIds();
   const stores: SessionRegistryMaintenanceStoreSummary[] = [];
   for (const target of resolveAllAgentSessionStoreTargetsSync(cfg)) {
+    if (params.apply) {
+      await ensureExplicitSessionStoreMigratedForCommand(target.storePath);
+    }
     const beforeStore = params.apply
       ? loadSessionStore(target.storePath, { skipCache: true })
       : loadExplicitSessionStorePreviewForCommand(target.storePath);