@yusukeshib/pi-babysit 0.2.1 → 0.2.3

package/index.ts

@@ -1197,6 +1197,8 @@ export default function (pi: ExtensionAPI) {
 		label: "Babysit: run",
 		description:
 			"Start a supervised background session under babysit (NON-BLOCKING; returns a session id). " +
+			"In non-interactive mode (`pi -p`, no UI) process mode instead BLOCKS until the command " +
+			"exits and returns its output inline — there is no notification loop to resume a parked turn. " +
 			"Two modes: (1) `command` — run any long-lived or slow command (build, tests, dev server, " +
 			"watcher, interactive TUI) in a PTY; you get an AUTOMATIC notification when it exits, and " +
 			"you can type into it with babysit_send and read its screen with babysit_check. " +
@@ -1207,7 +1209,7 @@ export default function (pi: ExtensionAPI) {
 			"Run a command or a pi subagent as a supervised background session (non-blocking); returns a session id",
 		promptGuidelines: [
 			"Run every long-lived or slow command through babysit_run instead of bash: builds, test suites, dev servers, watchers, `tail -f`, anything expected to take more than a few seconds. Give it a clear stable `name` (e.g. cargo-build).",
-			"babysit_run { command } ENDS YOUR TURN by default — you are resumed by the automatic process-end notification, so just stop; NEVER poll with babysit_check or sleep. Set continueAfterStart: true only when you have immediate, specific, non-polling work to do next. Call babysit_wait when you must consume the result inside the current turn (optionally with `expect` to wait for a readiness line like 'listening on').",
+			"After babysit_run { command } starts a process, end your response immediately so the automatic process-end notification can resume you; NEVER poll with babysit_check or sleep. Set continueAfterStart: true only when you have immediate, specific, non-polling work to do next. Call babysit_wait when you must consume the result inside the current turn (optionally with `expect` to wait for a readiness line like 'listening on').",
 			"babysit_run gives full PTY control: drive interactive programs (installers, wizards, REPLs) with babysit_send (text or named keys) and read the rendered screen with babysit_check { screen: true }.",
 			"Delegate self-contained tasks (codebase recon, a parallelizable subtask, work that would pollute your context) with babysit_run { profile: \"subagent\", task }. Launch several for independent subtasks; they run concurrently.",
 			"After spawning subagents, do not idle-wait and do not end your turn to wait for them: keep making progress, then call babysit_wait (ids + mode any/all) when you need their results. Steer or send follow-up tasks with babysit_send; kill runaways with babysit_kill.",
@@ -1311,6 +1313,23 @@ export default function (pi: ExtensionAPI) {
 					};
 				}
 				await refreshWidget(ctx);
+
+				// One-shot / non-interactive mode (e.g. `pi -p`): there is no live
+				// event loop to deliver the exit notification, and ending the turn
+				// would exit pi entirely — orphaning the babysat process and losing
+				// the session (the agent "settles" the moment it is told the turn will
+				// stop). So block inline like a normal command and return the full
+				// outcome in THIS turn. The process still runs under babysit (logged,
+				// killable), we just wait for it here instead of fire-and-forget.
+				if (!ctx.hasUI) {
+					const outcome = await waitForExit(res.id, parseDurMs(params.timeout), _signal);
+					return {
+						content: [{ type: "text", text: outcome.text }],
+						isError: !outcome.ok,
+						details: { id: res.id, kind: "process", command: params.command },
+					};
+				}
+
 				const continueAfter = params.continueAfterStart === true;
 				const nextStep = continueAfter
 					? "Continue with specific non-polling work now; the exit notification will arrive on its own."
@@ -1327,11 +1346,13 @@ export default function (pi: ExtensionAPI) {
 						},
 					],
 					details: { id: res.id, kind: "process", command: params.command },
-					// Same contract as the old `process` tool: end the turn so the
-					// exit notification can resume the agent. This also makes the
-					// parked-turn rule deterministic — the toolResult (with
-					// NOTIFY_MARKER) is guaranteed to be the turn's LAST message.
-					terminate: !continueAfter,
+					// Do not return `terminate: true` here. In RPC/subagent hosts that hint
+					// can shut down the hosting pi worker, whose process-tree cleanup then
+					// kills the otherwise detached babysit supervisor and closes its PTY
+					// (observed as an immediate `^D`). The prompt contract tells the model
+					// to stop after this result instead; the NOTIFY_MARKER still identifies
+					// a parked turn to the parent/self-reaper logic.
+					terminate: false,
 				};
 			}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yusukeshib/pi-babysit",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Run anything long-lived under babysit — one supervision substrate for processes and pi subagents, surfaced to the agent as babysit_run/check/send/wait/kill.",
   "keywords": [
     "pi-package",