@llm4ts/flow 2.9.6 → 2.10.0

package/dist/Stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Stories.d.ts","sourceRoot":"","sources":["../src/Stories.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Stories.d.ts","sourceRoot":"","sources":["../src/Stories.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@llm4ts/flow",
-  "version": "2.9.6",
+  "version": "2.10.0",
   "description": "Effect-native LLM workflow, persistence, review, and repository automation",
   "license": "MIT",
   "type": "module",
@@ -41,6 +41,7 @@
     "./FlowRecorder": "./dist/FlowRecorder.js",
     "./GitHubTool": "./dist/GitHubTool.js",
     "./GitTool": "./dist/GitTool.js",
+    "./Landing": "./dist/Landing.js",
     "./Interaction": "./dist/Interaction.js",
     "./McpServer": "./dist/McpServer.js",
     "./Mermaid": "./dist/Mermaid.js",
@@ -100,7 +101,7 @@
     "typescript"
   ],
   "dependencies": {
-    "@llm4ts/core": "2.9.6"
+    "@llm4ts/core": "2.10.0"
   },
   "peerDependencies": {
     "effect": "4.0.0-rc.115"

package/src/FlowError.ts

@@ -216,6 +216,27 @@ export class RosterInvalid extends Schema.TaggedError<RosterInvalid>()("RosterIn
   }
 }
 
+/** An epic asked to land while some of its stories are not merged into the epic branch yet. */
+export class EpicIncomplete extends Schema.TaggedError<EpicIncomplete>()("EpicIncomplete", {
+  epicId: Schema.String,
+  stories: Schema.Array(Schema.String)
+}) {
+  get message(): string {
+    return `epic '${this.epicId}' is not finished; not merged yet: ${this.stories.join(", ")} — run the epic until every story merges, then land it`
+  }
+}
+
+/** Landing an epic failed; the target branch was left untouched. */
+export class LandingFailed extends Schema.TaggedError<LandingFailed>()("LandingFailed", {
+  epicBranch: Schema.String,
+  target: Schema.String,
+  reason: Schema.String
+}) {
+  get message(): string {
+    return `landing '${this.epicBranch}' on '${this.target}' failed, '${this.target}' is untouched: ${this.reason}`
+  }
+}
+
 /** The start of every `RosterExhausted` message, so it is recognisable once wrapped. */
 export const rosterExhaustedPrefix = "roster exhausted: no executor can ever take the role"
 
@@ -302,6 +323,8 @@ export const FlowError = Schema.Union([
   EpicCheckoutDirty,
   RosterExhausted,
   RosterInvalid,
+  EpicIncomplete,
+  LandingFailed,
   StoryFailed,
   DecisionsInvalid,
   OpenPointsPending,

package/src/GitTool.ts

@@ -99,6 +99,14 @@ export interface GitToolShape {
     message: string,
     options?: MergeOptions
   ) => Effect.Effect<void, FlowError>
+  /**
+   * Starts a merge of `branch` and stops before committing, conflicts left
+   * in place for someone to resolve: returns the conflicted paths (empty for
+   * a clean merge, still uncommitted). `commitAll` completes the merge and
+   * `rollback` to an earlier checkpoint abandons it. A merge git refuses to
+   * start fails typed, as `merge` does.
+   */
+  readonly mergeNoCommit: (branch: string) => Effect.Effect<ReadonlyArray<string>, FlowError>
 }
 
 export interface MergeOptions {
@@ -438,6 +446,27 @@ export const makeGitTool = (
                 )
         )
       ),
