lalph 0.3.32 → 0.3.34

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "lalph",
   "type": "module",
-  "version": "0.3.32",
+  "version": "0.3.34",
   "publishConfig": {
     "access": "public"
   },
@@ -23,13 +23,13 @@
     "@changesets/changelog-github": "^0.5.2",
     "@changesets/cli": "^2.29.8",
     "@effect/language-service": "^0.75.1",
-    "@effect/platform-node": "4.0.0-beta.12",
+    "@effect/platform-node": "4.0.0-beta.21",
     "@linear/sdk": "^75.0.0",
     "@octokit/plugin-rest-endpoint-methods": "^17.0.0",
     "@octokit/types": "^16.0.0",
     "@typescript/native-preview": "7.0.0-dev.20260219.1",
     "concurrently": "^9.2.1",
-    "effect": "4.0.0-beta.12",
+    "effect": "4.0.0-beta.21",
     "husky": "^9.1.7",
     "lint-staged": "^16.2.7",
     "octokit": "^5.0.5",

package/src/Agents/planner.ts

@@ -1,6 +1,6 @@
 import { Effect, Path, pipe } from "effect"
 import { PromptGen } from "../PromptGen.ts"
-import { ChildProcess } from "effect/unstable/process"
+import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
 import { Worktree } from "../Worktree.ts"
 import type { CliAgentPreset } from "../domain/CliAgentPreset.ts"
 
