lalph 0.3.137 → 0.3.139

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "lalph",
   "type": "module",
-  "version": "0.3.137",
+  "version": "0.3.139",
   "publishConfig": {
     "access": "public"
   },
@@ -20,7 +20,6 @@
     "url": "https://github.com/tim-smart/lalph.git"
   },
   "dependencies": {
-    "better-sqlite3": "^12.10.0",
     "tree-sitter": "^0.21.1",
     "tree-sitter-javascript": "^0.23.1",
     "tree-sitter-typescript": "^0.23.2"
@@ -37,23 +36,23 @@
   "devDependencies": {
     "@changesets/changelog-github": "^0.7.0",
     "@changesets/cli": "^2.31.0",
-    "@effect/ai-openai": "4.0.0-beta.78",
-    "@effect/ai-openai-compat": "4.0.0-beta.79",
-    "@effect/language-service": "^0.86.2",
-    "@effect/platform-node": "4.0.0-beta.78",
-    "@linear/sdk": "^86.0.0",
+    "@effect/ai-openai": "4.0.0-beta.94",
+    "@effect/ai-openai-compat": "4.0.0-beta.94",
+    "@effect/language-service": "^0.86.4",
+    "@effect/platform-node": "4.0.0-beta.94",
+    "@linear/sdk": "^88.0.0",
     "@octokit/plugin-rest-endpoint-methods": "^17.0.0",
     "@octokit/types": "^16.0.0",
-    "@typescript/native-preview": "7.0.0-dev.20260610.1",
-    "clanka": "^0.2.68",
+    "@typescript/native-preview": "7.0.0-dev.20260707.2",
+    "clanka": "^0.2.69",
     "concurrently": "^10.0.3",
-    "effect": "4.0.0-beta.78",
+    "effect": "4.0.0-beta.94",
     "husky": "^9.1.7",
-    "lint-staged": "^17.0.7",
+    "lint-staged": "^17.0.8",
     "octokit": "^5.0.5",
-    "oxlint": "^1.69.0",
-    "prettier": "^3.8.4",
-    "tsdown": "^0.22.2",
+    "oxlint": "^1.73.0",
+    "prettier": "^3.9.4",
+    "tsdown": "^0.22.3",
     "typescript": "^6.0.3",
     "yaml": "^2.9.0"
   },

package/src/GitFlow.ts

@@ -8,6 +8,7 @@ import { Atom } from "effect/unstable/reactivity"
 import { parseBranch } from "./shared/git.ts"
 import { AtomRegistry } from "effect/unstable/reactivity"
 import { CurrentProjectId } from "./Settings.ts"
+import type { PrdIssue } from "./domain/PrdIssue.ts"
 
 // @effect-diagnostics-next-line leakingRequirements:off
 export class GitFlow extends Context.Service<
@@ -130,8 +131,12 @@ export const GitFlowCommit = Layer.effect(
       requiresGithubPr: false,
       branch: `lalph/worker-${workerState.id}`,
 
-      setupInstructions: () =>
-        `You are already on a new branch for this task. You do not need to checkout any other branches.`,
+      setupInstructions: ({ githubPrNumber }) =>
+        githubPrNumber
+          ? `You are already on a new branch for this task. Github PR #${githubPrNumber} has been detected.
+   - **REVIEW ALL FEEDBACK** in the .lalph/feedback.md file.
+   - Do not checkout any other branches.`
+          : `You are already on a new branch for this task. You do not need to checkout any other branches.`,
 
       commitInstructions: (
         options,
@@ -185,13 +190,18 @@ But you **do not** need to git push your changes or switch branches.
         const source = yield* IssueSource
         const projectId = yield* CurrentProjectId
         const issue = yield* source.findById(projectId, options.issueId)
-        if (!issue || issue.state !== "in-review") {
+        let nextStatus: PrdIssue["state"] = "done"
+        if (!issue) {
+          return
+        } else if (issue.state === "in-progress") {
+          nextStatus = "todo"
+        } else if (issue.state !== "in-review") {
           return
         }
         yield* source.updateIssue({
           projectId,
           issueId: options.issueId,
-          state: "done",
+          state: nextStatus,
         })
       }),
     })

package/src/Github/Cli.ts

@@ -14,6 +14,7 @@ import {
   GithubPullRequestData,
   ReviewComment,
 } from "../domain/GithubComment.ts"
+import { parseBranch } from "../shared/git.ts"
 
 export class GithubCli extends Context.Service<GithubCli>()(
   "lalph/Github/Cli",
@@ -61,6 +62,28 @@ export class GithubCli extends Context.Service<GithubCli>()(
           ),
         )
 
+      const openPrForBranch = (targetBranch: string) => {
+        const branch = parseBranch(targetBranch).branch
+        return ChildProcess.make`gh pr list --head ${branch} --state open --limit 1 --json number,state`.pipe(
+          spawner.string,
+          Effect.flatMap(Schema.decodeEffect(OpenPullRequestsFromJson)),
+          Effect.option,
+          Effect.map(
+            Option.match({
+              onNone: () => Option.none<OpenPullRequest>(),
+              onSome: (prs) =>
+                prs.length > 0
+                  ? Option.some(prs[0]!)
+                  : Option.none<OpenPullRequest>(),
+            }),
+          ),
+          Effect.provideService(
+            ChildProcessSpawner.ChildProcessSpawner,
+            spawner,
+          ),
+        )
+      }
+
       const prFeedbackMd = (pr: number) =>
         reviewComments(pr).pipe(
           Effect.map(({ comments, reviewThreads, reviews }) => {
@@ -130,7 +153,13 @@ ${generalCommentsXml}
           }),
         )
 
