omp-conductor 0.15.2 → 0.15.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omp-conductor",
-  "version": "0.15.2",
+  "version": "0.15.3",
   "type": "module",
   "license": "MIT",
   "description": "A 24/7 dispatcher that takes ready GitHub issues to green, mergeable PRs using omp coding sessions, with tiered escalation first to an orchestrator session and then to a human.",

package/src/setup-host.ts

@@ -314,21 +314,49 @@ function tickSearchRoots(project: ProjectConfig): string[] {
  * have been a deliberate per-project choice — it *is* the collision — so it is
  * rewritten; anything else is operator intent and survives untouched.
  */
-function planTick(project: ProjectConfig, telegramStateDir: string): PlannedWrite<TickConfig> {
-  let existing: { path: string; config: TickConfig } | undefined;
+/**
+ * This project's tick config, wherever it actually lives. A config stamped for
+ * another project is that project's file: the search roots overlap, and
+ * restamping it here would hand this project's identity to the other fleet's cwd.
+ */
+function findProjectTick(
+  project: ProjectConfig,
+): { root: string; path: string; config: TickConfig } | undefined {
   for (const root of tickSearchRoots(project)) {
     const result = readTickConfig(root);
     if (result.kind === "invalid") {
       throw new Error(`tick config invalid at ${result.path}: ${result.problem}; fix or remove it before setup`);
     }
-    // A config stamped for another project is that project's file: the search
-    // roots overlap, and restamping it here would hand this project's identity
-    // to the other fleet's cwd.
     if (result.kind === "ok" && tickConfigMatchesProject(result.config, project.name)) {
-      existing = { path: result.path, config: result.config };
-      break;
+      return { root, path: result.path, config: result.config };
     }
   }
+  return undefined;
+}
+
+/**
+ * The directory this project's fleet pane runs in, which is **not** always
+ * `workspaceRoot`.
+ *
+ * A fleet that predates per-project roots keeps its `.conductor-tick.json` in the
+ * state dir, and that is the cwd its pane and `FLEET_CWD` already point at. Naming
+ * `workspaceRoot` instead sends `recover.sh` somewhere with no tick config, where
+ * `tick_agent_name` falls back to `fleet` and no longer matches the renamed pane —
+ * silently costing a live project its recovery. Falls back to `workspaceRoot`,
+ * which is where a brand-new project's config is written.
+ */
+export function tickCwdForProject(project: ProjectConfig): string {
+  try {
+    return findProjectTick(project)?.root ?? project.workspaceRoot;
+  } catch {
+    // An invalid config is setup's problem to report, not the handoff's.
+    return project.workspaceRoot;
+  }
+}
+
+function planTick(project: ProjectConfig, telegramStateDir: string): PlannedWrite<TickConfig> {
+  const found = findProjectTick(project);
+  const existing = found === undefined ? undefined : { path: found.path, config: found.config };
 
   const armedFile = join(stateDir(), `armed-${project.name}`);
   const path = existing?.path ?? join(project.workspaceRoot, TICK_CONFIG_FILE);

package/src/setup-wizard.ts

@@ -37,6 +37,7 @@ import {
   totalConfiguredWorkers,
   runSetupSmoke,
   SYSTEMD_UNIT_DIR,
+  tickCwdForProject,
   writeHostRuntime,
 } from "./setup-host.ts";
 import { runGraphInstall, runHostInstall } from "./setup-install.ts";
@@ -1639,18 +1640,22 @@ export async function collectSetup(
  */
 export function formatHerdrHandoff(project: ProjectConfig, cfg: ConductorConfig): string {
   const session = process.env["HERDR_SESSION"] ?? "conductor";
-  const cwds = cfg.projects.map((p) => p.workspaceRoot).join(":");
+  // Every entry is the cwd that owns that project's tick config — the directory its
+  // pane runs in — not `workspaceRoot`. They differ on any fleet whose config
+  // predates per-project roots, and recovery keys on the tick config.
+  const paneCwd = tickCwdForProject(project);
+  const cwds = cfg.projects.map((p) => tickCwdForProject(p)).join(":");
   return [
     "herdr handoff (CLI cannot do these — exact herdr argv):",
-    `  1. In session "${session}", create a workspace for project "${project.name}" at its workspaceRoot:`,
-    `       herdr --session ${session} workspace create --cwd ${project.workspaceRoot} --label ${project.name} --no-focus`,
+    `  1. In session "${session}", create a workspace for project "${project.name}" at its fleet cwd:`,
+    `       herdr --session ${session} workspace create --cwd ${paneCwd} --label ${project.name} --no-focus`,
     "     Read root_pane.pane_id from the JSON reply (jq -r '((.result // .).root_pane.pane_id) // empty').",
     `  2. Start omp in that empty pane. The agent NAME must match tick config agentName ("${project.name}"):`,
     `       herdr --session ${session} agent start ${project.name} --kind omp --pane <pane-id>`,
     "     The pane must be at a shell prompt with no agent on it. Never agent-start into a live orchestrator pane.",
     `  3. Point herdr-conductor recovery at every fleet cwd (colon-separated; see #320):`,
     `       FLEET_CWDS=${cwds}`,
-    `     Legacy single-fleet hosts can keep FLEET_CWD=${project.workspaceRoot} until multi-fleet recovery lands.`,
+    `     Legacy single-fleet hosts can keep FLEET_CWD=${paneCwd} until multi-fleet recovery lands.`,
     "  4. Reload the daemon so it serves every configured project:",
     "       omp-conductor restart --now",
     "     (printed, not auto-run, when workers are live or a neighbour was just added)",