@knpkv/confluence-to-markdown 0.6.0 → 0.7.0

package/src/AtlaskitTransformers.ts

@@ -40,16 +40,14 @@ const transformers: Transformers = { md, json }
  *
  * @category Service
  */
-export class AtlaskitTransformers extends Context.Tag(
-  "@knpkv/confluence-to-markdown/AtlaskitTransformers"
-)<
+export class AtlaskitTransformers extends Context.Service<
   AtlaskitTransformers,
   {
     readonly use: <A>(
       fn: (t: Transformers) => A
     ) => Effect.Effect<A, AtlaskitTransformersError>
   }
->() {}
+>()("@knpkv/confluence-to-markdown/AtlaskitTransformers") {}
 
 /**
  * Live Layer providing the wrapped @atlaskit transformers. The transformer

package/src/Brand.ts

@@ -26,9 +26,8 @@ export type PageId = string & Brand.Brand<"PageId">
  *
  * @category Brand
  */
-export const PageId = Brand.refined<PageId>(
-  (s): s is PageId => typeof s === "string" && s.length > 0,
-  (s) => Brand.error(`Invalid page ID: "${s}" (must be non-empty string)`)
+export const PageId = Brand.make<PageId>((s) =>
+  typeof s === "string" && s.length > 0 || `Invalid page ID: "${s}" (must be non-empty string)`
 )
 
 /**
@@ -36,10 +35,7 @@ export const PageId = Brand.refined<PageId>(
  *
  * @category Schema
  */
-export const PageIdSchema = Schema.String.pipe(
-  Schema.nonEmptyString(),
-  Schema.brand("PageId")
-)
+export const PageIdSchema = Schema.NonEmptyString.pipe(Schema.brand("PageId"))
 
 /**
  * Branded type for Confluence space keys.
@@ -60,9 +56,9 @@ export type SpaceKey = string & Brand.Brand<"SpaceKey">
  *
  * @category Brand
  */
-export const SpaceKey = Brand.refined<SpaceKey>(
-  (s): s is SpaceKey => typeof s === "string" && s.length > 0 && /^[A-Z0-9]+$/.test(s),
-  (s) => Brand.error(`Invalid space key: "${s}" (must be uppercase alphanumeric)`)
+export const SpaceKey = Brand.make<SpaceKey>((s) =>
+  typeof s === "string" && s.length > 0 && /^[A-Z0-9]+$/.test(s)
+  || `Invalid space key: "${s}" (must be uppercase alphanumeric)`
 )
 
 /**
@@ -71,8 +67,7 @@ export const SpaceKey = Brand.refined<SpaceKey>(
  * @category Schema
  */
 export const SpaceKeySchema = Schema.String.pipe(
-  Schema.nonEmptyString(),
-  Schema.pattern(/^[A-Z0-9]+$/),
+  Schema.check(Schema.isNonEmpty(), Schema.isPattern(/^[A-Z0-9]+$/)),
   Schema.brand("SpaceKey")
 )
 
@@ -88,9 +83,9 @@ export type ContentHash = string & Brand.Brand<"ContentHash">
  *
  * @category Brand
  */
-export const ContentHash = Brand.refined<ContentHash>(
-  (s): s is ContentHash => typeof s === "string" && /^[a-f0-9]{64}$/.test(s),
-  (s) => Brand.error(`Invalid content hash: "${s}" (must be 64-char hex string)`)
+export const ContentHash = Brand.make<ContentHash>((s) =>
+  typeof s === "string" && /^[a-f0-9]{64}$/.test(s)
+  || `Invalid content hash: "${s}" (must be 64-char hex string)`
 )
 
 /**
@@ -99,6 +94,6 @@ export const ContentHash = Brand.refined<ContentHash>(
  * @category Schema
  */
 export const ContentHashSchema = Schema.String.pipe(
-  Schema.pattern(/^[a-f0-9]{64}$/),
+  Schema.check(Schema.isPattern(/^[a-f0-9]{64}$/)),
   Schema.brand("ContentHash")
 )

package/src/ConfluenceAuth.ts

@@ -11,12 +11,7 @@
  *
  * @module
  */
-import * as NodeFileSystem from "@effect/platform-node/NodeFileSystem"
-import * as NodePath from "@effect/platform-node/NodePath"
-import * as Command from "@effect/platform/Command"
-import * as CommandExecutor from "@effect/platform/CommandExecutor"
-import * as HttpClient from "@effect/platform/HttpClient"
-import * as HttpClientRequest from "@effect/platform/HttpClientRequest"
+import * as NodeServices from "@effect/platform-node/NodeServices"
 import * as Console from "effect/Console"
 import * as Context from "effect/Context"
 import * as Deferred from "effect/Deferred"
@@ -25,6 +20,9 @@ import * as Layer from "effect/Layer"
 import * as Option from "effect/Option"
 import * as Ref from "effect/Ref"
 import * as Schema from "effect/Schema"
+import { HttpClient, HttpClientRequest } from "effect/unstable/http"
+import { ChildProcessSpawner } from "effect/unstable/process"
+import * as ChildProcess from "effect/unstable/process/ChildProcess"
 import type { FileSystemError } from "./ConfluenceError.js"
 import { AuthMissingError, OAuthError } from "./ConfluenceError.js"
 import { HttpServerFactoryLive } from "./internal/NodeLayers.js"
@@ -41,8 +39,7 @@ import type { OAuthConfig, OAuthToken, OAuthUser } from "./Schemas.js"
 
 // Layer for token storage operations (FileSystem + Path + HomeDirectory)
 const TokenStorageLive = Layer.mergeAll(
-  NodeFileSystem.layer,
-  NodePath.layer,
+  NodeServices.layer,
   HomeDirectoryLive
 )
 
@@ -168,10 +165,10 @@ export interface ConfluenceAuthService {
  *
  * @category Services
  */
-export class ConfluenceAuth extends Context.Tag("@knpkv/confluence-to-markdown/ConfluenceAuth")<
+export class ConfluenceAuth extends Context.Service<
   ConfluenceAuth,
   ConfluenceAuthService
->() {}
+>()("@knpkv/confluence-to-markdown/ConfluenceAuth") {}
 
 const buildAuthUrl = (clientId: string, state: string, port: number): string => {
   const params = new URLSearchParams({
@@ -195,7 +192,7 @@ const saveOAuthConfigOp = (config: OAuthConfig) => saveOAuthConfig(config).pipe(
 
 const make = Effect.gen(function*() {
   const httpClient = yield* HttpClient.HttpClient
-  const commandExecutor = yield* CommandExecutor.CommandExecutor
+  const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner
 
   // Ref to track ongoing refresh operation to prevent concurrent refreshes
   const refreshLock = yield* Ref.make<Option.Option<Deferred.Deferred<OAuthToken, OAuthError | FileSystemError>>>(
@@ -204,19 +201,14 @@ const make = Effect.gen(function*() {
 
   const openBrowserImpl = (url: string): Effect.Effect<void, OAuthError> =>
     Effect.gen(function*() {
-      const platform = process.platform
-      let command: Command.Command
-
-      if (platform === "darwin") {
-        command = Command.make("open", url)
-      } else if (platform === "win32") {
-        command = Command.make("cmd", "/c", "start", "", url)
-      } else {
-        command = Command.make("xdg-open", url)
-      }
+      const run = (command: ChildProcess.Command) =>
+        childProcessSpawner.exitCode(command).pipe(
+          Effect.flatMap((code) => code === 0 ? Effect.void : Effect.fail(code))
+        )
 
-      yield* Command.exitCode(command).pipe(
-        Effect.provide(Layer.succeed(CommandExecutor.CommandExecutor, commandExecutor))
+      yield* run(ChildProcess.make("open", [url])).pipe(
+        Effect.catchIf(() => true, () => run(ChildProcess.make("xdg-open", [url]))),
+        Effect.catchIf(() => true, () => run(ChildProcess.make("rundll32.exe", ["url.dll,FileProtocolHandler", url])))
       )
     }).pipe(
       Effect.mapError((cause) => new OAuthError({ step: "authorize", cause }))
@@ -256,7 +248,7 @@ const make = Effect.gen(function*() {
       const response = yield* httpClient.execute(request)
       const body = yield* response.json
 
-      return yield* Schema.decodeUnknown(TokenResponseSchema)(body)
+      return yield* Schema.decodeUnknownEffect(TokenResponseSchema)(body)
     }).pipe(
       Effect.mapError((cause) => new OAuthError({ step: "token", cause }))
     )
@@ -273,7 +265,7 @@ const make = Effect.gen(function*() {
       const response = yield* httpClient.execute(request)
       const body = yield* response.json
 
-      return yield* Schema.decodeUnknown(Schema.Array(AccessibleResourceSchema))(body)
+      return yield* Schema.decodeUnknownEffect(Schema.Array(AccessibleResourceSchema))(body)
     }).pipe(
       Effect.mapError((cause) => new OAuthError({ step: "authorize", cause }))
     )
@@ -290,7 +282,7 @@ const make = Effect.gen(function*() {
       const response = yield* httpClient.execute(request)
       const body = yield* response.json
 
-      return yield* Schema.decodeUnknown(UserInfoSchema)(body)
+      return yield* Schema.decodeUnknownEffect(UserInfoSchema)(body)
     }).pipe(
       Effect.mapError((cause) => new OAuthError({ step: "authorize", cause }))
     )
@@ -317,7 +309,7 @@ const make = Effect.gen(function*() {
       const body = yield* response.json.pipe(
         Effect.mapError((cause) => new OAuthError({ step: "refresh", cause }))
       )
-      const tokenResponse = yield* Schema.decodeUnknown(TokenResponseSchema)(body).pipe(
+      const tokenResponse = yield* Schema.decodeUnknownEffect(TokenResponseSchema)(body).pipe(
         Effect.mapError((cause) => new OAuthError({ step: "refresh", cause }))
       )
 
@@ -389,7 +381,7 @@ const make = Effect.gen(function*() {
 
       const code = yield* codePromise.pipe(
         Effect.timeout("5 minutes"),
-        Effect.catchTag("TimeoutException", () =>
+        Effect.catchTag("TimeoutError", () =>
           Effect.fail(new OAuthError({ step: "authorize", cause: "Authorization timed out" })))
       )
 
@@ -476,7 +468,7 @@ const make = Effect.gen(function*() {
       if (config !== null) {
         yield* revokeToken(token, config).pipe(
           Effect.tap(() => Effect.log("Token revoked with Atlassian")),
-          Effect.catchAll((error) => Effect.log(`Warning: Failed to revoke token: ${error.message}`))
+          Effect.catchIf(() => true, (error) => Effect.log(`Warning: Failed to revoke token: ${error.message}`))
         )
       }
 
@@ -577,5 +569,5 @@ const make = Effect.gen(function*() {
 export const layer: Layer.Layer<
   ConfluenceAuth,
   never,
-  HttpClient.HttpClient | CommandExecutor.CommandExecutor
+  HttpClient.HttpClient | ChildProcessSpawner.ChildProcessSpawner
 > = Layer.effect(ConfluenceAuth, make)

package/src/ConfluenceClient.ts

@@ -67,9 +67,7 @@ export interface UpdatePageRequest {
  *
  * @category Client
  */
-export class ConfluenceClient extends Context.Tag(
-  "@knpkv/confluence-to-markdown/ConfluenceClient"
-)<
+export class ConfluenceClient extends Context.Service<
   ConfluenceClient,
   {
     /**
@@ -126,7 +124,7 @@ export class ConfluenceClient extends Context.Tag(
      */
     readonly setEditorVersion: (pageId: PageId, version: "v1" | "v2") => Effect.Effect<void, ApiError | RateLimitError>
   }
->() {}
+>()("@knpkv/confluence-to-markdown/ConfluenceClient") {}
 
 /**
  * Configuration for the Confluence client.
@@ -155,11 +153,17 @@ const VERSIONS_PAGE_SIZE = 50
 /**
  * Rate limit retry schedule with exponential backoff.
  */
-const rateLimitSchedule = Schedule.exponential("1 second").pipe(
-  Schedule.union(Schedule.spaced("30 seconds")),
-  Schedule.whileInput<RateLimitError | ApiError>((error) => error._tag === "RateLimitError"),
-  Schedule.intersect(Schedule.recurs(3))
-)
+const rateLimitRetry = {
+  schedule: Schedule.exponential("1 second").pipe(
+    Schedule.either(Schedule.spaced("30 seconds"))
+  ),
+  times: 3,
+  while: (error: unknown) =>
+    typeof error === "object" &&
+    error !== null &&
+    "_tag" in error &&
+    error._tag === "RateLimitError"
+} as const
 
 /**
  * Map API client errors to domain errors.
@@ -177,7 +181,7 @@ const mapApiError = (error: FetchClientError, endpoint: string, pageId?: string)
  */
 const make = (
   config: ConfluenceClientConfig
-): Effect.Effect<Context.Tag.Service<typeof ConfluenceClient>> =>
+): Effect.Effect<Context.Service.Shape<typeof ConfluenceClient>> =>
   Effect.gen(function*() {
     // Create underlying API client
     const apiConfigLayer = Layer.succeed(ConfluenceApiConfig, {
@@ -197,7 +201,7 @@ const make = (
         params: { path: { id: Number(id) }, query: { "body-format": "atlas_doc_format" } }
       })).pipe(
         Effect.mapError((e) => mapApiError(e, `/pages/${id}`, id)),
-        Effect.retry(rateLimitSchedule)
+        Effect.retry(rateLimitRetry)
       ) as Effect.Effect<PageResponse, ApiError | RateLimitError>
 
     const getChildren = (id: PageId): Effect.Effect<PageChildrenResponse, ApiError | RateLimitError> =>
@@ -205,7 +209,7 @@ const make = (
         params: { path: { id: Number(id) } }
       })).pipe(
         Effect.mapError((e) => mapApiError(e, `/pages/${id}/children`, id)),
-        Effect.retry(rateLimitSchedule)
+        Effect.retry(rateLimitRetry)
       ) as Effect.Effect<PageChildrenResponse, ApiError | RateLimitError>
 
     const getAllChildren = (id: PageId): Effect.Effect<ReadonlyArray<PageListItem>, ApiError | RateLimitError> =>
@@ -230,7 +234,7 @@ const make = (
             params: { path: { id: Number(id) }, query: { ...(cursor ? { cursor } : {}) } }
           })).pipe(
             Effect.mapError((e) => mapApiError(e, `/pages/${id}/children`, id)),
-            Effect.retry(rateLimitSchedule)
+            Effect.retry(rateLimitRetry)
           )
 
           for (const child of (response as { results?: Array<PageListItem> }).results ?? []) {
@@ -260,7 +264,7 @@ const make = (
         }
       })).pipe(
         Effect.mapError((e) => mapApiError(e, "/pages")),
-        Effect.retry(rateLimitSchedule)
+        Effect.retry(rateLimitRetry)
       ) as Effect.Effect<PageResponse, ApiError | RateLimitError>
 
     const updatePage = (req: UpdatePageRequest): Effect.Effect<PageResponse, ApiError | RateLimitError> =>
@@ -275,7 +279,7 @@ const make = (
         }
       })).pipe(
         Effect.mapError((e) => mapApiError(e, `/pages/${req.id}`, req.id)),
-        Effect.retry(rateLimitSchedule)
+        Effect.retry(rateLimitRetry)
       ) as Effect.Effect<PageResponse, ApiError | RateLimitError>
 
     const deletePage = (id: PageId): Effect.Effect<void, ApiError | RateLimitError> =>
@@ -284,7 +288,7 @@ const make = (
       })).pipe(
         Effect.map(() => void 0),
         Effect.mapError((e) => mapApiError(e, `/pages/${id}`, id)),
-        Effect.retry(rateLimitSchedule)
+        Effect.retry(rateLimitRetry)
       )
 
     const getPageVersions = (
@@ -319,7 +323,7 @@ const make = (
             }
           })).pipe(
             Effect.mapError((e) => mapApiError(e, `/pages/${id}/versions`, id)),
-            Effect.retry(rateLimitSchedule)
+            Effect.retry(rateLimitRetry)
           )
 
           for (const version of (response as { results?: Array<PageVersion> }).results ?? []) {
@@ -345,7 +349,7 @@ const make = (
         params: { query: { accountId } }
       })).pipe(
         Effect.mapError((e) => mapApiError(e, `/user?accountId=${accountId}`)),
-        Effect.retry(rateLimitSchedule)
+        Effect.retry(rateLimitRetry)
       ) as Effect.Effect<AtlassianUser, ApiError | RateLimitError>
 
     const getSpaceId = (pageId: PageId): Effect.Effect<string, ApiError | RateLimitError> =>
@@ -401,7 +405,7 @@ const make = (
             Effect.mapError((e) => mapApiError(e, `/pages/${pageId}/properties/editor`, pageId))
           )
         }
-      }).pipe(Effect.retry(rateLimitSchedule))
+      }).pipe(Effect.retry(rateLimitRetry))
 
     return ConfluenceClient.of({
       getPage,
@@ -438,7 +442,7 @@ const make = (
  *       auth: {
  *         type: "token",
  *         email: "you@example.com",
- *         token: process.env.CONFLUENCE_API_KEY
+ *         token: "<api-token>"
  *       }
  *     }))
  *   )

package/src/ConfluenceConfig.ts

@@ -3,11 +3,11 @@
  *
  * @module
  */
-import * as FileSystem from "@effect/platform/FileSystem"
-import * as Path from "@effect/platform/Path"
 import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
+import * as FileSystem from "effect/FileSystem"
 import * as Layer from "effect/Layer"
+import * as Path from "effect/Path"
 import * as Schema from "effect/Schema"
 import type { PageId } from "./Brand.js"
 import { ConfigNotFoundError, ConfigParseError } from "./ConfluenceError.js"
@@ -31,9 +31,7 @@ import { ConfluenceConfigFileSchema } from "./Schemas.js"
  *
  * @category Config
  */
-export class ConfluenceConfig extends Context.Tag(
-  "@knpkv/confluence-to-markdown/ConfluenceConfig"
-)<
+export class ConfluenceConfig extends Context.Service<
   ConfluenceConfig,
   {
     /** Root page ID to sync from */
@@ -51,7 +49,7 @@ export class ConfluenceConfig extends Context.Tag(
     /** Glob patterns for files to track in git */
     readonly trackedPaths: ReadonlyArray<string>
   }
->() {}
+>()("@knpkv/confluence-to-markdown/ConfluenceConfig") {}
 
 /**
  * Default config directory.
@@ -73,7 +71,7 @@ const loadConfig = (
     const fs = yield* FileSystem.FileSystem
 
     const exists = yield* fs.exists(configPath).pipe(
-      Effect.catchAll(() => Effect.succeed(false))
+      Effect.catchCause(() => Effect.succeed(false))
     )
     if (!exists) {
       return yield* Effect.fail(new ConfigNotFoundError({ path: configPath }))
@@ -88,7 +86,7 @@ const loadConfig = (
       catch: (cause) => new ConfigParseError({ path: configPath, cause })
     })
 
-    return yield* Schema.decodeUnknown(ConfluenceConfigFileSchema)(json).pipe(
+    return yield* Schema.decodeUnknownEffect(ConfluenceConfigFileSchema)(json).pipe(
       Effect.mapError((cause) => new ConfigParseError({ path: configPath, cause }))
     )
   })
@@ -99,7 +97,7 @@ const loadConfig = (
  * @example
  * ```typescript
  * import { ConfluenceConfig } from "@knpkv/confluence-to-markdown/ConfluenceConfig"
- * import { NodeFileSystem } from "@effect/platform-node"
+ * import { NodeContext } from "@effect/platform-node"
  * import { Effect } from "effect"
  *
  * const program = Effect.gen(function* () {
@@ -110,7 +108,7 @@ const loadConfig = (
  * Effect.runPromise(
  *   program.pipe(
  *     Effect.provide(ConfluenceConfig.layer()),
- *     Effect.provide(NodeFileSystem.layer)
+ *     Effect.provide(NodeContext.layer)
  *   )
  * )
  * ```
@@ -153,7 +151,8 @@ export const layer = (
     ConfluenceConfig,
     Effect.gen(function*() {
       const path = yield* Path.Path
-      const resolvedPath = configPath ?? path.join(process.cwd(), CONFIG_DIR, CONFIG_FILE_NAME)
+      const cwd = path.resolve(".")
+      const resolvedPath = configPath ?? path.join(cwd, CONFIG_DIR, CONFIG_FILE_NAME)
       const config = yield* loadConfig(resolvedPath)
 
       // Validate docsPath
@@ -206,7 +205,8 @@ export const createConfigFile = (
     const fs = yield* FileSystem.FileSystem
     const pathService = yield* Path.Path
 
-    const configDir = pathService.join(process.cwd(), CONFIG_DIR)
+    const cwd = pathService.resolve(".")
+    const configDir = pathService.join(cwd, CONFIG_DIR)
     const resolvedPath = configPath ?? pathService.join(configDir, CONFIG_FILE_NAME)
 
     const config: ConfluenceConfigFile = {
@@ -219,12 +219,12 @@ export const createConfigFile = (
     }
 
     // Validate the config
-    yield* Schema.decodeUnknown(ConfluenceConfigFileSchema)(config).pipe(
+    yield* Schema.decodeUnknownEffect(ConfluenceConfigFileSchema)(config).pipe(
       Effect.mapError((cause) => new ConfigParseError({ path: resolvedPath, cause }))
     )
 
     // Create .confluence directory if it doesn't exist
-    const dirExists = yield* fs.exists(configDir).pipe(Effect.catchAll(() => Effect.succeed(false)))
+    const dirExists = yield* fs.exists(configDir).pipe(Effect.catchCause(() => Effect.succeed(false)))
     if (!dirExists) {
       yield* fs.makeDirectory(configDir, { recursive: true }).pipe(
         Effect.mapError((cause) => new ConfigParseError({ path: configDir, cause }))

package/src/GitService.ts

@@ -3,17 +3,13 @@
  *
  * @module
  */
-import * as NodeCommandExecutor from "@effect/platform-node/NodeCommandExecutor"
-import * as NodeContext from "@effect/platform-node/NodeContext"
-import * as NodeFileSystem from "@effect/platform-node/NodeFileSystem"
-import * as NodePath from "@effect/platform-node/NodePath"
-import * as CommandExecutor from "@effect/platform/CommandExecutor"
-import type * as PlatformError from "@effect/platform/Error"
-import * as FileSystem from "@effect/platform/FileSystem"
-import * as Path from "@effect/platform/Path"
 import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
+import * as FileSystem from "effect/FileSystem"
 import * as Layer from "effect/Layer"
+import * as Path from "effect/Path"
+import type * as PlatformError from "effect/PlatformError"
+import { ChildProcessSpawner } from "effect/unstable/process"
 import {
   GitError,
   GitMergeConflictError,
@@ -249,10 +245,10 @@ export interface GitServiceShape {
  *
  * @category Service
  */
-export class GitService extends Context.Tag("@knpkv/confluence-to-markdown/GitService")<
+export class GitService extends Context.Service<
   GitService,
   GitServiceShape
->() {}
+>()("@knpkv/confluence-to-markdown/GitService") {}
 
 /**
  * Map PlatformError to GitError.
@@ -260,13 +256,15 @@ export class GitService extends Context.Tag("@knpkv/confluence-to-markdown/GitSe
 const mapFsError = (error: PlatformError.PlatformError): GitError =>
   new GitError({ command: "filesystem", message: error.message })
 
-// Dependencies layer for git operations (CommandExecutor + FileSystem + Path + NodeContext)
-// NodeCommandExecutor requires FileSystem, so use provideMerge to satisfy its dependencies
-const GitDepsLive = NodeCommandExecutor.layer.pipe(
-  Layer.provideMerge(NodeFileSystem.layer),
-  Layer.provideMerge(NodePath.layer),
-  Layer.provideMerge(NodeContext.layer)
-)
+const existsOrFalse = (
+  effect: Effect.Effect<boolean, PlatformError.PlatformError>
+): Effect.Effect<boolean> =>
+  effect.pipe(
+    Effect.catchIf(
+      (error): error is PlatformError.PlatformError => error._tag === "PlatformError",
+      () => Effect.succeed(false)
+    )
+  )
 
 /**
  * Copy a single file, creating parent directories as needed.
@@ -279,7 +277,7 @@ const copyFileFn = (
 ): Effect.Effect<void, GitError> =>
   Effect.gen(function*() {
     const destDir = pathService.dirname(dest)
-    yield* fs.makeDirectory(destDir, { recursive: true }).pipe(Effect.catchAll(() => Effect.void))
+    yield* fs.makeDirectory(destDir, { recursive: true }).pipe(Effect.mapError(mapFsError))
     yield* fs.copyFile(source, dest).pipe(Effect.mapError(mapFsError))
   })
 
@@ -293,7 +291,7 @@ const copyDirectoryFn = (
   dest: string
 ): Effect.Effect<void, GitError> =>
   Effect.gen(function*() {
-    yield* fs.makeDirectory(dest, { recursive: true }).pipe(Effect.catchAll(() => Effect.void))
+    yield* fs.makeDirectory(dest, { recursive: true }).pipe(Effect.mapError(mapFsError))
 
     const entries = yield* fs.readDirectory(source).pipe(Effect.mapError(mapFsError))
 
@@ -321,7 +319,7 @@ const copyMarkdownFilesFn = (
   dest: string
 ): Effect.Effect<void, GitError> =>
   Effect.gen(function*() {
-    const exists = yield* fs.exists(source).pipe(Effect.catchAll(() => Effect.succeed(false)))
+    const exists = yield* existsOrFalse(fs.exists(source))
     if (!exists) {
       return
     }
@@ -349,7 +347,7 @@ const copyMarkdownFilesFn = (
 
 // Get paths helper - takes pathService as param
 const getPaths = (pathService: Path.Path) => {
-  const cwd = process.cwd()
+  const cwd = pathService.resolve(".")
   const confluenceDir = pathService.join(cwd, ".confluence")
   const gitDir = pathService.join(confluenceDir, ".git")
   return { cwd, confluenceDir, gitDir, pathService }
@@ -358,7 +356,7 @@ const getPaths = (pathService: Path.Path) => {
 // Ensure initialized helper - takes fs and gitDir
 const ensureInitializedFn = (fs: FileSystem.FileSystem, gitDir: string) =>
   Effect.gen(function*() {
-    const initialized = yield* fs.exists(gitDir).pipe(Effect.catchAll(() => Effect.succeed(false)))
+    const initialized = yield* existsOrFalse(fs.exists(gitDir))
     if (!initialized) {
       return yield* Effect.fail(new GitNotInitializedError())
     }
@@ -368,17 +366,18 @@ const ensureInitializedFn = (fs: FileSystem.FileSystem, gitDir: string) =>
 const make = Effect.gen(function*() {
   const fs = yield* FileSystem.FileSystem
   const pathService = yield* Path.Path
-  const commandExecutor = yield* CommandExecutor.CommandExecutor
+  const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner
   const paths = getPaths(pathService)
   const { confluenceDir, cwd, gitDir } = paths
 
   // Create context with captured services for providing to returned Effects
-  const depsContext: Context.Context<FileSystem.FileSystem | Path.Path | CommandExecutor.CommandExecutor> = Context
-    .empty().pipe(
-      Context.add(FileSystem.FileSystem, fs),
-      Context.add(Path.Path, pathService),
-      Context.add(CommandExecutor.CommandExecutor, commandExecutor)
-    )
+  const depsContext: Context.Context<FileSystem.FileSystem | Path.Path | ChildProcessSpawner.ChildProcessSpawner> =
+    Context
+      .empty().pipe(
+        Context.add(FileSystem.FileSystem, fs),
+        Context.add(Path.Path, pathService),
+        Context.add(ChildProcessSpawner.ChildProcessSpawner, childProcessSpawner)
+      )
 
   // Helper to provide deps to an effect - uses any for R since we know depsContext covers all needs
   const provideDeps = <A, E, R>(effect: Effect.Effect<A, E, R>): Effect.Effect<A, E> =>
@@ -396,11 +395,7 @@ const make = Effect.gen(function*() {
       )
     )
 
-  const isInitialized = () =>
-    Effect.succeed(fs).pipe(
-      Effect.flatMap((f) => f.exists(gitDir)),
-      Effect.catchAll(() => Effect.succeed(false))
-    )
+  const isInitialized = () => existsOrFalse(fs.exists(gitDir))
 
   const init = () =>
     provideDeps(
@@ -410,12 +405,12 @@ const make = Effect.gen(function*() {
           Effect.catchTag("GitError", () => Effect.fail(new GitNotInstalledError({ message: "Git not found" })))
         )
 
-        const exists = yield* fs.exists(confluenceDir).pipe(Effect.catchAll(() => Effect.succeed(false)))
+        const exists = yield* existsOrFalse(fs.exists(confluenceDir))
         if (!exists) {
           yield* fs.makeDirectory(confluenceDir, { recursive: true }).pipe(Effect.mapError(mapFsError))
         }
 
-        const gitExists = yield* fs.exists(gitDir).pipe(Effect.catchAll(() => Effect.succeed(false)))
+        const gitExists = yield* existsOrFalse(fs.exists(gitDir))
         if (!gitExists) {
           yield* runGit(["init"], confluenceDir)
           // Configure local git user for commits (needed in CI environments)
@@ -583,7 +578,7 @@ const make = Effect.gen(function*() {
             const sourcePath = pathService.join(absoluteDocsPath, pattern)
             const destPath = pathService.join(confluenceDir, pattern)
 
-            const exists = yield* fs.exists(sourcePath).pipe(Effect.catchAll(() => Effect.succeed(false)))
+            const exists = yield* existsOrFalse(fs.exists(sourcePath))
             if (exists) {
               const stat = yield* fs.stat(sourcePath).pipe(Effect.mapError(mapFsError))
               if (stat.type === "Directory") {
@@ -614,7 +609,7 @@ const make = Effect.gen(function*() {
             const sourcePath = pathService.join(confluenceDir, pattern)
             const destPath = pathService.join(absoluteDocsPath, pattern)
 
-            const exists = yield* fs.exists(sourcePath).pipe(Effect.catchAll(() => Effect.succeed(false)))
+            const exists = yield* existsOrFalse(fs.exists(sourcePath))
             if (exists) {
               const stat = yield* fs.stat(sourcePath).pipe(Effect.mapError(mapFsError))
               if (stat.type === "Directory") {
@@ -842,18 +837,13 @@ const make = Effect.gen(function*() {
   })
 })
 
-// Layer with deps - requires FileSystem, Path, CommandExecutor
-const layerWithDeps: Layer.Layer<
-  GitService,
-  never,
-  FileSystem.FileSystem | Path.Path | CommandExecutor.CommandExecutor
-> = Layer.effect(GitService, make)
-
 /**
- * Create GitService layer with all platform dependencies.
+ * Create GitService layer.
  *
  * @category Layers
  */
-export const layer = layerWithDeps.pipe(
-  Layer.provide(GitDepsLive)
-)
+export const layer: Layer.Layer<
+  GitService,
+  never,
+  FileSystem.FileSystem | Path.Path | ChildProcessSpawner.ChildProcessSpawner
+> = Layer.effect(GitService, make)