+    mergeNoCommit: (branch) =>
+      write(
+        "git merge --no-commit",
+        Effect.gen(function* () {
+          const result = yield* run(["merge", "--no-ff", "--no-commit", branch])
+          if (result.exitCode === 0) {
+            return []
+          }
+          const unmerged = yield* run(["diff", "--name-only", "--diff-filter=U"])
+          const paths = text(unmerged.stdout)
+            .split(/\r?\n/)
+            .map((line) => line.trim())
+            .filter((line) => line.length > 0)
+          if (paths.length > 0) {
+            return paths
+          }
+          const into = yield* runOrFail(["rev-parse", "--abbrev-ref", "HEAD"])
+          yield* run(["merge", "--abort"])
+          return yield* MergeConflict.make({ branch, into, paths: [], detail: problem(result) })
+        })
+      ),
     merge: (branch, message, options = {}) =>
       write(
         "git merge",

package/src/Landing.ts

@@ -0,0 +1,182 @@
+// Landing a finished epic (`epic-stories --land`): every story merged into the
+// epic branch, the target (main by default) merged INTO the epic branch first
+// so conflicts are resolved on the epic side, a coder resolving them in a
+// bounded loop with the target's gates as the bar, and only then a merge
+// commit on the target. Nothing touches the target until the epic branch is
+// green with the target's history in it.
+import * as Effect from "effect/Effect"
+import type { LlmServiceShape } from "@llm4ts/core/LlmService"
+import { makeChat } from "./Chat.ts"
+import type { FlowContextShape } from "./FlowContext.ts"
+import { EpicCheckoutDirty, EpicIncomplete, LandingFailed, type FlowError } from "./FlowError.ts"
+import { Info } from "./FlowEvents.ts"
+import { statusPaths } from "./GitTool.ts"
+import { loadVersioned, type PlainFileStoreShape } from "./Persistence.ts"
+import type { ReviewResult } from "./Review.ts"
+import { StoryState, StoryStateVersion } from "./Stories.ts"
+import type { StoryPlan } from "./StoryPlan.ts"
+
+const join = (root: string, path: string): string =>
+  `${root.replace(/[\\/]+$/, "")}/${path.replace(/^[\\/]+/, "")}`
+
+export interface LandOptions {
+  readonly plan: StoryPlan
+  readonly files: PlainFileStoreShape
+  /** The executor's state directory, where each story's state says whether it merged. */
+  readonly stateDir: string
+  /** Default `epic/<epicId>`. */
+  readonly epicBranch?: string
+  /** Default `main`. */
+  readonly target?: string
+  /** The target's gates, run in the epic checkout. */
+  readonly gates: (workDir: string) => Effect.Effect<ReviewResult, FlowError>
+  /** Who resolves conflicts and red gates. Default: the context's coder. */
+  readonly coder?: LlmServiceShape
+  /** House rules for the coder. */
+  readonly system?: string
+  /** Fix rounds before giving up. Default 3. */
+  readonly maxRounds?: number
+}
+
+export interface LandReport {
+  readonly epicBranch: string
+  readonly target: string
+  /** The target's paths that conflicted with the epic, if any. */
+  readonly conflicts: ReadonlyArray<string>
+  /** Coder rounds it took (0: clean and green on the first try). */
+  readonly rounds: number
+}
+
+const markerPattern = /^(<{7} |={7}$|>{7} )/m
+
+const issueLines = (result: ReviewResult): string =>
+  result.issues
+    .map(
+      (issue) =>
+        `- ${issue.title}${issue.description.length === 0 ? "" : `: ${issue.description.slice(-1500)}`}`
+    )
+    .join("\n")
+
+export const landEpic = Effect.fn("@llm4ts/flow/Landing.land")(function* (
+  context: FlowContextShape,
+  options: LandOptions
+): Effect.fn.Return<LandReport, FlowError> {
+  const { plan, files } = options
+  const git = context.git
+  const events = context.events
+  const epicBranch = options.epicBranch ?? `epic/${plan.epicId}`
+  const target = options.target ?? "main"
+  const maxRounds = Math.max(1, options.maxRounds ?? 3)
+  const say = (message: string) => events.publish(Info.make({ message: `land: ${message}` }))
+  const failed = (reason: string) => LandingFailed.make({ epicBranch, target, reason })
+
+  // 1. Only a finished epic lands.
+  const unmerged: Array<string> = []
+  for (const story of plan.stories) {
+    const state = yield* loadVersioned(
+      files,
+      join(options.stateDir, `stories/${story.id}.json`),
+      StoryStateVersion,
+      StoryState
+    )
+    if (state?.status !== "merged") {
+      unmerged.push(story.id)
+    }
+  }
+  if (unmerged.length > 0) {
+    return yield* EpicIncomplete.make({ epicId: plan.epicId, stories: unmerged })
+  }
+  if (!(yield* git.branchExists(target))) {
+    return yield* failed(`there is no branch '${target}'`)
+  }
+  const dirty = statusPaths(yield* git.status)
+  if (dirty.length > 0) {
+    return yield* EpicCheckoutDirty.make({ checkout: context.workDir, paths: dirty })
+  }
+
+  // 2. Bring the target's history into the epic branch, on the epic side.
+  yield* git.checkout(epicBranch)
+  const before = yield* git.checkpoint
+  const behind = !(yield* git.isAncestor(target, epicBranch))
+  const conflicts = behind ? yield* git.mergeNoCommit(target) : []
+  if (behind) {
+    yield* say(
+      conflicts.length === 0
+        ? `merged ${target} into ${epicBranch} cleanly; checking the gates`
+        : `merging ${target} into ${epicBranch} conflicted in ${conflicts.length} file(s): ${conflicts.join(", ")}`
+    )
+  } else {
+    yield* say(`${epicBranch} already contains ${target}; checking the gates`)
+  }
+
+  // 3. Conflicts and red gates go to the coder, a bounded number of times.
+  const coder = options.coder ?? context.coder
+  const chat = yield* makeChat(coder, {
+    ...(options.system === undefined ? {} : { system: options.system }),
+    events,
+    agent: "coder"
+  })
+  const stories = plan.stories.map((story) => `- ${story.id}: ${story.provides.join("; ")}`)
+  let rounds = 0
+  while (true) {
+    const withMarkers: Array<string> = []
+    for (const path of conflicts) {
+      const text = yield* files.read(join(context.workDir, path))
+      if (text !== undefined && markerPattern.test(text)) {
+        withMarkers.push(path)
+      }
+    }
+    const gate = withMarkers.length > 0 ? undefined : yield* options.gates(context.workDir)
+    if (withMarkers.length === 0 && gate !== undefined && gate.isClean) {
+      break
+    }
+    if (rounds >= maxRounds) {
+      yield* git.rollback(before)
+      return yield* failed(
+        withMarkers.length > 0
+          ? `conflict markers still in ${withMarkers.join(", ")} after ${rounds} round(s)`
+          : `the gates are still red after ${rounds} round(s):\n${gate === undefined ? "" : issueLines(gate)}`
+      )
+    }
+    rounds += 1
+    yield* say(
+      withMarkers.length > 0
+        ? `round ${rounds}: asking the coder to resolve ${withMarkers.length} conflicted file(s)`
+        : `round ${rounds}: asking the coder to fix ${gate?.issues.length ?? 0} gate failure(s)`
+    )
+    yield* chat.ask(
+      withMarkers.length > 0
+        ? [
+            `The finished epic "${plan.epic}" (branch ${epicBranch}) is landing on ${target}.`,
+            `Merging ${target} into ${epicBranch} left conflicts in these files:`,
+            ...withMarkers.map((path) => `- ${path}`),
+            "",
+            `${target} holds newer mainline work; ${epicBranch} holds the epic's stories, which provide:`,
+            ...stories,
+            "",
+            "Resolve every conflict so both sides' intent survives, remove every conflict marker,",
+            "and keep the repository's gates (typecheck, lint, tests, build) green. Do not commit,",
+            "do not switch branches, and do not run git merge or git rebase: the flow owns git."
+          ].join("\n")
+        : [
+            `After merging ${target} into ${epicBranch}, the repository's gates fail:`,
+            gate === undefined ? "" : issueLines(gate),
+            "",
+            "Fix them without weakening any test. Do not commit or switch branches."
+          ].join("\n")
+    )
+  }
+
+  // 4. Green with the target's history: record it, then land on the target.
+  if (behind) {
+    yield* git.commitAll(`${plan.epicId}: merge ${target} into ${epicBranch} before landing`)
+  } else if (rounds > 0) {
+    yield* git.commitAll(`${plan.epicId}: fix the gates before landing`)
+  }
+  yield* git.checkout(target)
+  yield* git.merge(epicBranch, `${plan.epicId}: land ${epicBranch}`)
+  yield* say(
+    `landed ${epicBranch} on ${target}${rounds === 0 ? "" : ` after ${rounds} fix round(s)`}`
+  )
+  return { epicBranch, target, conflicts, rounds }
+})

package/src/Roster.ts

@@ -511,15 +511,19 @@ export const makeRoster = Effect.fn("@llm4ts/flow/Roster.make")(function* (
   const pick = (role: Role, leaseOptions: LeaseOptions): ExecutorSpec | undefined => {
     const avoid = leaseOptions.avoid ?? []
     const candidates = eligible(role, avoid).filter((spec) => freeFor(spec, role))
-    const preferred = candidates.find((spec) => spec.id === leaseOptions.prefer)
-    if (preferred !== undefined) {
-      return preferred
-    }
-    return [...candidates].sort(
+    const best = [...candidates].sort(
       (left, right) =>
         priorityOf(left, role) - priorityOf(right, role) ||
         (lastLeased.get(left.id) ?? -1) - (lastLeased.get(right.id) ?? -1)
     )[0]
+    // The executor a resumed context held before keeps it only while it
+    // still ranks with the best free one: continuity breaks ties, it never
+    // overrides a priority the operator changed.
+    const preferred = candidates.find((spec) => spec.id === leaseOptions.prefer)
+    return preferred !== undefined &&
+      (best === undefined || priorityOf(preferred, role) <= priorityOf(best, role))
+      ? preferred
+      : best
   }
 
   const release = (spec: ExecutorSpec, role: Role): Effect.Effect<void> =>