lalph 0.3.25 → 0.3.27

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "lalph",
   "type": "module",
-  "version": "0.3.25",
+  "version": "0.3.27",
   "publishConfig": {
     "access": "public"
   },
@@ -23,12 +23,12 @@
     "@changesets/changelog-github": "^0.5.2",
     "@changesets/cli": "^2.29.8",
     "@effect/language-service": "^0.73.1",
-    "@effect/platform-node": "https://pkg.pr.new/Effect-TS/effect-smol/@effect/platform-node@0a6d33c",
+    "@effect/platform-node": "4.0.0-beta.2",
     "@linear/sdk": "^75.0.0",
     "@octokit/plugin-rest-endpoint-methods": "^17.0.0",
     "@octokit/types": "^16.0.0",
     "concurrently": "^9.2.1",
-    "effect": "https://pkg.pr.new/Effect-TS/effect-smol/effect@0a6d33c",
+    "effect": "4.0.0-beta.2",
     "husky": "^9.1.7",
     "lint-staged": "^16.2.7",
     "octokit": "^5.0.5",

package/src/Github.ts

@@ -325,6 +325,25 @@ export const GithubIssueSource = Layer.effect(
             options.projectId,
           )
           const issueNumber = Number(options.issueId.slice(1))
+          const currentIssue = yield* github.request((rest) =>
+            rest.issues.get({
+              owner: cli.owner,
+              repo: cli.repo,
+              issue_number: issueNumber,
+            }),
+          )
+          const labels = Array.from(
+            new Set([
+              ...currentIssue.data.labels.flatMap((label) =>
+                typeof label === "string"
+                  ? [label]
+                  : label.name
+                    ? [label.name]
+                    : [],
+              ),
+              ...Option.toArray(labelFilter),
+            ]),
+          )
           const update: {
             owner: string
             repo: string
@@ -337,7 +356,7 @@ export const GithubIssueSource = Layer.effect(
             owner: cli.owner,
             repo: cli.repo,
             issue_number: issueNumber,
-            labels: Option.toArray(labelFilter),
+            labels,
           }
 
           if (options.title) {
@@ -349,15 +368,28 @@ export const GithubIssueSource = Layer.effect(
           if (options.state) {
             update.state = options.state === "done" ? "closed" : "open"
 
+            update.labels = update.labels.filter(
+              (label) => label !== "in-review" && label !== "in-progress",
+            )
+
             if (options.state === "in-review") {
               update.labels.push("in-review")
             } else if (options.state === "in-progress") {
               update.labels.push("in-progress")
             }
           }
-          if (options.autoMerge !== undefined) {
+          if (
+            options.autoMerge !== undefined &&
+            Option.isSome(autoMergeLabelName)
+          ) {
             if (options.autoMerge) {
-              update.labels.push(...Option.toArray(autoMergeLabelName))
+              if (!update.labels.includes(autoMergeLabelName.value)) {
+                update.labels.push(autoMergeLabelName.value)
+              }
+            } else {
+              update.labels = update.labels.filter(
+                (label) => label !== autoMergeLabelName.value,
+              )
             }
           }
 

package/src/Tracing.ts

@@ -41,21 +41,16 @@ const TracerLogger = Effect.gen(function* () {
   }
 
   return Tracer.make({
-    span(name, parent, annotations, links, startTime, kind, options) {
-      const span = tracer.span(
-        name,
-        parent,
-        annotations,
-        links,
-        startTime,
-        kind,
-        options,
-      )
-      log(`${name}: started`, startTime)
+    span(options) {
+      const span = tracer.span(options)
+      log(`${options.name}: started`, options.startTime)
       const oldEnd = span.end
       span.end = (endTime, cause) => {
         const duration = Duration.nanos(endTime - span.status.startTime)
-        log(`${name}: completed. Took ${Duration.format(duration)}`, endTime)
+        log(
+          `${options.name}: completed. Took ${Duration.format(duration)}`,
+          endTime,
+        )
         return oldEnd.call(span, endTime, cause)
       }
       return span

package/src/Workers.ts

@@ -103,6 +103,7 @@ export const withWorkerState =
           unmountState()
           unmountOutput()
           registry.update(activeWorkersAtom, HashMap.remove(workerId))
+          return Effect.void
         }),
         Effect.provideService(CurrentWorkerState, { state, output }),
       )

package/src/domain/CliAgent.ts

@@ -84,6 +84,7 @@ const claude = new CliAgent({
         "--disallowed-tools",
         "AskUserQuestion",
         ...extraArgs,
+        "--",
         `@${prdFilePath}
 
 ${prompt}`,

package/src/shared/stream.ts

@@ -1,12 +1,10 @@
-import { Effect, Filter, flow, Schema, Stream } from "effect"
+import { Effect, flow, Schema, Stream } from "effect"
 
 export const streamFilterJson = <S extends Schema.Top>(schema: S) => {
   const fromString = Schema.fromJsonString(schema)
   const decode = Schema.decodeEffect(fromString)
   return flow(
     Stream.splitLines,
-    Stream.filterMapEffect((line) =>
-      decode(line).pipe(Effect.catch(() => Effect.succeed(Filter.failVoid))),
-    ),
+    Stream.filterEffect((line) => decode(line).pipe(Effect.result)),
   )
 }