@dougbots/avenor-pi 0.4.0 → 0.4.1

package/dist/index.js

@@ -469,22 +469,44 @@ var RunInspectorOverlay = class {
 		return lines.map((line) => truncateToWidth(line, innerWidth));
 	}
 };
+function matchingWatchRuns(runs, selector) {
+	const query = selector.trim().toLowerCase();
+	if (!query) return [];
+	const byId = runs.find((run) => run.runId.toLowerCase() === query);
+	if (byId) return [byId];
+	return runs.filter((run) => run.label?.toLowerCase() === query || run.agent?.toLowerCase() === query);
+}
+function watchRunChoice(run) {
+	return `${sanitizeText(run.label ?? run.runId)}${run.agent ? ` · ${sanitizeText(run.agent)}` : ""} · ${sanitizeText(run.runId).slice(0, 8)}`;
+}
+async function selectWatchRun(ctx, runs) {
+	const choices = runs.map(watchRunChoice);
+	const selected = await ctx.ui.select("Watch run:", choices);
+	if (!selected) return void 0;
+	return runs.find((_run, index) => choices[index] === selected);
+}
 async function openRunInspector(ctx, options) {
 	if (!ctx.hasUI) {
 		ctx.ui.notify("avenor-watch requires TUI mode", "warning");
 		return;
 	}
-	let runId = options.initialRunId?.trim();
-	if (!runId) {
+	const selector = options.initialRunId?.trim();
+	let tracked;
+	let runId;
+	if (selector) {
+		const matches = matchingWatchRuns(options.trackedRuns, selector);
+		tracked = matches.length === 1 ? matches[0] : matches.length > 1 ? await selectWatchRun(ctx, matches) : void 0;
+		if (matches.length > 1 && !tracked) return;
+		runId = tracked?.runId ?? selector;
+	} else {
 		if (options.trackedRuns.length === 0) {
 			ctx.ui.notify("No tracked runs", "warning");
 			return;
 		}
-		const selected = await ctx.ui.select("Watch run:", options.trackedRuns.map((run) => run.runId));
-		if (!selected) return;
-		runId = selected;
+		tracked = await selectWatchRun(ctx, options.trackedRuns);
+		if (!tracked) return;
+		runId = tracked.runId;
 	}
-	const tracked = options.trackedRuns.find((run) => run.runId === runId);
 	await ctx.ui.custom((tui, theme, keybindings, done) => new RunInspectorOverlay(tui, theme, keybindings, options.deps, tracked ?? { runId }, () => done(), options.onTrackRun), {
 		overlay: true,
 		overlayOptions: {
@@ -497,6 +519,15 @@ async function openRunInspector(ctx, options) {
 }
 //#endregion
 //#region src/types.ts
+function findLiveStatusForTrackedRun(run, liveStatuses) {
+	const knownRunIds = new Set([run.runId, run.lastStatus?.run_id].filter((id) => !!id));
+	let runtimeMatch;
+	for (const status of liveStatuses) {
+		if (knownRunIds.has(status.run_id)) return status;
+		if (!run.supervisorId && run.runtimeId === status.runtime_id) runtimeMatch = status;
+	}
+	return runtimeMatch;
+}
 const TERMINAL_STATUSES = new Set([
 	"done",
 	"failed",
@@ -699,7 +730,7 @@ function createExtension(deps = defaultDeps) {
 			}
 			const entries = [];
 			for (const run of trackedRuns.values()) {
-				const live = liveMap.get(run.runId);
+				const live = findLiveStatusForTrackedRun(run, liveMap.values());
 				if (live) {
 					liveMap.delete(live.run_id);
 					run.lastStatus = live;
@@ -1422,11 +1453,11 @@ function createExtension(deps = defaultDeps) {
 			}
 		});
 		pi.registerCommand("avenor-watch", {
-			description: "Open a live run inspector for an avenor run",
+			description: "Open a live run inspector by run ID, label, or agent name",
 			getArgumentCompletions: (prefix) => {
-				const items = Array.from(trackedRuns.values()).filter((run) => run.label.startsWith(prefix) || run.runId.startsWith(prefix)).map((run) => ({
+				const items = Array.from(trackedRuns.values()).filter((run) => run.label.startsWith(prefix) || run.agent.startsWith(prefix) || run.runId.startsWith(prefix)).map((run) => ({
 					value: run.runId,
-					label: `${run.label} (${run.runId.slice(0, 8)})`
+					label: `${sanitizeText(run.label)} (${sanitizeText(run.agent)}, ${sanitizeText(run.runId).slice(0, 8)})`
 				}));
 				return items.length > 0 ? items : null;
 			},
@@ -1448,9 +1479,9 @@ function createExtension(deps = defaultDeps) {
 		pi.registerCommand("avenor-cancel", {
 			description: "Cancel a running avenor sub-agent",
 			getArgumentCompletions: (prefix) => {
-				const items = Array.from(trackedRuns.values()).filter((run) => run.label.startsWith(prefix) || run.runId.startsWith(prefix)).map((run) => ({
+				const items = Array.from(trackedRuns.values()).filter((run) => run.label.startsWith(prefix) || run.agent.startsWith(prefix) || run.runId.startsWith(prefix)).map((run) => ({
 					value: run.runId,
-					label: `${run.label} (${run.runId.slice(0, 8)})`
+					label: `${sanitizeText(run.label)} (${sanitizeText(run.agent)}, ${sanitizeText(run.runId).slice(0, 8)})`
 				}));
 				return items.length > 0 ? items : null;
 			},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dougbots/avenor-pi",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "type": "module",
   "keywords": [
     "pi-package"
@@ -35,7 +35,7 @@
     "dev": "tsdown --watch"
   },
   "dependencies": {
-    "@dougbots/avenor-core": "^0.4.0"
+    "@dougbots/avenor-core": "^0.4.1"
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "*",