neuvikon 0.2.19 → 0.2.21

package/README.md

@@ -57,7 +57,9 @@ npx neuvikon start --tickets EWWQ-1,EWWQ-2,EWWQ-3 --spawn
 
 If [Herdr](https://herdr.dev) is installed, every ticket in the batch lands as
 its own tab in one Herdr workspace instead of separate OS windows — Herdr's
-own UI then shows each agent's live working/blocked/done state. Otherwise it
+own UI then shows each agent's live working/blocked/done state. Run it from
+inside a Herdr-managed pane and the batch adds its tabs to that same
+workspace instead of opening a new one. Otherwise it
 opens one terminal per ticket the usual way (a tmux window if you're already
 in tmux, an iTerm2 or Terminal.app tab on macOS, a Windows Terminal tab on
 Windows), each `cd`'d into this directory. Either way, if a coding agent CLI

package/dist/index.mjs

@@ -560,16 +560,26 @@ async function postUsage(credentials, session, delta) {
 * Switching tickets used to stop the outgoing session bare, which dropped every
 * token it had earned since its last turn ended — and a ticket that was started
 * and left inside a single turn recorded exactly nothing.
+*
+* Returns whether the server actually confirmed the stop, so a caller can tell
+* the difference between "closed" and "we gave up trying to tell the server" —
+* a repeat `stop` for an already-stopped session is a safe no-op on the server
+* side, so it's fine for a caller to retry this on failure.
 */
 async function stopSession(credentials, session, transcript) {
 	const usage = pendingUsage(session, transcript);
-	await post(credentials.url, "/api/agent/events", {
-		token: credentials.token,
-		event: "stop",
-		sessionKey: session.sessionKey,
-		tokensIn: usage.tokensIn,
-		tokensOut: usage.tokensOut
-	}).catch(() => void 0);
+	try {
+		await post(credentials.url, "/api/agent/events", {
+			token: credentials.token,
+			event: "stop",
+			sessionKey: session.sessionKey,
+			tokensIn: usage.tokensIn,
+			tokensOut: usage.tokensOut
+		});
+		return true;
+	} catch {
+		return false;
+	}
 }
 /**
 * Called from an agent hook on every turn, so it is deliberately silent and
@@ -1303,9 +1313,14 @@ function agentName(ref) {
 * working/blocked/done state per agent — instead of scattered across OS
 * windows. The first successful ref seeds the workspace; every later ref in
 * the same batch adds a tab to it.
+*
+* Except when `--spawn` is itself run from inside a Herdr-managed pane
+* (`HERDR_WORKSPACE_ID` set, per Herdr's own caller-context injection): then
+* the batch reuses that workspace instead of creating a new one that yanks
+* focus away from wherever the user already was.
 */
 var HerdrBatch = class {
-	workspaceId = null;
+	workspaceId = process.env.HERDR_WORKSPACE_ID || null;
 	openPane(ref, cwd) {
 		if (!this.workspaceId) {
 			const created = runHerdr([
@@ -1334,15 +1349,16 @@ var HerdrBatch = class {
 		])?.result.root_pane.pane_id ?? null;
 	}
 	/**
-	* True once this ref has a live Herdr pane — even if starting an agent in
-	* it failed, in which case the pane still exists with the same
-	* print-and-wait fallback a plain spawned terminal gets. False only means
-	* Herdr itself couldn't be reached, and the caller should fall back to
-	* opening a native OS terminal for this ref instead.
+	* "agent" — a coding agent is live in its own Herdr pane with the ticket
+	* text confirmed delivered as its first prompt. "manual" — the pane exists
+	* (either as a plain shell with the ticket echoed, or a started agent whose
+	* prompt delivery couldn't be confirmed) but the user has to paste or type
+	* into it themselves. `null` only means Herdr itself couldn't be reached,
+	* and the caller should fall back to opening a native OS terminal instead.
 	*/
 	spawn(ref, cwd, agent, ticketText) {
 		const paneId = this.openPane(ref, cwd);
-		if (!paneId) return false;
+		if (!paneId) return null;
 		if (agent && ticketText) {
 			if (runHerdr([
 				"agent",
@@ -1352,15 +1368,17 @@ var HerdrBatch = class {
 				HERDR_KIND[agent.id],
 				"--pane",
 				paneId
-			])) {
-				runHerdr([
-					"agent",
-					"prompt",
-					agentName(ref),
-					ticketText
-				]);
-				return true;
-			}
+			])) return runHerdr([
+				"agent",
+				"prompt",
+				agentName(ref),
+				ticketText,
+				"--wait",
+				"--until",
+				"working",
+				"--timeout",
+				"8000"
+			]) ? "agent" : "manual";
 		}
 		runHerdr([
 			"pane",
@@ -1368,7 +1386,7 @@ var HerdrBatch = class {
 			paneId,
 			`echo 'Ticket: ${ref}' && echo 'Paste it into your agent, or run: npx neuvikon start --ticket ${ref}'`
 		]);
-		return true;
+		return "manual";
 	}
 };
 //#endregion
@@ -1549,8 +1567,13 @@ async function spawnMode(flags, credentials, refs) {
 	info(`Opening ${refs.length} terminal${refs.length === 1 ? "" : "s"}${herdr ? " in Herdr" : ` in ${cwd}`}...`);
 	for (const ref of refs) {
 		const ticketText = agent ? await fetchTicketText(credentials, ref) : null;
-		if (herdr?.spawn(ref, cwd, agent, ticketText)) {
-			success(`${bold(ref)} — ${agent && ticketText ? `${agent.label} starting in Herdr` : "opened in Herdr"}`);
+		const herdrOutcome = herdr?.spawn(ref, cwd, agent, ticketText);
+		if (herdrOutcome === "agent") {
+			success(`${bold(ref)} — ${agent.label} starting in Herdr`);
+			continue;
+		}
+		if (herdrOutcome === "manual") {
+			info(`${bold(ref)} — opened in Herdr, paste the ticket manually: ${dim(`npx neuvikon start --ticket ${ref}`)}`);
 			continue;
 		}
 		const launch = agent && ticketText ? {
@@ -1614,7 +1637,9 @@ async function start(flags, positional) {
 		}
 		throw error;
 	}
-	if (existing) await stopSession(credentials, existing, transcript);
+	if (existing) {
+		if (!await stopSession(credentials, existing, transcript)) warn(`Switched off ${existing.ticket} locally, but Neuvikon didn't confirm the stop — it may still show in progress.`);
+	}
 	writeSession({
 		sessionKey: result.sessionKey,
 		ticket: ref,
@@ -1650,7 +1675,15 @@ async function stop(flags) {
 		return;
 	}
 	const credentials = readCredentials();
-	if (credentials) await stopSession(credentials, session, flags.get("transcript") || claudeTranscriptPath());
+	if (!credentials) {
+		clearSession();
+		success(`Stopped tracking ${session.ticket}`);
+		return;
+	}
+	if (!await stopSession(credentials, session, flags.get("transcript") || claudeTranscriptPath())) {
+		warn(`Stopped tracking ${session.ticket} locally, but Neuvikon didn't confirm it — the ticket may still show in progress.`);
+		return;
+	}
 	clearSession();
 	success(`Stopped tracking ${session.ticket}`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neuvikon",
-  "version": "0.2.19",
+  "version": "0.2.21",
   "description": "Tell Neuvikon which ticket your coding agent is working on.",
   "keywords": [
     "neuvikon",