jackherd 1.26.0 → 1.26.2

package/src/sync/if-changed.ts

@@ -2,7 +2,8 @@ import { readFile } from 'node:fs/promises'
 import { join } from 'node:path'
 import { LEGACY_MANIFEST_PATH } from '../config/legacy-names'
 import { MANIFEST_FILE, TOOL_DIRECTORY } from '../config/location'
-import { CLI_NAME, isNewerVersion, PACKAGE_NAME } from '../version/release'
+import { REGISTRY_TIMEOUT_MS, registryUrl } from '../version/registry'
+import { CLI_NAME, isNewerVersion } from '../version/release'
 import { parseManifest } from './manifest'
 import { FILE_MODE } from './plan-file'
 import { assertOwnDirectoriesInProject, writeFileSafely } from './project-fs'
@@ -18,8 +19,6 @@ export const UPDATE_CHECK_INTERVAL_MS = 24 * 60 * 60 * 1000
 /** How soon npm is asked again after it gave no answer: an hour, so an offline morning does not cost the day. */
 export const UPDATE_RETRY_INTERVAL_MS = 60 * 60 * 1000
 
-const REGISTRY_LATEST = `https://registry.npmjs.org/${PACKAGE_NAME}/latest`
-const REGISTRY_TIMEOUT_MS = 3_000
 const UPDATE_STATE_FILE = 'update-check.json'
 
 /**
@@ -55,9 +54,9 @@ const versionOfLock = async (path: string): Promise<string | null> => {
   return parsed.ok ? parsed.manifest.kitVersion : null
 }
 
-/** The kit version the global lock was written by, under its old name while the global sync has not moved it. */
-export const lockedVersion = async (home: string): Promise<string | null> =>
-  (await versionOfLock(join(home, TOOL_DIRECTORY, MANIFEST_FILE))) ?? versionOfLock(join(home, LEGACY_MANIFEST_PATH))
+/** The kit version the lock under `root` (the home directory or a project) was written by, under its old name while a sync has not moved it. */
+export const lockedVersion = async (root: string): Promise<string | null> =>
+  (await versionOfLock(join(root, TOOL_DIRECTORY, MANIFEST_FILE))) ?? versionOfLock(join(root, LEGACY_MANIFEST_PATH))
 
 const readUpdateState = async (path: string): Promise<UpdateState | null> => {
   const raw = await readJson(path)
@@ -107,7 +106,7 @@ export const dailyUpdateNotice = async (home: string, installed: string, check:
 /** Asks the npm registry for the `latest` tag; null on any failure, after a few seconds at most. */
 const registryLatestVersion = async (): Promise<string | null> => {
   try {
-    const response = await fetch(REGISTRY_LATEST, { signal: AbortSignal.timeout(REGISTRY_TIMEOUT_MS) })
+    const response = await fetch(registryUrl('latest'), { signal: AbortSignal.timeout(REGISTRY_TIMEOUT_MS) })
     if (!response.ok) return null
     const { version } = (await response.json()) as { version?: unknown }
     return typeof version === 'string' ? version : null

package/src/update/command.ts

@@ -13,9 +13,11 @@ import { findProjectRoot } from '../config/location'
 import { defaultUpdateCheck, lockedVersion } from '../sync/if-changed'
 import { locateKit } from '../sync/kit-source'
 import { readInstalledVersion } from '../version/installed-version'
+import { REGISTRY_TIMEOUT_MS, registryUrl } from '../version/registry'
 import { CLI_NAME } from '../version/release'
 import { rewriteConfigShares } from './config-shares'
 import { detectPackageManager, legacyPackageRoot, shellHostedGlobalRoot } from './package-manager'
+import { VERSION_AVAILABILITY, type VersionAvailability } from './registry-wait'
 import { runUpdate, UPDATE_EXIT, type UpdateAdapters } from './update'
 
 const USAGE = `Usage: ${CLI_NAME} update`
@@ -35,6 +37,19 @@ const runInherited = async (argv: readonly string[], cwd: string): Promise<numbe
   }
 }
 
+const NOT_FOUND = 404
+
+/** Asks the registry for one exact version: 404 is `missing`, any other failure `unknown`. */
+const registryAvailability = async (version: string): Promise<VersionAvailability> => {
+  try {
+    const response = await fetch(registryUrl(version), { signal: AbortSignal.timeout(REGISTRY_TIMEOUT_MS) })
+    if (response.ok) return VERSION_AVAILABILITY.available
+    return response.status === NOT_FOUND ? VERSION_AVAILABILITY.missing : VERSION_AVAILABILITY.unknown
+  } catch {
+    return VERSION_AVAILABILITY.unknown
+  }
+}
+
 const adaptersFor = async (): Promise<UpdateAdapters> => {
   const { version, packageRoot } = await locateKit()
   const home = homedir()
@@ -44,6 +59,8 @@ const adaptersFor = async (): Promise<UpdateAdapters> => {
     installedVersion: version,
     manager: detectPackageManager(realRoot),
     latestVersion: defaultUpdateCheck().latestVersion,
+    versionAvailability: registryAvailability,
+    sleep: (ms) => Bun.sleep(ms),
     installedVersionOnDisk: () => readInstalledVersion(targetRoot),
     kitCli: [process.execPath, join(targetRoot, 'src', 'cli.ts')],
     run: runInherited,

package/src/update/registry-wait.ts

@@ -0,0 +1,44 @@
+/** What the registry says about one exact version; `unknown` when it did not answer, which never blocks an install. */
+export const VERSION_AVAILABILITY = { available: 'available', missing: 'missing', unknown: 'unknown' } as const
+
+export type VersionAvailability = (typeof VERSION_AVAILABILITY)[keyof typeof VERSION_AVAILABILITY]
+
+/** How long `jh update` waits for a version the registry has not distributed yet. */
+export type RetryPolicy = {
+  /** Probes after the first one; the number of waits. */
+  retries: number
+  firstDelayMs: number
+  factor: number
+  maxDelayMs: number
+}
+
+export type WaitOutcome = { settled: VersionAvailability; waitedMs: number }
+
+/** About a minute and a half in total: a fresh publish reaches the registry's mirrors well within it. */
+export const DISTRIBUTION_WAIT: RetryPolicy = { retries: 6, firstDelayMs: 2_000, factor: 2, maxDelayMs: 30_000 }
+
+/** The waits between the probes, growing by `factor` and capped at `maxDelayMs`; empty for no retries. */
+export const retryDelays = (policy: RetryPolicy): number[] =>
+  Array.from({ length: Math.max(0, policy.retries) }, (_, index) =>
+    Math.min(policy.maxDelayMs, Math.round(policy.firstDelayMs * policy.factor ** index)),
+  )
+
+/**
+ * Probes until the registry stops answering `missing`, sleeping the policy's delays in between; the sleep is an
+ * argument, so a test runs it without time passing. Settles on `available`, on `unknown` (the install decides),
+ * or on `missing` once the delays are used up: a version that never appears waits `sum(delays)` and no longer.
+ */
+export const waitForAvailability = async (
+  probe: () => Promise<VersionAvailability>,
+  sleep: (ms: number) => Promise<void>,
+  policy: RetryPolicy,
+): Promise<WaitOutcome> => {
+  let waitedMs = 0
+  for (const delay of retryDelays(policy)) {
+    const settled = await probe()
+    if (settled !== VERSION_AVAILABILITY.missing) return { settled, waitedMs }
+    await sleep(delay)
+    waitedMs += delay
+  }
+  return { settled: await probe(), waitedMs }
+}

package/src/update/update.ts

@@ -1,5 +1,6 @@
 import { CLI_NAME, isNewerVersion, isRelease, PACKAGE_NAME } from '../version/release'
 import { installCommand, LEGACY_PACKAGE_NAME, type PackageManager, removeCommand } from './package-manager'
+import { DISTRIBUTION_WAIT, VERSION_AVAILABILITY, type VersionAvailability, waitForAvailability } from './registry-wait'
 
 export const UPDATE_EXIT = { ok: 0, error: 1 } as const
 
@@ -9,6 +10,10 @@ export type UpdateAdapters = {
   /** The manager that installed the kit globally, or null when it is not a global install. */
   manager: PackageManager | null
   latestVersion: () => Promise<string | null>
+  /** Asks the registry whether this exact version can be installed yet; `unknown` when it did not answer. */
+  versionAvailability: (version: string) => Promise<VersionAvailability>
+  /** Waits `ms` milliseconds; a test passes one that returns at once. */
+  sleep: (ms: number) => Promise<void>
   /** The version in the package on disk now, after the install; null when it cannot be read. */
   installedVersionOnDisk: () => string | null
   /** The words that start this very package's CLI (runtime, then `src/cli.ts`), so a sync runs the code just installed and no `jh` found on the path. */
@@ -81,6 +86,23 @@ const installAndVerify = async (
   return UPDATE_EXIT.error
 }
 
+/**
+ * Waits while the registry answers 404 for `version`, which it does right after a publish until the release is
+ * distributed; false, with a line saying why, once the waits are used up and nothing was changed.
+ */
+const awaitDistribution = async (adapters: UpdateAdapters, version: string): Promise<boolean> => {
+  const { settled, waitedMs } = await waitForAvailability(
+    () => adapters.versionAvailability(version),
+    adapters.sleep,
+    DISTRIBUTION_WAIT,
+  )
+  if (settled !== VERSION_AVAILABILITY.missing) return true
+  adapters.log(
+    `${CLI_NAME} update: ${PACKAGE_NAME}@${version} is still not on the npm registry after ${Math.round(waitedMs / 1000)} seconds, so nothing was changed. Run \`${CLI_NAME} update\` again in a few minutes.`,
+  )
+  return false
+}
+
 /** Runs the syncs with the freshly installed code; the first that fails stops the rest and names its command. */
 const syncAfterInstall = async (adapters: UpdateAdapters, project: string | null): Promise<number> => {
   for (const { argv, cwd } of await syncSteps(adapters, project)) {
@@ -117,6 +139,7 @@ const updateToLatest = async (adapters: UpdateAdapters, manager: PackageManager)
     if (adapters.projectRoot && !installedProject(adapters)) logConfigShares(adapters, adapters.projectRoot)
     return UPDATE_EXIT.ok
   }
+  if (!(await awaitDistribution(adapters, latest))) return UPDATE_EXIT.error
   const installed = await installAndVerify(adapters, manager, latest)
   if (installed !== UPDATE_EXIT.ok) return installed
   const project = installedProject(adapters)

package/src/version/registry.ts

@@ -0,0 +1,8 @@
+import { PACKAGE_NAME } from './release'
+
+/** How long one question to the npm registry may take before it counts as unanswered. */
+export const REGISTRY_TIMEOUT_MS = 3_000
+
+/** The registry's document for a tag (`latest`) or for one exact version of this package. */
+export const registryUrl = (versionOrTag: string): string =>
+  `https://registry.npmjs.org/${PACKAGE_NAME}/${versionOrTag}`

package/src/watch/command.ts

@@ -56,6 +56,7 @@ import { ensurePlanPanes } from '../plans/ensure-panes'
 import { errorText } from '../plans/error-text'
 import { baseReaderOf, mainCheckout, worktreeNames, worktreeRoot } from '../plans/git'
 import { discoverLanes, isUnchanged, laneSetChange } from '../plans/lane-discovery'
+import { type PlacedLanes, placeLanes } from '../plans/lane-worktrees'
 import { readerOncePerRef } from '../plans/plan-heads'
 import { readQuestionRecords } from '../plans/questions-read'
 import { closeSentRecords, readSentRecords } from '../plans/sent-files-read'
@@ -172,6 +173,7 @@ import { branchOf, fetchBaseWhenMoved, fetchPlanHeadsWhenMoved, readMainCheckout
 import { type LaneStalledEvent, laneStalledEvents, STALLED_HEARTBEATS, type StallState } from './lane-stalled'
 import {
   advanceBaseline,
+  agentPlacesOf,
   armBaseline,
   baselineWithNewAgents,
   departedLanes,
@@ -179,6 +181,7 @@ import {
   type HerdrAgent,
   LANE_GONE,
   type LaneSnapshot,
+  misplacedLinesOf,
   NO_AGENT,
   toSnapshot,
 } from './lane-watch'
@@ -301,6 +304,7 @@ type Watch = {
   boardNotice: string | null
   options: WatchOptions
   files: Files
+  /** Set at the start and again at every poll, once the lanes are placed by where their agents run (`placeLanes`). */
   settings: PlansSettings
   /** `watch.deploy`, `feedback`, `previews` and `checks` as read at the start; the loop reads them from `Watching.live`. */
   live: LiveValues
@@ -343,6 +347,8 @@ type Watching = {
   sprintLanes: string[]
   /** Lanes that left the set with their agent since the last poll; they fire as gone once. */
   departed: string[]
+  /** The `lane <name> not watched` lines of the last poll; only a new one is printed. */
+  misplaced: string[]
   /** When the last report or heartbeat was printed, the start before the first. */
   quietSince: number
   state: WatchState
@@ -1155,13 +1161,29 @@ const readSprintLanes = (watch: Watch): SprintLane[] | null => {
 const sprintLaneNames = (watch: Watch, previous: string[]): string[] =>
   readSprintLanes(watch)?.map((lane) => lane.name) ?? previous
 
-const lanesFor = (watch: Watch, agents: readonly HerdrAgent[], sprintLanes: readonly string[]): string[] =>
-  watch.options.lanes ??
-  discoverLanes({
-    worktrees: worktreeNames(join(watch.root, watch.settings.worktreeDirectory)),
-    agentNames: agentNamesOf(agents),
-    sprintLanes,
+/** Places the lanes by where their agents run (`placeLanes`), named lanes included; the caller takes up `settings` into `watch.settings`. */
+const placeLanesOf = (watch: Watch, agents: readonly HerdrAgent[], sprintLanes: readonly string[]): PlacedLanes =>
+  placeLanes(watch.root, watch.settings, agentPlacesOf(agents), [...sprintLanes, ...(watch.options.lanes ?? [])])
+
+const lanesFor = (
+  watch: Watch,
+  agents: readonly HerdrAgent[],
+  sprintLanes: readonly string[],
+  worktrees: readonly string[],
+): string[] => watch.options.lanes ?? discoverLanes({ worktrees, agentNames: agentNamesOf(agents), sprintLanes })
+
+/** Prints the `lane <name> not watched` lines that are new since the last poll; named lanes are never discovered, so they have none. */
+const reportMisplaced = (watch: Watch, watching: Watching) => {
+  if (watch.options.lanes !== null) return
+  const lines = misplacedLinesOf(watching.agents, {
+    sprintLanes: watching.sprintLanes,
+    watched: watching.lanes,
+    worktreeDirectory: join(watch.root, watch.settings.worktreeDirectory),
   })
+  const fresh = laneSetChange(watching.misplaced, lines).added
+  if (fresh.length > 0) console.log(annotateEach(fresh, hintFor(watch, REFERENCE.laneSession)).join('\n'))
+  watching.misplaced = lines
+}
 
 /** Brings back missing herd panes beside the coordinator and the board's lanes when `trigger` calls for it; only inside herdr. */
 const keepViews = (watch: Watch, watching: Watching, trigger: EnsureTrigger) => {
@@ -1187,7 +1209,9 @@ const keepBackendPane = async (watch: Watch, watching: Watching) => {
 const followLaneSet = (watch: Watch, watching: Watching): string[] => {
   if (watch.options.lanes !== null) return []
   watching.sprintLanes = sprintLaneNames(watch, watching.sprintLanes)
-  const lanes = lanesFor(watch, watching.agents, watching.sprintLanes)
+  const placed = placeLanesOf(watch, watching.agents, watching.sprintLanes)
+  watch.settings = placed.settings
+  const lanes = lanesFor(watch, watching.agents, watching.sprintLanes, placed.worktrees)
   const change = laneSetChange(watching.lanes, lanes)
   if (isUnchanged(change)) return []
   watching.departed = [...watching.departed, ...departedLanes(change.removed, watching.baseline, watching.current)]
@@ -1216,6 +1240,7 @@ const pollLanes = (watch: Watch, watching: Watching) => {
   const previous = watching.current
   if (!readAgents(watching)) return
   const added = followLaneSet(watch, watching)
+  reportMisplaced(watch, watching)
   const withNewAgent = lanesWithNewAgent(previous, watching.current, watching.lanes)
   keepViews(watch, watching, { kind: ENSURE_TRIGGER.poll, added, withNewAgent })
   watching.baseline = baselineWithNewAgents(watching.baseline, watching.current)
@@ -1316,6 +1341,7 @@ const noTaskSignalEventsOf = (
     const signalled = signalledLanes(watching.lanes, {
       root: watch.root,
       worktreeDirectory: watch.settings.worktreeDirectory,
+      laneWorktrees: watch.settings.laneWorktrees,
       now,
     })
     const counts = currentPhaseCountsOf(progress)
@@ -1383,23 +1409,25 @@ const waitingObsoleteEventsOf = (
   if (!watch.inMainCheckout) return []
   try {
     const worktreeDirectory = join(watch.root, watch.settings.worktreeDirectory)
+    const { laneWorktrees } = watch.settings
     if (!existsSync(worktreeDirectory)) return []
     const sends = readSentRecords(watch.root)
     const questions = readQuestionRecords(watch.root)
     const boardText = readBoardText(watch)
     const board = boardText === null ? null : openWaitingItems(boardText, watch.settings.boardLanguage)
     const { missing, gone } = laneAbsenceOf(
-      waitingLanesOf({ sends, questions, board, worktreeDirectory }),
-      new Set(worktreeNames(worktreeDirectory)),
+      waitingLanesOf({ sends, questions, board, worktreeDirectory, laneWorktrees }),
+      new Set([...worktreeNames(worktreeDirectory), ...Object.keys(laneWorktrees)]),
       watching.waitingMissingLanes,
     )
-    const closings = closeObsoleteSends(watch.root, obsoleteSendsOf(sends, worktreeDirectory, gone), now)
+    const closings = closeObsoleteSends(watch.root, obsoleteSendsOf(sends, worktreeDirectory, gone, laneWorktrees), now)
     const closed = new Set(closings.map(({ id }) => id))
     const { events, state } = obsoleteProposalEvents(watching.waitingProposals, {
       sends: sends.filter(({ id }) => !closed.has(id)),
       questions,
       board,
       worktreeDirectory,
+      laneWorktrees,
       gone,
       ...proposalContextOf(watching),
     })
@@ -1460,10 +1488,10 @@ const subagentCountsOf = (watch: Watch, now: number): Record<string, number> =>
   try {
     const worktreeDirectory = join(watch.root, watch.settings.worktreeDirectory)
     const running = readRunningSubagents(
-      subagentSourceOf(watch.root, worktreeDirectory, watch.settings.skillPrefix),
+      subagentSourceOf(watch.root, worktreeDirectory, watch.settings.skillPrefix, watch.settings.laneWorktrees),
       now,
     )
-    return runningSubagentCountsOf(running, worktreeDirectory)
+    return runningSubagentCountsOf(running, worktreeDirectory, watch.settings.laneWorktrees)
   } catch {
     return {}
   }
@@ -1649,6 +1677,7 @@ const initialWatching = (
   lanes: start.lanes,
   sprintLanes: start.sprintLanes,
   departed: [],
+  misplaced: [],
   quietSince: Date.now(),
   state: start.state,
   baseline: armBaseline(start.armed, start.state.seenSeqs),
@@ -1701,7 +1730,9 @@ const watchLanes = async (watch: Watch): Promise<boolean> => {
   const state = await readState(watch.files)
   const agents = listAgents()
   const sprintLanes = watch.options.lanes ? [] : sprintLaneNames(watch, [])
-  const lanes = lanesFor(watch, agents, sprintLanes)
+  const placed = placeLanesOf(watch, agents, sprintLanes)
+  watch.settings = placed.settings
+  const lanes = lanesFor(watch, agents, sprintLanes, placed.worktrees)
   const armed = toSnapshot(agents, lanes)
   const arm = armNotice(state.armed, lanes, armed, takeOver, relative(watch.root, watch.sprintFile))
   if (arm.line !== null)
@@ -1709,6 +1740,7 @@ const watchLanes = async (watch: Watch): Promise<boolean> => {
   if (watch.boardNotice) console.log(watch.boardNotice)
 
   const watching = initialWatching(watch, { lanes, sprintLanes, state: { ...state, armed: arm.state }, armed, agents })
+  reportMisplaced(watch, watching)
   keepViews(watch, watching, { kind: ENSURE_TRIGGER.start })
   await keepBackendPane(watch, watching)
   const resumeRecord = keepRecord(
@@ -1723,6 +1755,7 @@ const watchLanes = async (watch: Watch): Promise<boolean> => {
       process.env.HERDR_PANE_ID,
     ),
     laneModels: laneModelColumnsOf(watching.laneModelReadings),
+    laneWorktrees: { ...watch.settings.laneWorktrees },
   })
   resumeRecord.follow(armed, Date.now(), observed())
   process.on('SIGTERM', () => {

package/src/watch/lane-watch.ts

@@ -1,3 +1,4 @@
+import { type AgentPlace, type MisplacementSources, misplacedLaneLines, misplacedLanes } from '../plans/lane-discovery'
 import { AGENT_STATUS } from '../terminal/types'
 
 export type HerdrAgent = {
@@ -6,6 +7,8 @@ export type HerdrAgent = {
   agent_status: string
   agent_session?: unknown
   state_change_seq?: number
+  /** The directory the agent runs in; herdr's own field, read as a string only where it is one. */
+  cwd?: unknown
 }
 
 /** The state a report gives a lane whose agent left the herdr listing. */
@@ -31,6 +34,16 @@ export const toSnapshot = (agents: readonly HerdrAgent[], lanes: readonly string
       .map((agent) => [agent.name, { status: agent.agent_status, seq: agent.state_change_seq ?? null }]),
   )
 
+/** The named agents with the directory each runs in; a `cwd` that is no string reads as none. */
+export const agentPlacesOf = (agents: readonly HerdrAgent[]): AgentPlace[] =>
+  agents.flatMap(({ name, cwd }) => (name ? [{ name, cwd: typeof cwd === 'string' ? cwd : null }] : []))
+
+/** The `lane <name> not watched` lines of a `herdr agent list` answer (`misplacedLanes`). */
+export const misplacedLinesOf = (
+  agents: readonly HerdrAgent[],
+  sources: Omit<MisplacementSources, 'agents'>,
+): string[] => misplacedLaneLines(misplacedLanes({ ...sources, agents: agentPlacesOf(agents) }))
+
 const isHerdrAgent = (value: unknown): value is HerdrAgent => {
   if (typeof value !== 'object' || value === null) return false
   const candidate = value as Record<string, unknown>

package/src/watch/obsolete-proposals.ts

@@ -4,7 +4,7 @@ import type { WaitingItem } from '../plan-format/waiting'
 import { CLOSE_REASON, closeReasonOf } from '../plans/close-reason'
 import { type QuestionRecord, questionTextOf } from '../plans/question-records'
 import { type SentFileRecord, sentLaneOf, sentTextOf } from '../plans/sent-files'
-import { laneDirectoryOf } from '../plans/unlisted-lanes'
+import { type LaneWorktrees, laneOfCwd } from '../plans/unlisted-lanes'
 import { isRecord } from '../shared/is-record'
 import { PLAN_LANGUAGE, type PlanLanguage } from '../vocabulary'
 import { latestPullRequestOf, PULL_REQUEST_STATE, type WatchedPullRequest } from './pull-requests'
@@ -33,6 +33,8 @@ export type ProposalInput = {
   /** Lane → branch, as the watcher keeps it after a lane was closed. */
   laneBranches: Readonly<Record<string, string>>
   worktreeDirectory: string
+  /** The lanes placed in worktrees of another name (`PlansSettings.laneWorktrees`). */
+  laneWorktrees?: LaneWorktrees
   /** The lanes whose directory was missing in two heartbeats in a row (`laneAbsenceOf`). */
   gone: ReadonlySet<string>
   /** The lanes known to have existed; a board row naming a lane that never had a worktree proposes nothing. */
@@ -64,13 +66,13 @@ export const textReferencesOf = (text: string): TextReferences => ({
 
 /** The lanes the open points name: a send's lane, a question's lane by its directory, a board row's lanes in its text. */
 export const waitingLanesOf = (
-  input: Pick<ProposalInput, 'sends' | 'questions' | 'board' | 'worktreeDirectory'>,
+  input: Pick<ProposalInput, 'sends' | 'questions' | 'board' | 'worktreeDirectory' | 'laneWorktrees'>,
 ): string[] => [
   ...input.sends.flatMap((record) =>
-    record.closedAt === null ? (sentLaneOf(record, input.worktreeDirectory) ?? []) : [],
+    record.closedAt === null ? (sentLaneOf(record, input.worktreeDirectory, input.laneWorktrees) ?? []) : [],
   ),
   ...input.questions.flatMap((record) =>
-    record.closedAt === null ? (laneDirectoryOf(record.cwd, input.worktreeDirectory) ?? []) : [],
+    record.closedAt === null ? (laneOfCwd(record.cwd, input.worktreeDirectory, input.laneWorktrees) ?? []) : [],
   ),
   ...(input.board ?? []).flatMap((row) => textReferencesOf(rowText(row)).lanes),
 ]
@@ -87,7 +89,7 @@ const laneRemovedReason = (lane: string): string => closeReasonOf(CLOSE_REASON.l
 
 const sendProposals = (input: ProposalInput): Proposal[] =>
   input.sends.flatMap((record) => {
-    const lane = sentLaneOf(record, input.worktreeDirectory)
+    const lane = sentLaneOf(record, input.worktreeDirectory, input.laneWorktrees)
     const branch = lane === null ? undefined : input.laneBranches[lane]
     const pullRequest = branch === undefined ? null : latestPullRequestOf(input.pullRequests ?? [], branch)
     return record.closedAt === null && pullRequest !== null && hasEnded(pullRequest)
@@ -96,7 +98,7 @@ const sendProposals = (input: ProposalInput): Proposal[] =>
   })
 
 const questionReasons = (record: QuestionRecord, input: ProposalInput): string[] => {
-  const lane = laneDirectoryOf(record.cwd, input.worktreeDirectory)
+  const lane = laneOfCwd(record.cwd, input.worktreeDirectory, input.laneWorktrees)
   const superseded = record.supersededBy ? [`${SUPERSEDED}: ${record.supersededBy.question}`] : []
   const ended = typeof record.sessionEndedAt === 'number' ? [SESSION_ENDED] : []
   return [...superseded, ...ended, ...(lane !== null && input.gone.has(lane) ? [laneRemovedReason(lane)] : [])]

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)))