lalph 0.3.127 → 0.3.129

package/src/PromptGen.ts

@@ -1,17 +1,15 @@
-import { Effect, Layer, ServiceMap } from "effect"
+import { Effect, Layer, Context } from "effect"
 import { PrdIssue } from "./domain/PrdIssue.ts"
 import { CurrentIssueSource } from "./CurrentIssueSource.ts"
 import type { GitFlow } from "./GitFlow.ts"
 
-export class PromptGen extends ServiceMap.Service<PromptGen>()(
-  "lalph/PromptGen",
-  {
-    make: Effect.gen(function* () {
-      const sourceMeta = yield* CurrentIssueSource
+export class PromptGen extends Context.Service<PromptGen>()("lalph/PromptGen", {
+  make: Effect.gen(function* () {
+    const sourceMeta = yield* CurrentIssueSource
 
-      const prdNotes = (options?: {
-        readonly specsDirectory?: string | undefined
-      }) => `## prd.yml file
+    const prdNotes = (options?: {
+      readonly specsDirectory?: string | undefined
+    }) => `## prd.yml file
 
 **Important:** Wait 5 seconds between edits to allow the system to update the prd.yml file.
 If adding more than 10 tasks, wait 10 seconds.
@@ -51,9 +49,9 @@ To remove a task, simply delete the item from the prd.yml file.
 ${JSON.stringify(PrdIssue.jsonSchema, null, 2)}
 \`\`\``
 
-      const promptChoose = (options: {
-        readonly gitFlow: GitFlow["Service"]
-      }) => `Your job is to choose the next task to work on from the prd.yml file and save it in a task.json file.
+    const promptChoose = (options: {
+      readonly gitFlow: GitFlow["Service"]
+    }) => `Your job is to choose the next task to work on from the prd.yml file and save it in a task.json file.
 **DO NOT** implement the task yet.
 
 The following instructions should be done without interaction or asking for permission.
@@ -80,18 +78,18 @@ The following instructions should be done without interaction or asking for perm
   "githubPrNumber": null
 }
 \`\`\`${
-        options.gitFlow.requiresGithubPr
-          ? `
+      options.gitFlow.requiresGithubPr
+        ? `
 
 Set \`githubPrNumber\` to the PR number if one exists, otherwise use \`null\`.
 `
-          : "\n\nLeave `githubPrNumber` as null."
-      }
+        : "\n\nLeave `githubPrNumber` as null."
+    }
 `
 
-      const promptChooseClanka = (options: {
-        readonly gitFlow: GitFlow["Service"]
-      }) => `- Use the "listEligibleTasks" function to view the list of tasks that you can start working on.
+    const promptChooseClanka = (options: {
+      readonly gitFlow: GitFlow["Service"]
+    }) => `- Use the "listEligibleTasks" function to view the list of tasks that you can start working on.
   - **NO NOT PARSE THE yaml OUTPUT IN ANY WAY**
   - **DO NOT** implement the task yet.
   - **DO NOT** use the "delegate" function for any step in this workflow
@@ -113,18 +111,18 @@ ${
     : "\n  Leave `githubPrNumber` as null."
 }
 `
-      const promptChooseRalph = (options: {
-        readonly specFile: string
-      }) => `- Read the spec file at \`${options.specFile}\` to understand the current project.
+    const promptChooseRalph = (options: {
+      readonly specFile: string
+    }) => `- Read the spec file at \`${options.specFile}\` to understand the current project.
 - Choose the next most important task to work on from the specification.
 - If all of the tasks are complete then do nothing more. Otherwise, write the chosen task in a ".lalph/task.md" file.
 
 Note: The task should be a specific, actionable item that can be completed in a reasonable amount of time.
 `
 
-      const keyInformation = (options: {
-        readonly specsDirectory: string
-      }) => `## Important: Recording key information
+    const keyInformation = (options: {
+      readonly specsDirectory: string
+    }) => `## Important: Recording key information
 
 This session will time out after a certain period, so make sure to record
 key information that could speed up future work on the task in the description.
@@ -145,9 +143,9 @@ challenges faced.
 
 ${prdNotes(options)}`
 
-      const systemClanka = (options: {
-        readonly specsDirectory: string
-      }) => `## Important: Recording key information
+    const systemClanka = (options: {
+      readonly specsDirectory: string
+    }) => `## Important: Recording key information
 
 This session will time out after a certain period, so make sure to record
 key information that could speed up future work on the task in the description.
@@ -168,13 +166,13 @@ challenges faced.
 
 ${taskGuidelines(options)}`
 
-      const prompt = (options: {
-        readonly task: PrdIssue
-        readonly targetBranch: string | undefined
-        readonly specsDirectory: string
-        readonly githubPrNumber: number | undefined
-        readonly gitFlow: GitFlow["Service"]
-      }) => `# ${options.task.title}
+    const prompt = (options: {
+      readonly task: PrdIssue
+      readonly targetBranch: string | undefined
+      readonly specsDirectory: string
+      readonly githubPrNumber: number | undefined
+      readonly gitFlow: GitFlow["Service"]
+    }) => `# ${options.task.title}
 
 Task ID: ${options.task.id}
 
@@ -183,10 +181,10 @@ ${options.task.description}
 ### Instructions
 
 Your job is to implement the task described above.${
-        options.task.description.includes(options.specsDirectory)
-          ? `\nMake sure to review the prd.yml for any key information that may help you with this task.`
-          : ""
-      }
+      options.task.description.includes(options.specsDirectory)
+        ? `\nMake sure to review the prd.yml for any key information that may help you with this task.`
+        : ""
+    }
 
 1. ${options.gitFlow.setupInstructions(options)}
 2. Implement the task.
@@ -199,24 +197,24 @@ Your job is to implement the task described above.${
      \`description\`. More details below.
 3. Run any checks / feedback loops, such as type checks, unit tests, or linting.
 4. ${options.gitFlow.commitInstructions({
-        githubPrInstructions: sourceMeta.githubPrInstructions,
-        githubPrNumber: options.githubPrNumber,
-        taskId: options.task.id ?? "unknown",
-        targetBranch: options.targetBranch,
-      })}
+      githubPrInstructions: sourceMeta.githubPrInstructions,
+      githubPrNumber: options.githubPrNumber,
+      taskId: options.task.id ?? "unknown",
+      targetBranch: options.targetBranch,
+    })}
 5. **After ${options.gitFlow.requiresGithubPr ? "pushing" : "committing"}** your changes, update the prd.yml to reflect any changes in the task state.
    - Rewrite the notes in the description to include only the key discoveries and information that could speed up future work on other tasks. Make sure to preserve important information such as specification file references.
    - If you believe the task is complete, update the \`state\` to "in-review".
 
 ${keyInformation(options)}`
 
-      const promptClanka = (options: {
-        readonly task: PrdIssue
-        readonly targetBranch: string | undefined
-        readonly specsDirectory: string
-        readonly githubPrNumber: number | undefined
-        readonly gitFlow: GitFlow["Service"]
-      }) => `# ${options.task.title}
+    const promptClanka = (options: {
+      readonly task: PrdIssue
+      readonly targetBranch: string | undefined
+      readonly specsDirectory: string
+      readonly githubPrNumber: number | undefined
+      readonly gitFlow: GitFlow["Service"]
+    }) => `# ${options.task.title}
 
 Task ID: ${options.task.id}
 
@@ -225,10 +223,10 @@ ${options.task.description}
 ### Instructions
 
 All steps must be done before the task can be considered complete.${
-        options.task.description.includes(options.specsDirectory)
-          ? `\nMake sure to review the previous tasks (using "listTasks") for any key information that may help you with this task.`
-          : ""
-      }
+      options.task.description.includes(options.specsDirectory)
+        ? `\nMake sure to review the previous tasks (using "listTasks") for any key information that may help you with this task.`
+        : ""
+    }
 
 1. ${options.gitFlow.setupInstructions(options)}
 2. Implement the task.
@@ -238,21 +236,21 @@ All steps must be done before the task can be considered complete.${
      \`description\`. More details below.
 3. Run any checks / feedback loops, such as type checks, unit tests, or linting.
 4. ${options.gitFlow.commitInstructions({
-        githubPrInstructions: sourceMeta.githubPrInstructions,
-        githubPrNumber: options.githubPrNumber,
-        taskId: options.task.id ?? "unknown",
-        targetBranch: options.targetBranch,
-      })}
+      githubPrInstructions: sourceMeta.githubPrInstructions,
+      githubPrNumber: options.githubPrNumber,
+      taskId: options.task.id ?? "unknown",
+      targetBranch: options.targetBranch,
+    })}
 5. **After ${options.gitFlow.requiresGithubPr ? "pushing" : "committing"}** your changes, update current task to reflect any changes in the task state.
    - Rewrite the notes in the description to include only the key discoveries and information that could speed up future work on other tasks. Make sure to preserve important information such as specification file references.
    - If you believe the task is complete, update the \`state\` to "in-review".`
 
-      const promptRalph = (options: {
-        readonly task: string
-        readonly targetBranch: string | undefined
-        readonly specFile: string
-        readonly gitFlow: GitFlow["Service"]
-      }) => `${options.task}
+    const promptRalph = (options: {
+      readonly task: string
+      readonly targetBranch: string | undefined
+      readonly specFile: string
+      readonly gitFlow: GitFlow["Service"]
+    }) => `${options.task}
 
 ## Project specification
 
@@ -268,16 +266,16 @@ All steps must be done before the task can be considered complete.
 3. Run any checks / feedback loops, such as type checks, unit tests, or linting.
 4. Update the specification implementation plan at \`${options.specFile}\` to reflect changes to task states.
 4. ${options.gitFlow.commitInstructions({
-        githubPrInstructions: sourceMeta.githubPrInstructions,
-        githubPrNumber: undefined,
-        taskId: "unknown",
-        targetBranch: options.targetBranch,
-      })}
+      githubPrInstructions: sourceMeta.githubPrInstructions,
+      githubPrNumber: undefined,
+      taskId: "unknown",
+      targetBranch: options.targetBranch,
+    })}
 `
 
-      const promptResearch = (options: {
-        readonly task: PrdIssue
-      }) => `Your job is to gather all the necessary information and details to complete the task described below. Do not make any code changes yet, your job is just to research and gather information.
+    const promptResearch = (options: {
+      readonly task: PrdIssue
+    }) => `Your job is to gather all the necessary information and details to complete the task described below. Do not make any code changes yet, your job is just to research and gather information.
 
 In the final report:
 
@@ -293,10 +291,10 @@ Title: ${options.task.title}
 
 ${options.task.description}`
 
-      const promptReview = (options: {
-        readonly prompt: string
-        readonly gitFlow: GitFlow["Service"]
-      }) => `A previous engineer has completed a task from the instructions below.
+    const promptReview = (options: {
+      readonly prompt: string
+      readonly gitFlow: GitFlow["Service"]
+    }) => `A previous engineer has completed a task from the instructions below.
 
 You job is to meticulously review their work to ensure it meets the task requirements,
 follows best practices, and maintains high code quality. You should be extremely thorough
@@ -315,10 +313,10 @@ ${options.gitFlow.reviewInstructions}
 
 ${options.prompt}`
 
-      const promptTimeout = (options: {
-        readonly taskId: string
-        readonly specsDirectory: string
-      }) => `Your earlier attempt to complete the task with id \`${options.taskId}\` took too
+    const promptTimeout = (options: {
+      readonly taskId: string
+      readonly specsDirectory: string
+    }) => `Your earlier attempt to complete the task with id \`${options.taskId}\` took too
 long and has timed out. You can find the task details in the prd.yml file.
 
 The following instructions should be done without interaction or asking for
@@ -336,10 +334,10 @@ permission.
 
 ${prdNotes(options)}`
 
-      const promptTimeoutRalph = (options: {
-        readonly task: string
-        readonly specFile: string
-      }) => `Your earlier attempt to complete the following task took too
+    const promptTimeoutRalph = (options: {
+      readonly task: string
+      readonly specFile: string
+    }) => `Your earlier attempt to complete the following task took too
 long and has timed out.
 
 The following instructions should be done without interaction or asking for
@@ -352,10 +350,10 @@ permission.
 3. Commit the changes to the specification file without pushing.
 `
 
-      const promptTimeoutClanka = (options: {
-        readonly taskId: string
-        readonly specsDirectory: string
-      }) => `Your earlier attempt to complete the task with id \`${options.taskId}\` took too
+    const promptTimeoutClanka = (options: {
+      readonly taskId: string
+      readonly specsDirectory: string
+    }) => `Your earlier attempt to complete the task with id \`${options.taskId}\` took too
 long and has timed out.
 
 The following instructions should be done without interaction or asking for
@@ -369,10 +367,10 @@ permission.
    - Make sure to setup task dependencies using the \`blockedBy\` field as needed.
 5. If any specifications need updating based on your new understanding, update them.`
 
-      const planPrompt = (options: {
-        readonly plan: string
-        readonly specsDirectory: string
-      }) => `<request>
+    const planPrompt = (options: {
+      readonly plan: string
+      readonly specsDirectory: string
+    }) => `<request>
 ${options.plan}
 </request>
 
@@ -434,10 +432,10 @@ ${options.plan}
   \`${options.specsDirectory}\` directory, along with a brief overview of the specification.
   If the README.md file does not exist, create it.`
 
-      const promptPlanTasks = (options: {
-        readonly specsDirectory: string
-        readonly specificationPath: string
-      }) => `Your job is to convert the implementation plan in the specification file at
+    const promptPlanTasks = (options: {
+      readonly specsDirectory: string
+      readonly specificationPath: string
+    }) => `Your job is to convert the implementation plan in the specification file at
 \`${options.specificationPath}\` into tasks in the prd.yml file. Read the "### Adding tasks"
 section below extremely carefully for guidelines on creating tasks.
 
@@ -455,10 +453,10 @@ setup dependencies between the tasks using the \`blockedBy\` field.
  
 ${prdNotes(options)}`
 
-      const promptPlanTasksClanka = (options: {
-        readonly specsDirectory: string
-        readonly specificationPath: string
-      }) => `Your job is to convert the implementation plan in the specification file at
+    const promptPlanTasksClanka = (options: {
+      readonly specsDirectory: string
+      readonly specificationPath: string
+    }) => `Your job is to convert the implementation plan in the specification file at
 \`${options.specificationPath}\` into tasks.
 
 Before starting, read the entire task list to understand the context of existing tasks
@@ -472,26 +470,25 @@ Make sure to setup dependencies between the tasks using the \`blockedBy\` field.
 
 **Important:** You are only creating or updating a plan, not implementing any tasks yet.`
 
-      return {
-        promptChoose,
-        promptChooseClanka,
-        promptChooseRalph,
-        prompt,
-        promptRalph,
-        promptClanka,
-        promptResearch,
-        promptReview,
-        promptTimeout,
-        promptTimeoutClanka,
-        promptTimeoutRalph,
-        planPrompt,
-        promptPlanTasks,
-        promptPlanTasksClanka,
-        systemClanka,
-      } as const
-    }),
-  },
-) {
+    return {
+      promptChoose,
+      promptChooseClanka,
+      promptChooseRalph,
+      prompt,
+      promptRalph,
+      promptClanka,
+      promptResearch,
+      promptReview,
+      promptTimeout,
+      promptTimeoutClanka,
+      promptTimeoutRalph,
+      planPrompt,
+      promptPlanTasks,
+      promptPlanTasksClanka,
+      systemClanka,
+    } as const
+  }),
+}) {
   static layer = Layer.effect(this, this.make).pipe(
     Layer.provide(CurrentIssueSource.layer),
   )

package/src/Settings.ts

@@ -1,12 +1,12 @@
 // oxlint-disable typescript/no-explicit-any
-import { Cache, Effect, Layer, Option, Schema, ServiceMap } from "effect"
+import { Cache, Effect, Layer, Option, Schema, Context } from "effect"
 import { KeyValueStore } from "effect/unstable/persistence"
 import { layerKvs, ProjectsKvs } from "./Kvs.ts"
 import { allCliAgents } from "./domain/CliAgent.ts"
 import { Project, ProjectId } from "./domain/Project.ts"
 import { Reactivity } from "effect/unstable/reactivity"
 
-export class Settings extends ServiceMap.Service<Settings>()("lalph/Settings", {
+export class Settings extends Context.Service<Settings>()("lalph/Settings", {
   make: Effect.gen(function* () {
     const kvs = yield* KeyValueStore.KeyValueStore
     const projectKvs = yield* ProjectsKvs
@@ -27,9 +27,9 @@ export class Settings extends ServiceMap.Service<Settings>()("lalph/Settings", {
         readonly projectId: ProjectId
         readonly setting: ProjectSetting<string, Schema.Codec<any, any>>
       }) {
-        const services = yield* projectKvs.services(options.projectId)
+        const services = yield* projectKvs.contextEffect(options.projectId)
         const store = KeyValueStore.toSchemaStore(
-          ServiceMap.get(services, KeyValueStore.KeyValueStore),
+          Context.get(services, KeyValueStore.KeyValueStore),
           options.setting.schema,
         )
         return yield* Effect.orDie(store.get(options.setting.name))
@@ -82,9 +82,9 @@ export class Settings extends ServiceMap.Service<Settings>()("lalph/Settings", {
         value: Option.Option<S["Type"]>,
       ) {
         const projectId = yield* CurrentProjectId
-        const services = yield* projectKvs.services(projectId)
+        const services = yield* projectKvs.contextEffect(projectId)
         const s = KeyValueStore.toSchemaStore(
-          ServiceMap.get(services, KeyValueStore.KeyValueStore),
+          Context.get(services, KeyValueStore.KeyValueStore),
           setting.schema,
         )
         const setCache = Cache.set(
@@ -150,7 +150,7 @@ export class Settings extends ServiceMap.Service<Settings>()("lalph/Settings", {
   }
 }
 
-export class CurrentProjectId extends ServiceMap.Service<
+export class CurrentProjectId extends Context.Service<
   CurrentProjectId,
   ProjectId
 >()("lalph/CurrentProjectId") {}

package/src/TaskTools.ts

@@ -1,11 +1,11 @@
-import { Deferred, Effect, Random, Schema, ServiceMap, Struct } from "effect"
+import { Deferred, Effect, Random, Schema, Context, Struct } from "effect"
 import { Tool, Toolkit } from "effect/unstable/ai"
 import { PrdIssue } from "./domain/PrdIssue.ts"
 import { IssueSource } from "./IssueSource.ts"
 import { CurrentProjectId } from "./Settings.ts"
 import * as Yaml from "yaml"
 
-export class ChosenTaskDeferred extends ServiceMap.Reference(
+export class ChosenTaskDeferred extends Context.Reference(
   "lalph/TaskTools/ChosenTaskDeferred",
   {
     defaultValue: Deferred.makeUnsafe<{

package/src/Workers.ts

@@ -5,7 +5,7 @@ import {
   FiberMap,
   HashMap,
   pipe,
-  ServiceMap,
+  Context,
   Stream,
 } from "effect"
 import { Atom, AtomRegistry } from "effect/unstable/reactivity"
@@ -57,7 +57,7 @@ export const activeWorkerLoggingAtom = Atom.make(
   }),
 )
 
-export class CurrentWorkerState extends ServiceMap.Service<
+export class CurrentWorkerState extends Context.Service<
   CurrentWorkerState,
   {
     readonly state: Atom.Writable<WorkerState>

package/src/Worktree.ts

@@ -10,7 +10,7 @@ import {
   Path,
   PlatformError,
   Schema,
-  ServiceMap,
+  Context,
   Stream,
 } from "effect"
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
@@ -23,7 +23,7 @@ import { parseBranch } from "./shared/git.ts"
 import { resolveLalphDirectory } from "./shared/lalphDirectory.ts"
 import { withStallTimeout } from "./shared/stream.ts"
 
-export class Worktree extends ServiceMap.Service<Worktree>()("lalph/Worktree", {
+export class Worktree extends Context.Service<Worktree>()("lalph/Worktree", {
   make: Effect.gen(function* () {
     const fs = yield* FileSystem.FileSystem
     const pathService = yield* Path.Path
@@ -243,7 +243,7 @@ const makeExecHelpers = Effect.fnUntraced(function* (options: {
 
   const execWithOutput = (options: { readonly cliAgent: AnyCliAgent }) =>
     Effect.fnUntraced(function* (command: ChildProcess.Command) {
-      const handle = yield* provide(command.asEffect())
+      const handle = yield* provide(command)
 
       yield* handle.all.pipe(
         Stream.decodeText(),
@@ -265,7 +265,7 @@ const makeExecHelpers = Effect.fnUntraced(function* (options: {
       const registry = yield* AtomRegistry.AtomRegistry
       const worker = yield* CurrentWorkerState
 
-      const handle = yield* provide(command.asEffect())
+      const handle = yield* provide(command)
 
       yield* handle.all.pipe(
         Stream.decodeText(),
@@ -297,7 +297,7 @@ const makeExecHelpers = Effect.fnUntraced(function* (options: {
       const registry = yield* AtomRegistry.AtomRegistry
       const worker = yield* CurrentWorkerState
 
-      const handle = yield* provide(command.asEffect())
+      const handle = yield* provide(command)
 
       yield* handle.all.pipe(
         Stream.decodeText(),

package/src/commands/edit.ts

@@ -4,24 +4,22 @@ import { Prd } from "../Prd.ts"
 import { layerProjectIdPrompt } from "../Projects.ts"
 import { Editor } from "../Editor.ts"
 
-const handler = Command.withHandler(
-  Effect.fnUntraced(
-    function* () {
-      const prd = yield* Prd
-      const editor = yield* Editor
-      yield* editor.edit(prd.path)
-    },
-    Effect.provide([
-      Prd.layerLocalProvided.pipe(Layer.provideMerge(layerProjectIdPrompt)),
-      Editor.layer,
-    ]),
-  ),
-)
-
 export const commandEdit = Command.make("edit").pipe(
   Command.withDescription(
     "Open the selected project's .lalph/prd.yml in your editor.",
   ),
   Command.withAlias("e"),
-  handler,
+  Command.withHandler(
+    Effect.fnUntraced(
+      function* () {
+        const prd = yield* Prd
+        const editor = yield* Editor
+        yield* editor.edit(prd.path)
+      },
+      Effect.provide([
+        Prd.layerLocalProvided.pipe(Layer.provideMerge(layerProjectIdPrompt)),
+        Editor.layer,
+      ]),
+    ),
+  ),
 )

package/src/commands/issue.ts

@@ -30,7 +30,7 @@ const FrontMatterSchema = Schema.toCodecJson(
 
 const handler = flow(
   Command.withHandler(
-    Effect.fnUntraced(function* () {
+    Effect.fnUntraced(function* (_: {}) {
       const editor = yield* Editor
 
       const content = yield* editor.editTemp({

package/src/commands/plan.ts

@@ -62,9 +62,9 @@ export const commandPlan = Command.make("plan", {
         const editor = yield* Editor
         const fs = yield* FileSystem.FileSystem
 
-        const thePlan = yield* Effect.matchEffect(file.asEffect(), {
-          onFailure: () => editor.editTemp({ suffix: ".md" }),
-          onSuccess: (path) => fs.readFileString(path).pipe(Effect.asSome),
+        const thePlan = yield* Option.match(file, {
+          onNone: () => editor.editTemp({ suffix: ".md" }),
+          onSome: (path) => fs.readFileString(path).pipe(Effect.asSome),
         })
 
         if (Option.isNone(thePlan)) return

package/src/domain/CliAgentPreset.ts

@@ -16,7 +16,7 @@ export class CliAgentPreset extends Schema.Class<CliAgentPreset>(
   extraArgs: Schema.Array(Schema.String),
   sourceMetadata: Schema.Record(Schema.String, Schema.Any),
 }) {
-  static defaultId = CliAgentPresetId.makeUnsafe("default")
+  static defaultId = CliAgentPresetId.make("default")
 
   decodeMetadata<S extends Schema.Top>(
     source: string,

package/src/domain/GithubComment.ts

@@ -73,7 +73,7 @@ export class ReviewComment extends S.Class<ReviewComment>("ReviewComment")({
   author: Author,
   body: S.String,
   path: S.String,
-  originalLine: S.Number,
+  originalLine: S.NullOr(S.Number),
   diffHunk: S.String,
   createdAt: S.String,
 }) {}

package/src/domain/PrdIssue.ts

@@ -1,4 +1,4 @@
-import { Schema, Array, Equal, SchemaGetter } from "effect"
+import { Schema, Array, Equal, SchemaGetter, Effect } from "effect"
 import * as Yaml from "yaml"
 import { withEncodeDefault } from "../shared/schema.ts"
 
@@ -9,19 +9,19 @@ export class PrdIssue extends Schema.Class<PrdIssue>("PrdIssue")({
         "The unique identifier of the issue. If null, it is considered a new issue.",
       documentation: "The unique identifier of the issue.",
     })
-    .pipe(withEncodeDefault(() => null)),
+    .pipe(withEncodeDefault(Effect.succeed(null))),
   title: Schema.String.annotate({
     description: "The title of the issue",
   }),
   description: Schema.String.annotate({
     description: "The description of the issue in markdown format.",
-  }).pipe(withEncodeDefault(() => "")),
+  }).pipe(withEncodeDefault(Effect.succeed(""))),
   priority: Schema.Finite.annotate({
     description:
       "The priority of the issue. 0 = No priority, 1 = Urgent, 2 = High, 3 = Normal, 4 = Low.",
     documentation:
       "The priority of the issue. 0 = No priority, 1 = Urgent, 2 = High, 3 = Normal, 4 = Low.",
-  }).pipe(withEncodeDefault(() => 3)),
+  }).pipe(withEncodeDefault(Effect.succeed(3))),
   estimate: Schema.NullOr(Schema.Finite)
     .annotate({
       description:
@@ -29,7 +29,7 @@ export class PrdIssue extends Schema.Class<PrdIssue>("PrdIssue")({
       documentation:
         "Null if no estimate is set. Roughly 1 point = 1 hour of work.",
     })
-    .pipe(withEncodeDefault(() => null)),
+    .pipe(withEncodeDefault(Effect.succeed(null))),
   state: Schema.Literals([
     "backlog",
     "todo",
@@ -41,18 +41,18 @@ export class PrdIssue extends Schema.Class<PrdIssue>("PrdIssue")({
       description: "The state of the issue.",
       documentation: "The state of the issue.",
     })
-    .pipe(withEncodeDefault(() => "todo")),
+    .pipe(withEncodeDefault(Effect.succeed("todo"))),
   blockedBy: Schema.Array(Schema.String)
     .annotate({
       description:
         "An array of issue IDs that block this issue. These issues must be completed before this issue can be worked on.",
       documentation: "An array of issue IDs that block this issue.",
     })
-    .pipe(withEncodeDefault(() => [])),
+    .pipe(withEncodeDefault(Effect.succeed([]))),
   autoMerge: Schema.Boolean.annotate({
     description:
       "Whether the issue should be auto-merged when complete. Read-only field",
-  }).pipe(withEncodeDefault(() => false)),
+  }).pipe(withEncodeDefault(Effect.succeed(false))),
 }) {
   static FromInput = Schema.Union([
     Schema.String,