taskplane 0.18.0 → 0.18.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dashboard/server.cjs +12 -2
- package/package.json +1 -1
package/dashboard/server.cjs
CHANGED
|
@@ -391,8 +391,18 @@ function loadTelemetryData(batchState) {
|
|
|
391
391
|
// Determine the key (tmux prefix)
|
|
392
392
|
let prefix;
|
|
393
393
|
if (parsed.role === "merger") {
|
|
394
|
-
// Merge agent —
|
|
395
|
-
|
|
394
|
+
// Merge agent — derive prefix from lane naming so it matches the tmux
|
|
395
|
+
// session name used by the client (e.g. "orch-henrylach-merge-1").
|
|
396
|
+
// Lane sessions: "orch-{opId}-lane-{N}" → merge sessions: "orch-{opId}-merge-{N}".
|
|
397
|
+
const firstLanePrefix = Object.values(laneToPrefix)[0]; // e.g. "orch-henrylach-lane-1"
|
|
398
|
+
const opPrefix = firstLanePrefix?.replace(/-lane-\d+$/, ""); // "orch-henrylach"
|
|
399
|
+
if (parsed.mergeNumber != null && opPrefix) {
|
|
400
|
+
prefix = `${opPrefix}-merge-${parsed.mergeNumber}`;
|
|
401
|
+
} else if (parsed.mergeNumber != null) {
|
|
402
|
+
prefix = `orch-merge-${parsed.mergeNumber}`;
|
|
403
|
+
} else {
|
|
404
|
+
prefix = "orch-merge";
|
|
405
|
+
}
|
|
396
406
|
} else if (parsed.laneNumber != null && laneToPrefix[parsed.laneNumber]) {
|
|
397
407
|
prefix = laneToPrefix[parsed.laneNumber];
|
|
398
408
|
} else if (parsed.laneNumber != null) {
|