@@ -13,6 +13,7 @@ export const agentPlanner = Effect.fnUntraced(function* (options: {
   const pathService = yield* Path.Path
   const worktree = yield* Worktree
   const promptGen = yield* PromptGen
+  const spawner = yield* ChildProcessSpawner.ChildProcessSpawner
 
   yield* pipe(
     options.preset.cliAgent.commandPlan({
@@ -22,6 +23,6 @@ export const agentPlanner = Effect.fnUntraced(function* (options: {
     }),
     ChildProcess.setCwd(worktree.directory),
     options.preset.withCommandPrefix,
-    ChildProcess.exitCode,
+    spawner.exitCode,
   )
 })

package/src/Editor.ts

@@ -15,7 +15,7 @@ export class Editor extends ServiceMap.Service<Editor>()("lalph/Editor", {
         stdout: "inherit",
         stderr: "inherit",
       }).pipe(
-        ChildProcess.exitCode,
+        spawner.exitCode,
         Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
         Effect.orDie,
       )
@@ -41,7 +41,7 @@ export class Editor extends ServiceMap.Service<Editor>()("lalph/Editor", {
             stdout: "inherit",
             stderr: "inherit",
           },
-        ).pipe(ChildProcess.exitCode)
+        ).pipe(spawner.exitCode)
 
         if (exitCode !== 0) {
           return yield* new Cause.NoSuchElementError()

package/src/GitFlow.ts

@@ -81,6 +81,8 @@ After making any changes, commit and push them to the same pull request.
     postWork: () => Effect.void,
     autoMerge: Effect.fnUntraced(function* (options) {
       const prd = yield* Prd
+      const source = yield* IssueSource
+      const projectId = yield* CurrentProjectId
       const worktree = options.worktree
 
       let prState = (yield* worktree.viewPrState()).pipe(
@@ -101,6 +103,14 @@ After making any changes, commit and push them to the same pull request.
       prState = yield* worktree.viewPrState(prState.value.number)
       yield* Effect.log("PR state after merge", prState)
       if (Option.isSome(prState) && prState.value.state === "MERGED") {
+        const issue = yield* prd.findById(options.issueId)
+        if (issue && issue.state !== "done") {
+          yield* source.updateIssue({
+            projectId,
+            issueId: options.issueId,
+            state: "done",
+          })
+        }
         return
       }
       yield* Effect.log("Flagging unmergable PR")

package/src/Github/Cli.ts

@@ -23,7 +23,7 @@ export class GithubCli extends ServiceMap.Service<GithubCli>()(
 
       const nameWithOwner =
         yield* ChildProcess.make`gh repo view --json nameWithOwner -q ${".nameWithOwner"}`.pipe(
-          ChildProcess.string,
+          spawner.string,
           Effect.option,
           Effect.flatMap(
             flow(
@@ -40,7 +40,7 @@ export class GithubCli extends ServiceMap.Service<GithubCli>()(
 
       const reviewComments = (pr: number) =>
         ChildProcess.make`gh api graphql -f owner=${owner} -f repo=${repo} -F pr=${pr} -f query=${githubReviewCommentsQuery}`.pipe(
-          ChildProcess.string,
+          spawner.string,
           Effect.flatMap(Schema.decodeEffect(PullRequestDataFromJson)),
           Effect.map((data) => {
             const comments =

package/src/Github.ts

@@ -33,6 +33,7 @@ export class GithubError extends Data.TaggedError("GithubError")<{
 
 export type GithubApi = Api["rest"]
 export type GithubResponse<A> = OctokitResponse<A>
+type GithubResponseHeaders = OctokitResponse<unknown>["headers"]
 
 export interface GithubService {
   readonly request: <A>(
@@ -46,6 +47,13 @@ export interface GithubService {
   ) => Stream.Stream<A, GithubError, never>
 }
 
+type CachedGetResponse = {
+  readonly etag: string
+  readonly data: unknown
+  readonly headers: GithubResponseHeaders
+  readonly url: string
+}
+
 export class Github extends ServiceMap.Service<Github, GithubService>()(
   "lalph/Github",
   {
@@ -53,7 +61,54 @@ export class Github extends ServiceMap.Service<Github, GithubService>()(
       const tokens = yield* TokenManager
       const clients = yield* RcMap.make({
         lookup: (token: string) =>
-          Effect.succeed(new Octokit({ auth: token }).rest),
+          Effect.sync(() => {
+            const octokit = new Octokit({ auth: token })
+            const etagCache = new Map<string, CachedGetResponse>()
+
+            octokit.hook.wrap("request", async (request, options) => {
+              if (requestMethod(options) !== "GET") {
+                return request(options)
+              }
+
+              const key = requestCacheKey(options)
+              const cached = etagCache.get(key)
+              const ifNoneMatchHeader = cached
+                ? {
+                    ...options.headers,
+                    "if-none-match": cached.etag,
+                  }
+                : options.headers
+
+              try {
+                const response = await request({
+                  ...options,
+                  headers: ifNoneMatchHeader,
+                })
+                const etag = etagHeaderValue(response.headers)
+                if (etag !== undefined) {
+                  etagCache.set(key, {
+                    etag,
+                    data: response.data,
+                    headers: response.headers,
+                    url: response.url,
+                  })
+                }
+                return response
+              } catch (cause) {
+                if (isNotModifiedError(cause) && cached) {
+                  return {
+                    status: 200,
+                    headers: cached.headers,
+                    url: cached.url,
+                    data: cached.data,
+                  }
+                }
+                throw cause
+              }
+            })
+
+            return octokit.rest
+          }),
         idleTimeToLive: "1 minute",
       })
       const getClient = tokens.get.pipe(
@@ -620,3 +675,36 @@ const maybeNextPage = (page: number, linkHeader?: string) =>
     Option.filter((_) => _.includes(`rel="next"`)),
     Option.as(page + 1),
   )
+
+const requestMethod = (options: { readonly method?: string }) =>
+  options.method?.toUpperCase() ?? "GET"
+
+const requestCacheKey = (options: {
+  readonly method?: string
+  readonly url?: string
+  readonly headers?: Record<string, unknown>
+}) => {
+  const method = requestMethod(options)
+  const url = options.url ?? ""
+  const acceptHeader = options.headers?.accept
+  const accept = typeof acceptHeader === "string" ? acceptHeader : ""
+  return `${method}:${url}:${accept}`
+}
+
+const etagHeaderValue = (
+  headers: GithubResponseHeaders,
+): string | undefined => {
+  const etag = headers.etag
+  if (typeof etag === "string" && etag.length > 0) {
+    return etag
+  }
+  return undefined
+}
+
+const isNotModifiedError = (
+  cause: unknown,
+): cause is { readonly status: number } =>
+  typeof cause === "object" &&
+  cause !== null &&
+  "status" in cause &&
+  (cause as { readonly status: unknown }).status === 304

package/src/Worktree.ts

@@ -28,6 +28,7 @@ export class Worktree extends ServiceMap.Service<Worktree>()("lalph/Worktree", {
   make: Effect.gen(function* () {
     const fs = yield* FileSystem.FileSystem
     const pathService = yield* Path.Path
+    const spawner = yield* ChildProcessSpawner.ChildProcessSpawner
 
     const inExisting = yield* fs.exists(pathService.join(".lalph", "prd.yml"))
     if (inExisting) {
@@ -44,13 +45,14 @@ export class Worktree extends ServiceMap.Service<Worktree>()("lalph/Worktree", {
     yield* Effect.addFinalizer(
       Effect.fnUntraced(function* () {
         yield* execIgnore(
+          spawner,
           ChildProcess.make`git worktree remove --force ${directory}`,
         )
       }),
     )
 
     yield* ChildProcess.make`git worktree add ${directory} -d HEAD`.pipe(
-      ChildProcess.exitCode,
+      spawner.exitCode,
     )
 
     yield* fs.makeDirectory(pathService.join(directory, ".lalph"), {
@@ -86,8 +88,10 @@ export class Worktree extends ServiceMap.Service<Worktree>()("lalph/Worktree", {
   )
 }
 
-const execIgnore = (command: ChildProcess.Command) =>
-  command.pipe(ChildProcess.exitCode, Effect.catchCause(Effect.logWarning))
+const execIgnore = (
+  spawner: ChildProcessSpawner.ChildProcessSpawner["Service"],
+  command: ChildProcess.Command,
+) => command.pipe(spawner.exitCode, Effect.catchCause(Effect.logWarning))
 
 const seedSetupScript = Effect.fnUntraced(function* (setupPath: string) {
   const fs = yield* FileSystem.FileSystem
@@ -111,6 +115,7 @@ const setupWorktree = Effect.fnUntraced(function* (options: {
     ...args: Array<string | number | boolean>
   ) => Effect.Effect<ChildProcessSpawner.ExitCode, PlatformError.PlatformError>
 }) {
+  const spawner = yield* ChildProcessSpawner.ChildProcessSpawner
   const fs = yield* FileSystem.FileSystem
   const pathService = yield* Path.Path
   const targetBranch = yield* getTargetBranch
@@ -142,7 +147,7 @@ const setupWorktree = Effect.fnUntraced(function* (options: {
   yield* ChildProcess.make({
     cwd: options.directory,
     shell: process.env.SHELL ?? true,
-  })`${setupPath}`.pipe(ChildProcess.exitCode)
+  })`${setupPath}`.pipe(spawner.exitCode)
 })
 
 const getTargetBranch = Effect.gen(function* () {
@@ -178,7 +183,7 @@ const makeExecHelpers = Effect.fnUntraced(function* (options: {
       cwd: options.directory,
       stderr: "inherit",
       stdout: "inherit",
-    })(template, ...args).pipe(ChildProcess.exitCode, provide)
+    })(template, ...args).pipe(spawner.exitCode, provide)
 
   const execString = (
     template: TemplateStringsArray,
@@ -186,7 +191,7 @@ const makeExecHelpers = Effect.fnUntraced(function* (options: {
   ) =>
     ChildProcess.make({
       cwd: options.directory,
-    })(template, ...args).pipe(ChildProcess.string, provide)
+    })(template, ...args).pipe(spawner.string, provide)
 
   const viewPrState = (prNumber?: number) =>
     execString`gh pr view ${prNumber ? prNumber : ""} --json number,state`.pipe(
@@ -298,7 +303,7 @@ const makeExecHelpers = Effect.fnUntraced(function* (options: {
     ChildProcess.make({
       cwd: dir,
     })`git branch --show-current`.pipe(
-      ChildProcess.string,
+      spawner.string,
       provide,
       Effect.flatMap((output) =>
         Option.some(output.trim()).pipe(

package/src/cli.ts

@@ -6,17 +6,17 @@ import { NodeRuntime } from "@effect/platform-node"
 import { Settings } from "./Settings.ts"
 import { commandRoot } from "./commands/root.ts"
 import { commandPlan } from "./commands/plan.ts"
-import { commandIssue, commandIssueAlias } from "./commands/issue.ts"
-import { commandEdit, commandEditAlias } from "./commands/edit.ts"
+import { commandIssue } from "./commands/issue.ts"
+import { commandEdit } from "./commands/edit.ts"
 import { commandSource } from "./commands/source.ts"
 import PackageJson from "../package.json" with { type: "json" }
 import { TracingLayer } from "./Tracing.ts"
 import { MinimumLogLevel } from "effect/References"
 import { atomRuntime, lalphMemoMap } from "./shared/runtime.ts"
 import { PlatformServices } from "./shared/platform.ts"
-import { commandProjects, commandProjectsAlias } from "./commands/projects.ts"
+import { commandProjects } from "./commands/projects.ts"
 import { commandSh } from "./commands/sh.ts"
-import { commandAgents, commandAgentsAlias } from "./commands/agents.ts"
+import { commandAgents } from "./commands/agents.ts"
 
 commandRoot.pipe(
   Command.withSubcommands([
@@ -27,10 +27,6 @@ commandRoot.pipe(
     commandSource,
     commandAgents,
     commandProjects,
-    commandAgentsAlias,
-    commandEditAlias,
-    commandIssueAlias,
-    commandProjectsAlias,
   ]),
   Command.provide(Settings.layer),
   Command.provide(TracingLayer),

package/src/commands/agents.ts

@@ -15,12 +15,6 @@ export const commandAgents = Command.make("agents").pipe(
   Command.withDescription(
     "Manage agent presets used to run tasks. Use 'ls' to inspect presets and 'add'/'edit' to configure agents, arguments, and any issue-source options.",
   ),
-  subcommands,
-)
-
-export const commandAgentsAlias = Command.make("a").pipe(
-  Command.withDescription(
-    "Alias for 'agents' (manage agent presets used to run tasks).",
-  ),
+  Command.withAlias("a"),
   subcommands,
 )

package/src/commands/edit.ts

@@ -22,12 +22,6 @@ export const commandEdit = Command.make("edit").pipe(
   Command.withDescription(
     "Open the selected project's .lalph/prd.yml in your editor.",
   ),
-  handler,
-)
-
-export const commandEditAlias = Command.make("e").pipe(
-  Command.withDescription(
-    "Alias for 'edit' (open the selected project's .lalph/prd.yml in your editor).",
-  ),
+  Command.withAlias("e"),
   handler,
 )

package/src/commands/issue.ts

@@ -88,12 +88,6 @@ const handler = flow(
 
 export const commandIssue = Command.make("issue").pipe(
   Command.withDescription("Create a new issue in your editor."),
-  handler,
-)
-
-export const commandIssueAlias = Command.make("i").pipe(
-  Command.withDescription(
-    "Alias for 'issue' (create a new issue in your editor).",
-  ),
+  Command.withAlias("i"),
   handler,
 )

package/src/commands/plan/tasks.ts

@@ -7,7 +7,7 @@ import { PromptGen } from "../../PromptGen.ts"
 import { Settings } from "../../Settings.ts"
 import { Worktree } from "../../Worktree.ts"
 import { commandRoot } from "../root.ts"
-import { getDefaultCliAgentPreset } from "../../Presets.ts"
+import { selectCliAgentPreset } from "../../Presets.ts"
 import { CurrentIssueSource } from "../../CurrentIssueSource.ts"
 
 const specificationPath = Argument.path("spec", {
@@ -32,7 +32,7 @@ export const commandPlanTasks = Command.make("tasks", {
         const fs = yield* FileSystem.FileSystem
         const pathService = yield* Path.Path
         const worktree = yield* Worktree
-        const preset = yield* getDefaultCliAgentPreset
+        const preset = yield* selectCliAgentPreset
 
         const content = yield* fs.readFileString(specificationPath)
         const relative = pathService.relative(

package/src/commands/plan.ts

@@ -11,8 +11,8 @@ import { agentPlanner } from "../Agents/planner.ts"
 import { agentTasker } from "../Agents/tasker.ts"
 import { commandPlanTasks } from "./plan/tasks.ts"
 import { Editor } from "../Editor.ts"
-import { getDefaultCliAgentPreset } from "../Presets.ts"
-import { ChildProcess } from "effect/unstable/process"
+import { selectCliAgentPreset } from "../Presets.ts"
+import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
 import { parseBranch } from "../shared/git.ts"
 
 const dangerous = Flag.boolean("dangerous").pipe(
@@ -87,7 +87,7 @@ const plan = Effect.fnUntraced(
     const fs = yield* FileSystem.FileSystem
     const pathService = yield* Path.Path
     const worktree = yield* Worktree
-    const preset = yield* getDefaultCliAgentPreset
+    const preset = yield* selectCliAgentPreset
 
     yield* agentPlanner({
       plan: options.plan,
@@ -155,6 +155,7 @@ const commitAndPushSpecification = Effect.fnUntraced(
   }) {
     const worktree = yield* Worktree
     const pathService = yield* Path.Path
+    const spawner = yield* ChildProcessSpawner.ChildProcessSpawner
 
     const absSpecsDirectory = pathService.join(
       worktree.directory,
@@ -166,7 +167,7 @@ const commitAndPushSpecification = Effect.fnUntraced(
         cwd: worktree.directory,
         stdout: "inherit",
         stderr: "inherit",
-      }).pipe(ChildProcess.exitCode)
+      }).pipe(spawner.exitCode)
 
     const addCode = yield* git(["add", absSpecsDirectory])
     if (addCode !== 0) {

package/src/commands/projects.ts

@@ -17,10 +17,6 @@ export const commandProjects = Command.make("projects").pipe(
   Command.withDescription(
     "Manage projects and their execution settings (enabled state, concurrency, target branch, git flow, review agent). Use 'ls' to inspect and 'add', 'edit', or 'toggle' to configure.",
   ),
-  subcommands,
-)
-
-export const commandProjectsAlias = Command.make("p").pipe(
-  Command.withDescription("Alias for 'projects'."),
+  Command.withAlias("p"),
   subcommands,
 )

package/src/commands/sh.ts

@@ -1,6 +1,6 @@
 import { Command } from "effect/unstable/cli"
 import { Effect, FileSystem, Layer, Path } from "effect"
-import { ChildProcess } from "effect/unstable/process"
+import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
 import { Prd } from "../Prd.ts"
 import { Worktree } from "../Worktree.ts"
 import { layerProjectIdPrompt } from "../Projects.ts"
@@ -17,6 +17,7 @@ export const commandSh = Command.make("sh").pipe(
         const fs = yield* FileSystem.FileSystem
         const pathService = yield* Path.Path
         const lalphDirectory = yield* resolveLalphDirectory
+        const spawner = yield* ChildProcessSpawner.ChildProcessSpawner
 
         // link to lalph config
         yield* fs.symlink(
@@ -33,7 +34,7 @@ export const commandSh = Command.make("sh").pipe(
           stdin: "inherit",
           stdout: "inherit",
           stderr: "inherit",
-        }).pipe(ChildProcess.exitCode)
+        }).pipe(spawner.exitCode)
       },
       Effect.scoped,
       Effect.provide(

package/src/shared/config.ts

@@ -4,5 +4,5 @@ import { parseCommand } from "./child-process.ts"
 export const configEditor = Config.string("LALPH_EDITOR").pipe(
   Config.orElse(() => Config.string("EDITOR")),
   Config.map(parseCommand),
-  Config.withDefault(() => ["nano"]),
+  Config.withDefault(["nano"]),
 )

package/src/shared/stream.ts

@@ -5,6 +5,6 @@ export const streamFilterJson = <S extends Schema.Top>(schema: S) => {
   const decode = Schema.decodeEffect(fromString)
   return flow(
     Stream.splitLines,
-    Stream.filterEffect((line) => decode(line).pipe(Effect.result)),
+    Stream.filterMapEffect((line) => decode(line).pipe(Effect.result)),
   )
 }