fix(sessions): inherit active mode in partial type resets

steipete · steipete · commit 4cd755c347a1 · 2026-07-18T21:37:50.000-07:00
diff --git a/src/config/sessions/reset-policy.test.ts b/src/config/sessions/reset-policy.test.ts
@@ -90,6 +90,18 @@ describe("session reset policy", () => {
     ).toMatchObject({ mode: "daily", idleMinutes: 30 });
   });
 
+  it("inherits an active base mode for partial type overrides", () => {
+    expect(
+      resolveSessionResetPolicy({
+        sessionCfg: {
+          reset: { mode: "idle", idleMinutes: 60 },
+          resetByType: { group: { idleMinutes: 30 } },
+        },
+        resetType: "group",
+      }),
+    ).toMatchObject({ mode: "idle", idleMinutes: 30 });
+  });
+
   it("expires an explicit idle policy after inactivity", () => {
     const now = 10 * HOUR_MS;
     const lastInteractionAt = now - 31 * 60_000;
diff --git a/src/config/sessions/reset-policy.ts b/src/config/sessions/reset-policy.ts
@@ -54,8 +54,10 @@ export function resolveSessionResetPolicy(params: {
   const legacyIdleMinutes = params.resetOverride ? undefined : sessionCfg?.idleMinutes;
   const configured = Boolean(baseReset || typeReset || legacyIdleMinutes != null);
   // Legacy `idleMinutes` implied idle reset only when no modern reset block was configured.
+  const inheritedTypeMode = typeReset && baseReset?.mode !== "none" ? baseReset?.mode : undefined;
   const mode =
     typeReset?.mode ??
+    inheritedTypeMode ??
     (typeReset ? "daily" : undefined) ??
     baseReset?.mode ??
     (baseReset
