fix(sandbox): KISS lifecycle claim — combiner under lib/sessions, IfMatch via updateSession

Two review fixes:

1) Move `claimSessionLifecycleRunId.ts` from `lib/supabase/sessions/`
   to `lib/sessions/`. The combiner doesn't directly query Supabase —
   it composes two underlying helpers, so per api convention it
   belongs alongside other domain composers, not under the Supabase
   namespace.

2) KISS: delete `claimSessionLifecycleRunIdIfMatch.ts` and use the
   existing `updateSession` helper for the lease-refresh path. The
   refresh writes the same `lifecycle_run_id` value back, so an
   unconditional `updateSession({ lifecycle_run_id: runId })` does the
   work — accepts a small race where a concurrent stale-reclaim could
   be overwritten, but the kick path (which DOES use the atomic
   `claimSessionLifecycleRunIdIfNull`) remains the primary
   concurrency guard.

Two callers (runKick, computeLifecycleWakeDecision) updated to import
from the new path. No behavior change at the workflow level.

Tests: 2579 / 2579 still pass. lint + tsc clean.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: sweetmantech

app/workflows/computeLifecycleWakeDecision.ts

@@ -1,6 +1,6 @@
 import { getLifecycleDueAtMs } from "@/lib/sandbox/getLifecycleDueAtMs";
 import { hasRuntimeSandboxState } from "@/lib/sandbox/hasRuntimeSandboxState";
-import { claimSessionLifecycleRunId } from "@/lib/supabase/sessions/claimSessionLifecycleRunId";
+import { claimSessionLifecycleRunId } from "@/lib/sessions/claimSessionLifecycleRunId";
 import { selectSessions } from "@/lib/supabase/sessions/selectSessions";
 
 interface LifecycleWakeDecision {

lib/sandbox/runKick.ts

@@ -4,7 +4,7 @@ import { createLifecycleRunId } from "@/lib/sandbox/createLifecycleRunId";
 import { isLifecycleRunStale } from "@/lib/sandbox/isLifecycleRunStale";
 import { reclaimStaleLease } from "@/lib/sandbox/reclaimStaleLease";
 import { shouldStartLifecycle } from "@/lib/sandbox/shouldStartLifecycle";
-import { claimSessionLifecycleRunId } from "@/lib/supabase/sessions/claimSessionLifecycleRunId";
+import { claimSessionLifecycleRunId } from "@/lib/sessions/claimSessionLifecycleRunId";
 import { selectSessions } from "@/lib/supabase/sessions/selectSessions";
 import { updateSession } from "@/lib/supabase/sessions/updateSession";
 import type { SandboxLifecycleReason } from "@/lib/sandbox/sandboxLifecycleTypes";

lib/sessions/claimSessionLifecycleRunId.ts

@@ -0,0 +1,32 @@
+import { claimSessionLifecycleRunIdIfNull } from "@/lib/supabase/sessions/claimSessionLifecycleRunIdIfNull";
+import { updateSession } from "@/lib/supabase/sessions/updateSession";
+
+/**
+ * Combiner for the two `lifecycle_run_id` claim operations. Lives in
+ * `lib/sessions/` (not `lib/supabase/sessions/`) because it does not
+ * directly query Supabase — it composes two underlying helpers.
+ *
+ * - `expected = null` (initial claim): atomic `claimSessionLifecycleRunIdIfNull`
+ *   that fails when the row already has a lease.
+ * - `expected = runId` (workflow refresh): plain `updateSession` write that
+ *   re-asserts the current lease without a conditional WHERE. Accepts a
+ *   small race where a stale-reclaim could be overwritten — the kick path
+ *   (which DOES use the atomic IfNull check) remains the primary
+ *   concurrency guard.
+ *
+ * @param sessionId - The session id to claim against.
+ * @param runId - The new lease value to write.
+ * @param expected - The expected current value; defaults to null.
+ * @returns true on success, false when an initial claim was already taken.
+ */
+export async function claimSessionLifecycleRunId(
+  sessionId: string,
+  runId: string,
+  expected: string | null = null,
+): Promise<boolean> {
+  if (expected === null) {
+    return claimSessionLifecycleRunIdIfNull(sessionId, runId);
+  }
+  const updated = await updateSession(sessionId, { lifecycle_run_id: runId });
+  return updated !== null;
+}