refactor: migrate 50 services from Context.Tag to Effect.Service

Replace legacy Context.Tag pattern with Effect.Service across all
services, reducing boilerplate by ~1400 lines. Updates .of() to .make()
at 39 external call sites. Removes unnecessary catchAll on unfailable
Scope.close in store-db.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: mepuka

src/cli/app.ts

@@ -56,9 +56,9 @@ export const app = Command.make("skygent", configOptions).pipe(
       CliLive.pipe(
         Layer.provide(
           Layer.mergeAll(
-            Layer.succeed(ConfigOverrides, toConfigOverrides(config)),
-            Layer.succeed(CredentialsOverrides, toCredentialsOverrides(config)),
-            Layer.succeed(SyncSettingsOverrides, toSyncSettingsOverrides(config)),
+            Layer.succeed(ConfigOverrides, ConfigOverrides.make(toConfigOverrides(config))),
+            Layer.succeed(CredentialsOverrides, CredentialsOverrides.make(toCredentialsOverrides(config))),
+            Layer.succeed(SyncSettingsOverrides, SyncSettingsOverrides.make(toSyncSettingsOverrides(config))),
             DerivationSettingsOverrides.layer
           )
         )

src/cli/input.ts

@@ -1,6 +1,6 @@
 import { BunStream } from "@effect/platform-bun";
 import { SystemError, type PlatformError } from "@effect/platform/Error";
-import { Context, Layer, Stream } from "effect";
+import { Effect, Stream } from "effect";
 import { fstatSync } from "node:fs";
 import { isatty } from "node:tty";
 
@@ -29,24 +29,20 @@ const makeLines = () => {
   );
 };
 
-export class CliInput extends Context.Tag("@skygent/CliInput")<
-  CliInput,
-  CliInputService
->() {
-  static readonly layer = Layer.succeed(
-    CliInput,
-    CliInput.of({
-      lines: makeLines(),
-      isTTY: Boolean(process.stdin.isTTY || isatty(process.stdin.fd ?? 0)),
-      isReadable: (() => {
-        try {
-          const fd = process.stdin.fd ?? 0;
-          const stat = fstatSync(fd);
-          return stat.isFIFO() || stat.isFile() || stat.isSocket();
-        } catch {
-          return false;
-        }
-      })()
-    })
-  );
+export class CliInput extends Effect.Service<CliInput>()("@skygent/CliInput", {
+  succeed: {
+    lines: makeLines(),
+    isTTY: Boolean(process.stdin.isTTY || isatty(process.stdin.fd ?? 0)),
+    isReadable: (() => {
+      try {
+        const fd = process.stdin.fd ?? 0;
+        const stat = fstatSync(fd);
+        return stat.isFIFO() || stat.isFile() || stat.isSocket();
+      } catch {
+        return false;
+      }
+    })()
+  }
+}) {
+  static readonly layer = CliInput.Default;
 }

src/cli/logging.ts

@@ -123,7 +123,7 @@ export const makeSyncReporter = (
   monitor: ResourceMonitorService,
   output: CliOutputService
 ) =>
-  SyncReporter.of({
+  SyncReporter.make({
     report: (progress) =>
       Effect.gen(function* () {
         const format = yield* resolveLogFormat;

src/cli/output.ts

@@ -1,6 +1,6 @@
 import { BunSink } from "@effect/platform-bun";
 import { SystemError, type PlatformError } from "@effect/platform/Error";
-import { Context, Effect, Layer, Sink, Stream } from "effect";
+import { Effect, Sink, Stream } from "effect";
 
 const jsonLine = (value: unknown, pretty?: boolean) =>
   JSON.stringify(value, null, pretty ? 2 : 0);
@@ -23,51 +23,47 @@ export interface CliOutputService {
   readonly writeStderr: (value: string) => Effect.Effect<void, PlatformError>;
 }
 
-export class CliOutput extends Context.Tag("@skygent/CliOutput")<
-  CliOutput,
-  CliOutputService
->() {
-  static readonly layer = Layer.succeed(
-    CliOutput,
-    (() => {
-      const stdout = BunSink.fromWritable(
-        () => process.stdout,
-        (cause) =>
-          new SystemError({
-            module: "Stream",
-            method: "stdout",
-            reason: "Unknown",
-            cause
-          }),
-        { endOnDone: false }
-      );
-      const stderr = BunSink.fromWritable(
-        () => process.stderr,
-        (cause) =>
-          new SystemError({
-            module: "Stream",
-            method: "stderr",
-            reason: "Unknown",
-            cause
-          }),
-        { endOnDone: false }
-      );
+export class CliOutput extends Effect.Service<CliOutput>()("@skygent/CliOutput", {
+  succeed: (() => {
+    const stdout = BunSink.fromWritable(
+      () => process.stdout,
+      (cause) =>
+        new SystemError({
+          module: "Stream",
+          method: "stdout",
+          reason: "Unknown",
+          cause
+        }),
+      { endOnDone: false }
+    );
+    const stderr = BunSink.fromWritable(
+      () => process.stderr,
+      (cause) =>
+        new SystemError({
+          module: "Stream",
+          method: "stderr",
+          reason: "Unknown",
+          cause
+        }),
+      { endOnDone: false }
+    );
 
-      return CliOutput.of({
-        stdout,
-        stderr,
-        writeJson: (value, pretty) =>
-          writeToSink(stdout, ensureNewline(jsonLine(value, pretty))),
-        writeText: (value) => writeToSink(stdout, ensureNewline(value)),
-        writeJsonStream: (stream) =>
-          stream.pipe(
-            Stream.map((value) => `${jsonLine(value)}\n`),
-            Stream.run(stdout)
-          ),
-        writeStderr: (value) => writeToSink(stderr, ensureNewline(value))
-      });
-    })()
-  );
+    return {
+      stdout,
+      stderr,
+      writeJson: (value: unknown, pretty?: boolean) =>
+        writeToSink(stdout, ensureNewline(jsonLine(value, pretty))),
+      writeText: (value: string) => writeToSink(stdout, ensureNewline(value)),
+      writeJsonStream: <A, E, R>(stream: Stream.Stream<A, E, R>) =>
+        stream.pipe(
+          Stream.map((value) => `${jsonLine(value)}\n`),
+          Stream.run(stdout)
+        ),
+      writeStderr: (value: string) => writeToSink(stderr, ensureNewline(value))
+    };
+  })()
+}) {
+  static readonly layer = CliOutput.Default;
 }
 
 export const writeJson = (value: unknown, pretty?: boolean) =>

src/services/app-config.ts

@@ -1,6 +1,6 @@
 import { FileSystem } from "@effect/platform";
 import { Path } from "@effect/platform";
-import { Config, Context, Effect, Layer, Option, Schema } from "effect";
+import { Config, Effect, Option, Schema } from "effect";
 import { formatSchemaError, pickDefined } from "./shared.js";
 import { AppConfig, OutputFormat } from "../domain/config.js";
 import { ConfigError } from "../domain/errors.js";
@@ -81,17 +81,16 @@ type AppConfigOverrides = Partial<AppConfig>;
  * }).pipe(Effect.provide(overridesLayer));
  * ```
  */
-export class ConfigOverrides extends Context.Tag("@skygent/ConfigOverrides")<
-  ConfigOverrides,
-  AppConfigOverrides
->() {
+export class ConfigOverrides extends Effect.Service<ConfigOverrides>()("@skygent/ConfigOverrides", {
+  succeed: {} as AppConfigOverrides
+}) {
   /**
    * Default empty configuration overrides layer.
    *
    * Use this as a base layer when no overrides are needed, or extend it
    * with custom overrides using Layer.succeed.
    */
-  static readonly layer = Layer.succeed(ConfigOverrides, {});
+  static readonly layer = ConfigOverrides.Default;
 }
 
 const PartialAppConfig = Schema.Struct({
@@ -197,10 +196,54 @@ const envOutputFormat = Config.literal("json", "ndjson", "markdown", "table")(
  * const runnable = program.pipe(Effect.provide(AppConfigService.layer));
  * ```
  */
-export class AppConfigService extends Context.Tag("@skygent/AppConfig")<
-  AppConfigService,
-  AppConfig
->() {
+export class AppConfigService extends Effect.Service<AppConfigService>()("@skygent/AppConfig", {
+  effect: Effect.gen(function* () {
+    const { _tag: _, ...overrides } = yield* ConfigOverrides;
+    const path = yield* Path.Path;
+    const defaultRoot = resolveDefaultRoot(path);
+    const configPath = path.join(defaultRoot, configFileName);
+
+    const fileConfig = yield* loadFileConfig(configPath);
+
+    const envService = yield* Config.string("SKYGENT_SERVICE").pipe(Config.option);
+    const envStoreRoot = yield* Config.string("SKYGENT_STORE_ROOT").pipe(Config.option);
+    const envFormat = yield* envOutputFormat.pipe(Config.option);
+    const envIdentifier = yield* Config.string("SKYGENT_IDENTIFIER").pipe(Config.option);
+
+    const envConfig = pickDefined({
+      service: Option.getOrUndefined(envService),
+      storeRoot: Option.getOrUndefined(envStoreRoot),
+      outputFormat: Option.getOrUndefined(envFormat),
+      identifier: Option.getOrUndefined(envIdentifier)
+    });
+
+    const merged = {
+      service: defaultService,
+      storeRoot: defaultRoot,
+      outputFormat: defaultOutputFormat,
+      ...fileConfig,
+      ...envConfig,
+      ...pickDefined(overrides as Record<string, unknown>)
+    };
+
+    const resolvedStoreRoot = merged.storeRoot ?? defaultRoot;
+    const normalized = {
+      ...merged,
+      storeRoot: normalizeStoreRoot(path, resolvedStoreRoot)
+    };
+
+    const decoded = yield* Schema.decodeUnknown(AppConfig)(normalized).pipe(
+      Effect.mapError((error) =>
+        ConfigError.make({
+          message: `Invalid config: ${formatSchemaError(error)}`,
+          path: configPath,
+          cause: error
+        })
+      )
+    );
+    return decoded;
+  })
+}) {
   /**
    * Layer that constructs the AppConfigService by resolving configuration
    * from all sources in priority order.
@@ -226,53 +269,5 @@ export class AppConfigService extends Context.Tag("@skygent/AppConfig")<
    * );
    * ```
    */
-  static readonly layer = Layer.effect(
-    AppConfigService,
-    Effect.gen(function* () {
-      const overrides = yield* ConfigOverrides;
-      const path = yield* Path.Path;
-      const defaultRoot = resolveDefaultRoot(path);
-      const configPath = path.join(defaultRoot, configFileName);
-
-      const fileConfig = yield* loadFileConfig(configPath);
-
-      const envService = yield* Config.string("SKYGENT_SERVICE").pipe(Config.option);
-      const envStoreRoot = yield* Config.string("SKYGENT_STORE_ROOT").pipe(Config.option);
-      const envFormat = yield* envOutputFormat.pipe(Config.option);
-      const envIdentifier = yield* Config.string("SKYGENT_IDENTIFIER").pipe(Config.option);
-
-      const envConfig = pickDefined({
-        service: Option.getOrUndefined(envService),
-        storeRoot: Option.getOrUndefined(envStoreRoot),
-        outputFormat: Option.getOrUndefined(envFormat),
-        identifier: Option.getOrUndefined(envIdentifier)
-      });
-
-      const merged = {
-        service: defaultService,
-        storeRoot: defaultRoot,
-        outputFormat: defaultOutputFormat,
-        ...fileConfig,
-        ...envConfig,
-        ...pickDefined(overrides as Record<string, unknown>)
-      };
-
-      const resolvedStoreRoot = merged.storeRoot ?? defaultRoot;
-      const normalized = {
-        ...merged,
-        storeRoot: normalizeStoreRoot(path, resolvedStoreRoot)
-      };
-
-      const decoded = yield* Schema.decodeUnknown(AppConfig)(normalized).pipe(
-        Effect.mapError((error) =>
-          ConfigError.make({
-            message: `Invalid config: ${formatSchemaError(error)}`,
-            path: configPath,
-            cause: error
-          })
-        )
-      );
-      return AppConfigService.of(decoded);
-    })
-  );
+  static readonly layer = AppConfigService.Default;
 }