lalph 0.2.4 → 0.2.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "lalph",
   "type": "module",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "publishConfig": {
     "access": "public"
   },

package/src/{IssueSources.ts → CurrentIssueSource.ts}

@@ -1,4 +1,14 @@
-import { Effect, Layer, Option, pipe, Schema, ServiceMap } from "effect"
+import {
+  Cause,
+  Effect,
+  Layer,
+  Option,
+  pipe,
+  Schedule,
+  Schema,
+  ScopedRef,
+  ServiceMap,
+} from "effect"
 import { CurrentProjectId, Setting, Settings } from "./Settings.ts"
 import { LinearIssueSource } from "./Linear.ts"
 import { Prompt } from "effect/unstable/cli"
@@ -9,6 +19,7 @@ import { atomRuntime } from "./shared/runtime.ts"
 import { Atom, Reactivity } from "effect/unstable/reactivity"
 import type { PrdIssue } from "./domain/PrdIssue.ts"
 import type { ProjectId } from "./domain/Project.ts"
+import type { ChildProcessSpawner } from "effect/unstable/process/ChildProcessSpawner"
 
 const issueSources: ReadonlyArray<typeof CurrentIssueSource.Service> = [
   {
@@ -66,14 +77,72 @@ export class CurrentIssueSource extends ServiceMap.Service<
   static layer = Layer.effectServices(
     Effect.gen(function* () {
       const source = yield* getOrSelectIssueSource
-      const services = yield* Layer.build(source.layer).pipe(
+      const build = Layer.build(source.layer).pipe(
+        Effect.map(ServiceMap.get(IssueSource)),
         Effect.withSpan("CurrentIssueSource.build"),
       )
-      return ServiceMap.add(services, CurrentIssueSource, source)
+      const ref = yield* ScopedRef.fromAcquire(build)
+      const services = yield* Effect.services<
+        Settings | ChildProcessSpawner | Prompt.Environment
+      >()
+      const refresh = ScopedRef.set(ref, build).pipe(
+        Effect.provideServices(services),
+      )
+
+      const proxy = IssueSource.of({
+        issues: (projectId) =>
+          ScopedRef.get(ref).pipe(
+            Effect.flatMap((source) => source.issues(projectId)),
+            Effect.tapErrorTag("IssueSourceError", (e) =>
+              Effect.logWarning(
+                "Rebuilding issue source due to error",
+                Cause.fail(e),
+              ).pipe(Effect.andThen(Effect.ignore(refresh))),
+            ),
+            Effect.retry(refreshSchedule),
+          ),
+        createIssue: (projectId, options) =>
+          ScopedRef.get(ref).pipe(
+            Effect.flatMap((source) => source.createIssue(projectId, options)),
+          ),
+        updateIssue: (options) =>
+          ScopedRef.get(ref).pipe(
+            Effect.flatMap((source) => source.updateIssue(options)),
+          ),
+        cancelIssue: (projectId, issueId) =>
+          ScopedRef.get(ref).pipe(
+            Effect.flatMap((source) => source.cancelIssue(projectId, issueId)),
+          ),
+        reset: ScopedRef.get(ref).pipe(
+          Effect.flatMap((source) => source.reset),
+        ),
+        settings: (projectId) =>
+          ScopedRef.get(ref).pipe(
+            Effect.flatMap((source) => source.settings(projectId)),
+          ),
+        info: (projectId) =>
+          ScopedRef.get(ref).pipe(
+            Effect.flatMap((source) => source.info(projectId)),
+          ),
+        ensureInProgress: (projectId, issueId) =>
+          ScopedRef.get(ref).pipe(
+            Effect.flatMap((source) =>
+              source.ensureInProgress(projectId, issueId),
+            ),
+          ),
+      })
+
+      return IssueSource.serviceMap(proxy).pipe(
+        ServiceMap.add(CurrentIssueSource, source),
+      )
     }),
   ).pipe(Layer.provide([Settings.layer, PlatformServices]))
 }
 
+const refreshSchedule = Schedule.exponential(100, 1.5).pipe(
+  Schedule.either(Schedule.spaced("30 seconds")),
+)
+
 // Atoms
 
 export const issueSourceRuntime = atomRuntime(
@@ -85,9 +154,10 @@ export const currentIssuesAtom = Atom.family((projectId: ProjectId) =>
     issueSourceRuntime.atom(
       Effect.fnUntraced(function* (get) {
         const source = yield* IssueSource
-        const issues = yield* source
-          .issues(projectId)
-          .pipe(Effect.withSpan("currentIssuesAtom.refresh"))
+        const issues = yield* pipe(
+          source.issues(projectId),
+          Effect.withSpan("currentIssuesAtom.refresh"),
+        )
         const handle = setTimeout(() => {
           get.refreshSelf()
         }, 30_000)

package/src/IssueSource.ts

@@ -85,4 +85,6 @@ export class IssueSourceError extends Schema.ErrorClass<IssueSourceError>(
 )({
   _tag: Schema.tag("IssueSourceError"),
   cause: Schema.Defect,
-}) {}
+}) {
+  readonly message = "An error occurred in the IssueSource"
+}

package/src/Linear/LinearError.ts

@@ -0,0 +1,6 @@
+import { Schema } from "effect"
+
+export class LinearError extends Schema.ErrorClass("lalph/LinearError")({
+  _tag: Schema.tag("LinearError"),
+  cause: Schema.Defect,
+}) {}

package/src/Prd.ts

@@ -14,7 +14,7 @@ import { Worktree } from "./Worktree.ts"
 import { PrdIssue } from "./domain/PrdIssue.ts"
 import { IssueSource, IssueSourceError } from "./IssueSource.ts"
 import { AtomRegistry, Reactivity } from "effect/unstable/reactivity"
-import { CurrentIssueSource, currentIssuesAtom } from "./IssueSources.ts"
+import { CurrentIssueSource, currentIssuesAtom } from "./CurrentIssueSource.ts"
 import { CurrentProjectId } from "./Settings.ts"
 
 export class Prd extends ServiceMap.Service<

package/src/Projects.ts

@@ -14,7 +14,7 @@ import { AsyncResult, Atom } from "effect/unstable/reactivity"
 import { CurrentProjectId, Setting, Settings } from "./Settings.ts"
 import { Prompt } from "effect/unstable/cli"
 import { IssueSource } from "./IssueSource.ts"
-import { CurrentIssueSource } from "./IssueSources.ts"
+import { CurrentIssueSource } from "./CurrentIssueSource.ts"
 
 export const layerProjectIdPrompt = Layer.effect(
   CurrentProjectId,

package/src/PromptGen.ts

@@ -1,6 +1,6 @@
 import { Effect, Layer, ServiceMap } from "effect"
 import { PrdIssue } from "./domain/PrdIssue.ts"
-import { CurrentIssueSource } from "./IssueSources.ts"
+import { CurrentIssueSource } from "./CurrentIssueSource.ts"
 import type { GitFlow } from "./GitFlow.ts"
 
 export class PromptGen extends ServiceMap.Service<PromptGen>()(

package/src/commands/issue.ts

@@ -1,5 +1,5 @@
 import { Command } from "effect/unstable/cli"
-import { CurrentIssueSource } from "../IssueSources.ts"
+import { CurrentIssueSource } from "../CurrentIssueSource.ts"
 import { Effect, FileSystem, flow, Layer, Schema } from "effect"
 import { IssueSource } from "../IssueSource.ts"
 import { ChildProcess } from "effect/unstable/process"

package/src/commands/plan.ts

@@ -5,7 +5,7 @@ import { ChildProcess } from "effect/unstable/process"
 import { Worktree } from "../Worktree.ts"
 import { getCommandPrefix, getOrSelectCliAgent } from "./agent.ts"
 import { Command, Flag } from "effect/unstable/cli"
-import { CurrentIssueSource } from "../IssueSources.ts"
+import { CurrentIssueSource } from "../CurrentIssueSource.ts"
 import { commandRoot } from "./root.ts"
 import { CurrentProjectId, Settings } from "../Settings.ts"
 import { addOrUpdateProject, selectProject } from "../Projects.ts"

package/src/commands/projects/add.ts

@@ -1,6 +1,6 @@
 import { Command } from "effect/unstable/cli"
 import { addOrUpdateProject } from "../../Projects.ts"
-import { CurrentIssueSource } from "../../IssueSources.ts"
+import { CurrentIssueSource } from "../../CurrentIssueSource.ts"
 import { Settings } from "../../Settings.ts"
 
 export const commandProjectsAdd = Command.make("add").pipe(

package/src/commands/projects/edit.ts

@@ -6,7 +6,7 @@ import {
   selectProject,
 } from "../../Projects.ts"
 import { Settings } from "../../Settings.ts"
-import { CurrentIssueSource } from "../../IssueSources.ts"
+import { CurrentIssueSource } from "../../CurrentIssueSource.ts"
 
 export const commandProjectsEdit = Command.make("edit").pipe(
   Command.withDescription("Modify a project"),

package/src/commands/projects/ls.ts

@@ -1,7 +1,7 @@
 import { Effect, Option } from "effect"
 import { Command } from "effect/unstable/cli"
 import { IssueSource } from "../../IssueSource.ts"
-import { CurrentIssueSource } from "../../IssueSources.ts"
+import { CurrentIssueSource } from "../../CurrentIssueSource.ts"
 import { getAllProjects } from "../../Projects.ts"
 import { Settings } from "../../Settings.ts"
 

package/src/commands/projects/rm.ts

@@ -2,7 +2,7 @@ import { Effect, Option } from "effect"
 import { Command } from "effect/unstable/cli"
 import { allProjects, getAllProjects, selectProject } from "../../Projects.ts"
 import { Settings } from "../../Settings.ts"
-import { CurrentIssueSource } from "../../IssueSources.ts"
+import { CurrentIssueSource } from "../../CurrentIssueSource.ts"
 
 export const commandProjectsRm = Command.make("rm").pipe(
   Command.withDescription("Remove a project"),

package/src/commands/root.ts

@@ -1,12 +1,10 @@
 import {
-  Cause,
   Config,
   Deferred,
   Duration,
   Effect,
   FiberSet,
   FileSystem,
-  Filter,
   Iterable,
   Option,
   Path,
@@ -22,7 +20,7 @@ import {
   checkForWork,
   CurrentIssueSource,
   resetInProgress,
-} from "../IssueSources.ts"
+} from "../CurrentIssueSource.ts"
 import { GithubCli } from "../Github/Cli.ts"
 import { agentWorker } from "../Agents/worker.ts"
 import { agentChooser } from "../Agents/chooser.ts"
@@ -280,16 +278,6 @@ const runProject = Effect.fnUntraced(
             withWorkerState(options.project.id),
           ),
         ),
-        Effect.catchFilter(
-          (e) =>
-            e._tag === "NoMoreWork" || e._tag === "QuitError"
-              ? Filter.fail(e)
-              : e,
-          (e) =>
-            Effect.logWarning(Cause.fail(e)).pipe(
-              Effect.andThen(Effect.sleep(Duration.seconds(10))),
-            ),
-        ),
         Effect.catchTags({
           NoMoreWork(_) {
             if (isFinite) {
@@ -311,6 +299,11 @@ const runProject = Effect.fnUntraced(
             return Effect.void
           },
         }),
+        Effect.catchCause((cause) =>
+          Effect.logWarning(cause).pipe(
+            Effect.andThen(Effect.sleep(Duration.seconds(10))),
+          ),
+        ),
         Effect.ensuring(semaphore.release(1)),
         Effect.ensuring(Deferred.completeWith(startedDeferred, Effect.void)),
         FiberSet.run(fibers),

package/src/commands/source.ts

@@ -1,5 +1,5 @@
 import { Command } from "effect/unstable/cli"
-import { selectIssueSource } from "../IssueSources.ts"
+import { selectIssueSource } from "../CurrentIssueSource.ts"
 import { Settings } from "../Settings.ts"
 
 export const commandSource = Command.make("source").pipe(