feat(core): resume suspended sessions after service restart (#36105)

packages/cli/src/server-process.ts

@@ -65,6 +65,7 @@ const processEffect = Effect.fnUntraced(function* (options: Options) {
         hostname: options.hostname ?? config.hostname ?? "127.0.0.1",
         port: Option.fromNullishOr(options.port ?? config.port),
         password,
+        restartContinuity: options.mode === "service",
       }).pipe(Effect.provide(Logger.layer([], { mergeWithExisting: false })))
       if (lockScope !== undefined) {
         yield* register(address, password)

packages/cli/test/service.test.ts

@@ -1,8 +1,17 @@
 import { NodeFileSystem } from "@effect/platform-node"
 import { Service } from "@opencode-ai/client/effect"
+import { Database } from "@opencode-ai/core/database/database"
+import { EventV2 } from "@opencode-ai/core/event"
+import { EventTable } from "@opencode-ai/core/event/sql"
 import { Global } from "@opencode-ai/core/global"
+import { Project } from "@opencode-ai/core/project"
+import { ProjectTable } from "@opencode-ai/core/project/sql"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { SessionV2 } from "@opencode-ai/core/session"
+import { SessionEvent } from "@opencode-ai/core/session/event"
+import { SessionTable } from "@opencode-ai/core/session/sql"
 import { expect, test } from "bun:test"
-import { Effect, Schema } from "effect"
+import { Effect, Schedule, Schema } from "effect"
 import fs from "node:fs/promises"
 import os from "node:os"
 import path from "node:path"
@@ -28,16 +37,42 @@ test("local channel stores service config with the local service filename", asyn
 
 test("concurrent service processes elect one server", async () => {
   const root = await fs.mkdtemp(path.join(os.tmpdir(), "opencode-service-election-"))
+  const database = path.join(root, "opencode.db")
   const env = {
     ...process.env,
     HOME: root,
-    OPENCODE_DB: path.join(root, "opencode.db"),
+    OPENCODE_DB: database,
     OPENCODE_TEST_HOME: root,
     XDG_CACHE_HOME: path.join(root, "cache"),
     XDG_CONFIG_HOME: path.join(root, "config"),
     XDG_DATA_HOME: path.join(root, "data"),
     XDG_STATE_HOME: path.join(root, "state"),
   }
+  const sessionID = SessionV2.ID.make("ses_service_recovery")
+  await withDatabase(
+    database,
+    Effect.gen(function* () {
+      const { db } = yield* Database.Service
+      yield* db
+        .insert(ProjectTable)
+        .values({ id: Project.ID.global, worktree: AbsolutePath.make(root), sandboxes: [] })
+        .run()
+        .pipe(Effect.orDie)
+      yield* db
+        .insert(SessionTable)
+        .values({
+          id: sessionID,
+          project_id: Project.ID.global,
+          slug: "recovery",
+          directory: root,
+          title: "recovery",
+          version: "test",
+          time_suspended: Date.now(),
+        })
+        .run()
+        .pipe(Effect.orDie)
+    }),
+  )
   const command = [process.execPath, path.join(import.meta.dir, "../src/index.ts"), "serve", "--service"]
   const first = Bun.spawn(command, { env, stderr: "pipe", stdout: "ignore" })
   const second = Bun.spawn(command, { env, stderr: "pipe", stdout: "ignore" })
@@ -51,6 +86,20 @@ test("concurrent service processes elect one server", async () => {
 
     expect(exited).toBe(true)
     expect(winner.exitCode).toBe(null)
+    expect(
+      await withDatabase(
+        database,
+        Effect.gen(function* () {
+          const { db } = yield* Database.Service
+          return yield* db
+            .select({ timeSuspended: SessionTable.time_suspended })
+            .from(SessionTable)
+            .get()
+            .pipe(Effect.orDie)
+        }),
+      ),
+    ).toEqual({ timeSuspended: null })
+    expect(await waitForExecutionStart(database, sessionID)).toBe(1)
   } finally {
     first.kill("SIGTERM")
     second.kill("SIGTERM")
@@ -59,6 +108,40 @@ test("concurrent service processes elect one server", async () => {
   }
 })
 
+function withDatabase<A, E>(file: string, effect: Effect.Effect<A, E, Database.Service>) {
+  return Effect.runPromise(effect.pipe(Effect.provide(Database.layerFromPath(file)), Effect.scoped))
+}
+
+function waitForExecutionStart(file: string, sessionID: SessionV2.ID) {
+  return withDatabase(
+    file,
+    Effect.gen(function* () {
+      const { db } = yield* Database.Service
+      return yield* db
+        .select({ id: EventTable.id, sessionID: EventTable.aggregate_id, type: EventTable.type })
+        .from(EventTable)
+        .all()
+        .pipe(
+          Effect.orDie,
+          Effect.map((rows) =>
+            rows.filter(
+              (row) =>
+                row.sessionID === sessionID &&
+                row.type ===
+                  EventV2.versionedType(
+                    SessionEvent.Execution.Started.type,
+                    SessionEvent.Execution.Started.durable.version,
+                  ),
+            ),
+          ),
+          Effect.filterOrFail((rows) => rows.length > 0),
+          Effect.map((rows) => rows.length),
+          Effect.retry(Schedule.spaced("50 millis").pipe(Schedule.both(Schedule.recurs(200)))),
+        )
+    }),
+  )
+}
+
 async function waitForInfo(file: string) {
   for (let attempt = 0; attempt < 200; attempt++) {
     const value = await Bun.file(file)