@giladbarnea/pi-user-agents 0.0.9 → 0.0.11

package/INTERNALS.md

@@ -113,7 +113,7 @@ Type `/agent -` and the option menu opens immediately — no Tab is required. Sh
 
 The finite value menus are thinking levels, live providers, live models, and the session's live tool catalog. Models from the configured `enabledModels` scope lead the unfiltered model menu; once you type a query, Pi's fuzzy relevance controls the order and scope only breaks equal-score ties. `--provider` narrows the model menu for either `-m` or `--model`. A completed boolean, thinking level, provider, or model leaves exactly one trailing space.
 
-`--tools`/`-t` and `--exclude-tools`/`-xt` complete one comma-delimited segment at a time. Accepting `grep` produces `--tools grep│` — the menu closes without inserting a space or comma. Type `,` to open the next segment immediately; already selected tools are omitted. Type a normal space when the tool list is finished.
+`--tools`/`-t` and `--exclude-tools`/`-xt` complete one comma-delimited segment at a time. Accepting `grep` produces `--tools grep│` — the menu closes without inserting a space or comma. Type `,` to open the next segment immediately; already selected tools are omitted. Type a normal space when the tool list is finished. In `--tools`, a `+name`/`-name` entry keeps its sign: `+gr` completes to `+grep`.
 
 Free-form values are guarded instead of guessed. Selecting `--system-prompt` produces `/agent --system-prompt "│" `, with the cursor between the quotes and the trailing separator already preserved.
 

package/PARSER_SPEC.md

@@ -205,7 +205,8 @@ The finite value domains implemented today are:
 - tool names from the live public `pi.getAllTools()` catalog for `--tools`/`-t` and
   `--exclude-tools`/`-xt`.
 
-Tool completion is local to the active comma-delimited segment. Accepting a tool replaces only
+Tool completion is local to the active comma-delimited segment. In `--tools`, a leading `+` or
+`-` stays in place and completion replaces only the name after it. Accepting a tool replaces only
 that segment and closes the menu without adding a space or comma. Typing `,` immediately opens
 the next segment and excludes every tool already selected elsewhere in the value. The user
 types a normal space to finish the complete tool list. Other non-path value options remain
@@ -247,8 +248,9 @@ source spans:
 - `value` — the value consumed by a leading value-taking option. A quoted value's span
   includes its surrounding quotes;
 - `invalid-value` — a leading closed-set value rejected by the same validation used at
-  submission and session creation: Pi's argument parser for thinking levels, exact live model
-  IDs or user-defined aliases, and the live provider and tool catalogs;
+  submission and session creation: Pi's argument parser for thinking levels and tool-list
+  syntax (`+name`/`-name` entries cannot mix with plain names), exact live model IDs or
+  user-defined aliases, and the live provider and tool catalogs;
 - `blocked` — a blocked option in args mode, plus the value a blocked value-taking option
   would consume (`--theme ./theme.json` yields two `blocked` tokens). Unlike
   `parseAgentCommand`, the scan never throws: it records the first blocked token and keeps

package/autocomplete.ts

@@ -322,13 +322,20 @@ function getToolSegment(
 ): ToolSegment {
 	const value = line.slice(expectation.replacementStart, expectation.replacementEnd);
 	const cursorOffset = cursorCol - expectation.replacementStart;
-	const segmentStart = value.lastIndexOf(",", cursorOffset - 1) + 1;
+	const commaEnd = value.lastIndexOf(",", cursorOffset - 1) + 1;
+	// Pi's --tools takes +name/-name entries; completion replaces only the name after the sign.
+	const signLength =
+		expectation.option.semanticId === "tools" && /^[+-]/.test(value.slice(commaEnd, cursorOffset))
+			? 1
+			: 0;
+	const segmentStart = commaEnd + signLength;
 	const nextComma = value.indexOf(",", cursorOffset);
 	const segmentEnd = nextComma === -1 ? value.length : nextComma;
 	const selectedNames = new Set(
 		value
 			.split(",")
-			.filter((_name, index) => index !== value.slice(0, segmentStart).split(",").length - 1),
+			.filter((_name, index) => index !== value.slice(0, commaEnd).split(",").length - 1)
+			.map((name) => name.replace(/^[+-]/, "")),
 	);
 	return {
 		fragment: value.slice(segmentStart, cursorOffset),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@giladbarnea/pi-user-agents",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "Run, view, and control background Pi agents.",
   "keywords": [
     "pi-package",
@@ -33,7 +33,7 @@
     "test": "bun test"
   },
   "peerDependencies": {
-    "@earendil-works/pi-coding-agent": "*",
+    "@earendil-works/pi-coding-agent": ">=1.1.0",
     "@earendil-works/pi-tui": "*"
   },
   "publishConfig": {
@@ -45,7 +45,8 @@
     ]
   },
   "devDependencies": {
-    "@earendil-works/pi-coding-agent": "0.85.1",
+    "@earendil-works/pi-ai": "1.1.0",
+    "@earendil-works/pi-coding-agent": "1.1.0",
     "@earendil-works/pi-tui": "0.85.1"
   }
 }

