jackherd 1.26.1 → 1.26.3

package/src/watch/obsolete-records.ts

@@ -1,6 +1,7 @@
 import { terminalSafe } from '../plan-format/terminal-text'
 import { CLOSE_REASON, closeReasonOf } from '../plans/close-reason'
 import { latestPerFile, type SentFileRecord, sentLaneOf } from '../plans/sent-files'
+import type { LaneWorktrees } from '../plans/unlisted-lanes'
 
 export const WAITING_CLOSED_EVENT = 'waiting closed'
 
@@ -49,9 +50,10 @@ export const obsoleteSendsOf = (
   records: readonly SentFileRecord[],
   worktreeDirectory: string,
   gone: ReadonlySet<string>,
+  placed: LaneWorktrees = {},
 ): Closing[] => {
   const open = records.flatMap((record) => {
-    const lane = sentLaneOf(record, worktreeDirectory)
+    const lane = sentLaneOf(record, worktreeDirectory, placed)
     return record.closedAt === null ? [{ id: record.id, lane }] : []
   })
   const openIds = new Set(open.map(({ id }) => id))

package/src/watch/running-subagents.ts

@@ -1,15 +1,16 @@
 import type { RunningSubagent } from '../plans/subagents'
-import { laneDirectoryOf } from '../plans/unlisted-lanes'
+import { type LaneWorktrees, laneOfCwd } from '../plans/unlisted-lanes'
 import { type LaneNotes, type PhaseCount, progressNotes } from './heartbeat-progress'
 
 /** The running subagents of each worktree below `worktreeDirectory`, by lane name; one that works elsewhere is left out. */
 export const runningSubagentCountsOf = (
   running: readonly Pick<RunningSubagent, 'cwd'>[],
   worktreeDirectory: string,
+  placed: LaneWorktrees = {},
 ): Record<string, number> => {
   const counts: Record<string, number> = {}
   for (const { cwd } of running) {
-    const lane = cwd === null ? null : laneDirectoryOf(cwd, worktreeDirectory)
+    const lane = cwd === null ? null : laneOfCwd(cwd, worktreeDirectory, placed)
     if (lane !== null) counts[lane] = (counts[lane] ?? 0) + 1
   }
   return counts

package/src/watch/task-signal-read.ts

@@ -2,12 +2,15 @@ import { join } from 'node:path'
 import { defaultProjectsDirectory } from '../context/session-log'
 import { laneOfDirectory } from '../plans/active-tasks'
 import { readAllSignals } from '../plans/signals-read'
+import type { LaneWorktrees } from '../plans/unlisted-lanes'
 
 export type SignalSources = {
   /** The main checkout, which holds `.jackherd/tasks/`. */
   root: string
   /** The lanes' worktree directory, relative to `root`. */
   worktreeDirectory: string
+  /** The lanes placed in worktrees of another name (`PlansSettings.laneWorktrees`). */
+  laneWorktrees?: LaneWorktrees
   now: number
   /** Where Claude Code keeps its session logs; the user's by default. */
   projectsDirectory?: string
@@ -24,6 +27,6 @@ export const signalledLanes = (lanes: readonly string[], sources: SignalSources)
     { projects: sources.projectsDirectory ?? defaultProjectsDirectory(), root: sources.root, worktrees },
     sources.now,
   )
-  const signalled = new Set(signals.flatMap(({ cwd }) => laneOfDirectory(cwd, worktrees) ?? []))
+  const signalled = new Set(signals.flatMap(({ cwd }) => laneOfDirectory(cwd, worktrees, sources.laneWorktrees) ?? []))
   return new Set(lanes.filter((lane) => signalled.has(lane)))
 }

package/src/watch/unlinked-artifacts-read.ts

@@ -35,7 +35,9 @@ export const readUnlinkedArtifactEvents = (
   const ids = new Set(artifacts.map(({ id }) => id))
   const worktrees = join(root, settings.worktreeDirectory)
   const lanes = new Set(
-    records.filter(({ id }) => ids.has(id)).flatMap((record) => sentLaneOf(record, worktrees) ?? []),
+    records
+      .filter(({ id }) => ids.has(id))
+      .flatMap((record) => sentLaneOf(record, worktrees, settings.laneWorktrees) ?? []),
   )
   const checkouts = [root, ...[...lanes].map((lane) => worktreeOf(root, settings, lane))]
   const texts = checkouts.flatMap((checkout) => markdownTextsUnder(join(checkout, settings.planDirectory)))