-      return { owner, repo, reviewComments, prFeedbackMd } as const
+      return {
+        owner,
+        repo,
+        reviewComments,
+        openPrForBranch,
+        prFeedbackMd,
+      } as const
     }),
   },
 ) {
@@ -181,6 +210,16 @@ const renderGeneralComment = (
 
 const PullRequestDataFromJson = Schema.fromJsonString(GithubPullRequestData)
 
+const OpenPullRequest = Schema.Struct({
+  number: Schema.Finite,
+  state: Schema.String,
+})
+type OpenPullRequest = Schema.Schema.Type<typeof OpenPullRequest>
+
+const OpenPullRequestsFromJson = Schema.fromJsonString(
+  Schema.Array(OpenPullRequest),
+)
+
 const githubReviewCommentsQuery = `
 query FetchPRComments($owner: String!, $repo: String!, $pr: Int!) {
   repository(owner: $owner, name: $repo) {

package/src/Linear/TokenManager.ts

@@ -110,6 +110,7 @@ export class TokenManager extends Context.Service<TokenManager>()(
             NodeHttpServer.layer(createServer, {
               port: 34338,
               disablePreemptiveShutdown: true,
+              gracefulShutdownTimeout: 0,
             }),
           ),
           Layer.build,

package/src/commands/root.ts

@@ -176,17 +176,26 @@ const run = Effect.fnUntraced(
 
     yield* Deferred.completeWith(options.startedDeferred, Effect.void)
 
-    if (gitFlow.requiresGithubPr && chosenTask.githubPrNumber) {
-      yield* worktree.exec`gh pr checkout ${chosenTask.githubPrNumber}`
-      const feedback = yield* gh.prFeedbackMd(chosenTask.githubPrNumber)
-      yield* fs.writeFileString(
-        pathService.join(worktree.directory, ".lalph", "feedback.md"),
-        feedback,
-      )
+    let githubPrNumber = chosenTask.githubPrNumber ?? undefined
+    if (gitFlow.requiresGithubPr && githubPrNumber) {
+      yield* worktree.exec`gh pr checkout ${githubPrNumber}`
     } else if (gitFlow.requiresGithubPr) {
       const branchName = `lalph/${taskId.replace(/#/g, "").replace(/[^a-zA-Z0-9-_]/g, "-")}`
       yield* worktree.exec`git branch -D ${branchName}`
       yield* worktree.exec`git checkout -b ${branchName}`
+    } else if (Option.isSome(options.targetBranch)) {
+      const prState = yield* gh.openPrForBranch(options.targetBranch.value)
+      if (Option.isSome(prState) && prState.value.state === "OPEN") {
+        githubPrNumber = prState.value.number
+      }
+    }
+
+    if (githubPrNumber !== undefined) {
+      const feedback = yield* gh.prFeedbackMd(githubPrNumber)
+      yield* fs.writeFileString(
+        pathService.join(worktree.directory, ".lalph", "feedback.md"),
+        feedback,
+      )
     }
 
     const taskPreset = Option.getOrElse(
@@ -232,14 +241,14 @@ const run = Effect.fnUntraced(
             specsDirectory: options.specsDirectory,
             targetBranch: Option.getOrUndefined(options.targetBranch),
             task: chosenTask.prd,
-            githubPrNumber: chosenTask.githubPrNumber ?? undefined,
+            githubPrNumber,
             gitFlow,
           })
         : promptGen.promptClanka({
             specsDirectory: options.specsDirectory,
             targetBranch: Option.getOrUndefined(options.targetBranch),
             task: chosenTask.prd,
-            githubPrNumber: chosenTask.githubPrNumber ?? undefined,
+            githubPrNumber,
             gitFlow,
           })
 

package/src/domain/CliAgent.ts

@@ -1,5 +1,6 @@
 import {
   Data,
+  Duration,
   PlatformError,
   Schema,
   SchemaTransformation,
@@ -33,6 +34,12 @@ const escapeLeadingHyphen = (text: string) => {
   return text
 }
 
+const claudeInterruptOptions = {
+  stdin: "ignore",
+  killSignal: "SIGINT",
+  forceKillAfter: Duration.seconds(2),
+} as const
+
 const clanka = new CliAgent({
   id: "clanka",
   name: "clanka",
@@ -137,7 +144,7 @@ ${prompt}`
       {
         stdout: "pipe",
         stderr: "pipe",
-        stdin: "inherit",
+        ...claudeInterruptOptions,
       },
     ),
   outputTransformer: claudeOutputTransformer,
@@ -153,7 +160,7 @@ ${prompt}`,
       {
         stdout: "inherit",
         stderr: "inherit",
-        stdin: "inherit",
+        ...claudeInterruptOptions,
       },
     ),
 })

package/src/shared/git.ts

@@ -8,7 +8,9 @@ export const parseBranch = (
   if (!ref.startsWith("origin/") && !ref.startsWith("upstream/")) {
     return { remote: "origin", branch: ref, branchWithRemote: `origin/${ref}` }
   }
-  const [remote, branch] = ref.split("/", 2) as [string, string]
+  const separator = ref.indexOf("/")
+  const remote = ref.slice(0, separator)
+  const branch = ref.slice(separator + 1)
   const branchWithRemote = `${remote}/${branch}`
   return { remote, branch, branchWithRemote } as const
 }

package/dist/cli.d.mts

@@ -1 +0,0 @@
-export { };