package/runner.ts

@@ -422,7 +422,12 @@ export function createAgentValueValidator(
 		}
 		if (option.completionDomain === "tool") {
 			const parsed = parseArgs([option.names[0]!, value]);
-			const requestedNames = option.semanticId === "tools" ? parsed.tools : parsed.excludeTools;
+			if (parsed.diagnostics.some((diagnostic) => diagnostic.type === "error")) return false;
+			// A --tools list of +name/-name entries names its tools after the sign.
+			const requestedNames =
+				option.semanticId === "tools"
+					? parsed.tools?.map((entry) => entry.replace(/^[+-]/, ""))
+					: parsed.excludeTools;
 			const knownNames = new Set(getToolNames());
 			return (requestedNames ?? []).every((name) => knownNames.has(name));
 		}
@@ -625,7 +630,9 @@ export async function runChildTurns(
 ): Promise<void> {
 	let instruction = initialInstruction;
 	while (true) {
+		if (runningAgent.aborted) return;
 		const turnMessageStart = session.agent.state.messages.length;
+		runningAgent.runAborted = false;
 		if (!runningAgent.interruptRequested) {
 			logSteering(runningAgent.id, "turn-prompt-started", {
 				streaming: session.isStreaming,
@@ -633,8 +640,13 @@ export async function runChildTurns(
 			});
 			await session.prompt(instruction);
 		}
-		if (runningAgent.interruptRequested) {
-			const response = interruptedTurnResponse(session, turnMessageStart);
+		if (runningAgent.aborted) return;
+		if (runningAgent.interruptRequested || runningAgent.runAborted) {
+			const response = interruptedTurnResponse(
+				session,
+				turnMessageStart,
+				runningAgent.interruptRequested ? "Interrupted by user." : "Run cancelled.",
+			);
 			runningAgent.interruptRequested = false;
 			runningAgent.mainContextState = "separate";
 			runningAgent.status = "done-waiting-to-post";
@@ -693,14 +705,14 @@ export async function runChildTurns(
 	}
 }
 
-function interruptedTurnResponse(session: AgentSession, turnMessageStart: number): string {
+function interruptedTurnResponse(session: AgentSession, turnMessageStart: number, reason: string): string {
 	const assistantMessages = session.agent.state.messages
 		.slice(turnMessageStart)
 		.filter((message) => message.role === "assistant");
 	const lastAssistantMessage = assistantMessages.at(-1);
 	const partialResponse = lastAssistantMessage ? assistantText(lastAssistantMessage).trim() : "";
-	if (!partialResponse) return "Interrupted by user.";
-	return `Interrupted by user.\n\n${partialResponse}`;
+	if (!partialResponse) return reason;
+	return `${reason}\n\n${partialResponse}`;
 }
 
 async function createChildSession(
@@ -835,8 +847,10 @@ export function subscribeToChildSession(
 				streaming: session.isStreaming,
 				messageCount: event.messages.length,
 			});
-		if (event.type === "agent_settled")
-			logSteering(runningAgent.id, "child-agent-settled", { streaming: session.isStreaming });
+		if (event.type === "agent_settled") {
+			runningAgent.runAborted = event.aborted;
+			logSteering(runningAgent.id, "child-agent-settled", { streaming: session.isStreaming, aborted: event.aborted });
+		}
 		if (event.type === "turn_start")
 			logSteering(runningAgent.id, "turn-started", { streaming: session.isStreaming });
 		if (event.type === "turn_end")

package/shared.ts

@@ -144,6 +144,8 @@ export type RunningAgent = {
 	aborted?: boolean;
 	/** Set when the user interrupts only the active turn, leaving the child session alive. */
 	interruptRequested?: boolean;
+	/** Cancellation outcome of the current prompt, reported at session-level settlement. */
+	runAborted?: boolean;
 };
 
 export type CompletedAgent = {