@f5xc-salesdemos/xcsh 18.53.0 → 18.53.1

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## [Unreleased]
 
+## [18.53.0] - 2026-05-09
+
+### Fixed
+
+- Replaced `xcsh --version` recommendation in `renderAboutDoc()` with authoritative intrinsic version guidance — the previous guidance misdirected to the installed binary, not the running session ([#722](https://github.com/f5xc-salesdemos/xcsh/pull/722))
+- System prompt `xcsh://about` entry now routes version questions to the workstation header (zero tool calls) and reserves `xcsh://about` for deeper identity ([#722](https://github.com/f5xc-salesdemos/xcsh/pull/722))
+
+### Added
+
+- SE specialization block in `renderAboutDoc()` capabilities section: F5 XC API, Salesforce pipeline, user/computer profiling, SE-specific subagents ([#722](https://github.com/f5xc-salesdemos/xcsh/pull/722))
+- SE capability skills: account-planning, competitive, meeting-prep, roi-calculator, validation-plan ([#715](https://github.com/f5xc-salesdemos/xcsh/pull/715))
+- MEDDPICC qualification and competitive positioning sections in system prompt ([#715](https://github.com/f5xc-salesdemos/xcsh/pull/715))
+- Version self-awareness and capabilities completeness regression tests ([#722](https://github.com/f5xc-salesdemos/xcsh/pull/722))
+
 ## [18.40.0] - 2026-05-05
 
 ### Added

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@f5xc-salesdemos/xcsh",
-	"version": "18.53.0",
+	"version": "18.53.1",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/f5xc-salesdemos/xcsh",
 	"author": "Can Boluk",
@@ -48,12 +48,12 @@
 	"dependencies": {
 		"@agentclientprotocol/sdk": "0.16.1",
 		"@mozilla/readability": "^0.6",
-		"@f5xc-salesdemos/xcsh-stats": "18.53.0",
-		"@f5xc-salesdemos/pi-agent-core": "18.53.0",
-		"@f5xc-salesdemos/pi-ai": "18.53.0",
-		"@f5xc-salesdemos/pi-natives": "18.53.0",
-		"@f5xc-salesdemos/pi-tui": "18.53.0",
-		"@f5xc-salesdemos/pi-utils": "18.53.0",
+		"@f5xc-salesdemos/xcsh-stats": "18.53.1",
+		"@f5xc-salesdemos/pi-agent-core": "18.53.1",
+		"@f5xc-salesdemos/pi-ai": "18.53.1",
+		"@f5xc-salesdemos/pi-natives": "18.53.1",
+		"@f5xc-salesdemos/pi-tui": "18.53.1",
+		"@f5xc-salesdemos/pi-utils": "18.53.1",
 		"@sinclair/typebox": "^0.34",
 		"@xterm/headless": "^6.0",
 		"ajv": "^8.18",

package/src/internal-urls/build-info.generated.ts

@@ -17,17 +17,17 @@ export interface BuildInfo {
 }
 
 export const BUILD_INFO: BuildInfo = {
-	"version": "18.53.0",
-	"commit": "02d05834f827f445ee1aa11645cd45add452077e",
-	"shortCommit": "02d0583",
+	"version": "18.53.1",
+	"commit": "8c2358f28cbf35bd5a8ce14498666912f6ffb0da",
+	"shortCommit": "8c2358f",
 	"branch": "main",
-	"tag": "v18.53.0",
-	"commitDate": "2026-05-09T08:18:32Z",
-	"buildDate": "2026-05-09T08:40:37.845Z",
-	"dirty": true,
+	"tag": "v18.53.1",
+	"commitDate": "2026-05-09T09:32:57Z",
+	"buildDate": "2026-05-09T09:56:11.380Z",
+	"dirty": false,
 	"prNumber": "",
 	"repoUrl": "https://github.com/f5xc-salesdemos/xcsh",
 	"repoSlug": "f5xc-salesdemos/xcsh",
-	"commitUrl": "https://github.com/f5xc-salesdemos/xcsh/commit/02d05834f827f445ee1aa11645cd45add452077e",
-	"releaseUrl": "https://github.com/f5xc-salesdemos/xcsh/releases/tag/v18.53.0"
+	"commitUrl": "https://github.com/f5xc-salesdemos/xcsh/commit/8c2358f28cbf35bd5a8ce14498666912f6ffb0da",
+	"releaseUrl": "https://github.com/f5xc-salesdemos/xcsh/releases/tag/v18.53.1"
 };

package/src/prompts/agents/explore.md

@@ -2,7 +2,7 @@
 name: explore
 description: Fast read-only codebase scout returning compressed context for handoff
 tools: read, grep, find, web_search
-model: pi/smol
+model: pi/task
 thinking-level: med
 output:
   properties:
@@ -10,6 +10,7 @@ output:
       metadata:
         description: Brief summary of findings and conclusions
       type: string
+  optionalProperties:
     files:
       metadata:
         description: Files examined with relevant code references

package/src/prompts/system/subagent-submit-reminder.md

@@ -1,11 +1,7 @@
 <system-reminder>
 You stopped without calling submit_result. This is reminder {{retryCount}} of {{maxRetries}}.
 
-You **MUST** call submit_result as your only action now. Choose one:
-- If task is complete: call submit_result with your result in `result.data`
-- If task failed: call submit_result with `result.error` describing what happened
-
-You **MUST NOT** give up if you can still complete the task through exploration (using available tools or repo context). If you submit an error, you **MUST** include what you tried and the exact blocker.
-
-You **MUST NOT** output text without a tool call. You **MUST** call submit_result to finish.
+You **MUST** call submit_result now. No other tool calls, no text output.
+- Task done: `submit_result` with `result.data` containing your findings
+- Task blocked: `submit_result` with `result.error` describing the blocker
 </system-reminder>

package/src/session/messages.ts

@@ -12,9 +12,10 @@ import type {
 	MessageAttribution,
 	ProviderPayload,
 	TextContent,
+	ToolCall,
 	ToolResultMessage,
 } from "@f5xc-salesdemos/pi-ai";
-import { prompt } from "@f5xc-salesdemos/pi-utils";
+import { logger, prompt } from "@f5xc-salesdemos/pi-utils";
 import branchSummaryContextPrompt from "../prompts/compaction/branch-summary-context.md" with { type: "text" };
 import compactionSummaryContextPrompt from "../prompts/compaction/compaction-summary-context.md" with { type: "text" };
 import type { OutputMeta } from "../tools/output-meta";
@@ -260,6 +261,122 @@ export function createCustomMessage(
 	};
 }
 
+/**
+ * Repair tool_use / tool_result ordering in converted LLM messages.
+ *
+ * The Claude API requires every assistant message containing tool_use blocks
+ * to be immediately followed by the matching tool_result messages. Session
+ * corruption (injected messages, compaction boundaries, crash during tool
+ * execution) can break this invariant, producing a 400 error that bricks
+ * the session.
+ *
+ * This function:
+ * 1. Finds assistant messages with tool_use (toolCall) content
+ * 2. Collects the required tool_result IDs
+ * 3. If tool_results are elsewhere in the array, moves them to the correct position
+ * 4. If tool_results are missing entirely, injects synthetic error tool_results
+ * 5. Non-tool messages that got wedged between tool_use and tool_result are relocated
+ *    to just before the assistant message
+ */
+function repairToolResultOrdering(messages: Message[]): Message[] {
+	const result: Message[] = [];
+	let repaired = false;
+
+	// Index all toolResult messages by their toolCallId for O(1) lookup
+	const toolResultsByCallId = new Map<string, { message: Message; originalIndex: number }>();
+	for (let i = 0; i < messages.length; i++) {
+		const msg = messages[i];
+		if (msg.role === "toolResult") {
+			const trMsg = msg as ToolResultMessage;
+			toolResultsByCallId.set(trMsg.toolCallId, { message: msg, originalIndex: i });
+		}
+	}
+
+	// Track which toolResult messages have been placed by repair
+	const placedToolResultIndices = new Set<number>();
+
+	for (let i = 0; i < messages.length; i++) {
+		const msg = messages[i];
+
+		// Skip toolResult messages that were already placed by repair
+		if (msg.role === "toolResult" && placedToolResultIndices.has(i)) {
+			continue;
+		}
+
+		result.push(msg);
+
+		// Not an assistant message with tool calls — nothing to repair
+		if (msg.role !== "assistant") continue;
+		const assistantMsg = msg as AssistantMessage;
+		const toolCalls = assistantMsg.content.filter((c): c is ToolCall => c.type === "toolCall");
+		if (toolCalls.length === 0) continue;
+
+		// Collect required tool call IDs
+		const requiredIds = new Set(toolCalls.map(tc => tc.id));
+
+		// Check what immediately follows in the remaining messages
+		// Consume consecutive toolResult messages that match, and relocate any
+		// non-toolResult messages that got wedged between
+		const displaced: Message[] = [];
+		let j = i + 1;
+		while (j < messages.length && requiredIds.size > 0) {
+			const next = messages[j];
+			if (next.role === "toolResult") {
+				const trMsg = next as ToolResultMessage;
+				if (requiredIds.has(trMsg.toolCallId)) {
+					// This tool_result belongs here — place it
+					result.push(next);
+					placedToolResultIndices.add(j);
+					requiredIds.delete(trMsg.toolCallId);
+					if (displaced.length > 0) repaired = true;
+					j++;
+					continue;
+				}
+			}
+			// Non-matching message between tool_use and tool_result — displace it
+			displaced.push(next);
+			placedToolResultIndices.add(j); // Mark original index as consumed
+			j++;
+		}
+
+		// Advance main iterator past consumed messages
+		i = j - 1;
+
+		// Any remaining required IDs: find them later in the array or synthesize
+		for (const id of requiredIds) {
+			const found = toolResultsByCallId.get(id);
+			if (found && !placedToolResultIndices.has(found.originalIndex)) {
+				result.push(found.message);
+				placedToolResultIndices.add(found.originalIndex);
+				repaired = true;
+			} else {
+				// Missing tool_result entirely — inject synthetic error result
+				const toolCall = toolCalls.find(tc => tc.id === id);
+				result.push({
+					role: "toolResult",
+					toolCallId: id,
+					toolName: toolCall?.name ?? "unknown",
+					content: [{ type: "text", text: "Tool execution was interrupted (session recovery)." }],
+					isError: true,
+					timestamp: Date.now(),
+				} as ToolResultMessage);
+				repaired = true;
+			}
+		}
+
+		// Re-insert displaced messages after the tool_results
+		for (const d of displaced) {
+			result.push(d);
+		}
+	}
+
+	if (repaired) {
+		logger.warn("Repaired tool_use/tool_result ordering in conversation history");
+	}
+
+	return repaired ? result : messages;
+}
+
 /**
  * Transform AgentMessages (including custom types) to LLM-compatible Messages.
  *
@@ -269,7 +386,7 @@ export function createCustomMessage(
  * - Custom extensions and tools
  */
 export function convertToLlm(messages: AgentMessage[]): Message[] {
-	return messages
+	const converted = messages
 		.map((m): Message | undefined => {
 			switch (m.role) {
 				case "bashExecution":
@@ -370,4 +487,5 @@ export function convertToLlm(messages: AgentMessage[]): Message[] {
 			}
 		})
 		.filter(m => m !== undefined);
+	return repairToolResultOrdering(converted);
 }

package/src/task/executor.ts

@@ -325,6 +325,29 @@ export function finalizeSubprocessOutput(args: FinalizeSubprocessOutputArgs): Fi
 				? `${SUBAGENT_WARNING_MISSING_SUBMIT_RESULT}\n\n${rawOutput}`
 				: SUBAGENT_WARNING_MISSING_SUBMIT_RESULT;
 		}
+
+		// Salvage output from aborted runs that produced content without calling submit_result
+		if (exitCode !== 0 && doneAborted && !signalAborted && rawOutput.trim().length > 0) {
+			if (hasOutputSchema) {
+				// Try schema-validated fallback: if the model produced valid JSON matching the schema,
+				// use it even though submit_result was never called
+				const abortFallback = resolveFallbackCompletion(rawOutput, outputSchema);
+				if (abortFallback) {
+					const completeData = normalizeCompleteData(abortFallback.data, reportFindings);
+					try {
+						rawOutput = JSON.stringify(completeData, null, 2) ?? "null";
+					} catch {
+						// Keep rawOutput as-is if serialization fails
+					}
+					exitCode = 0;
+					stderr = "";
+				}
+			} else {
+				// No schema required — raw text output is directly useful
+				exitCode = 0;
+				stderr = "";
+			}
+		}
 	}
 
 	return { rawOutput, exitCode, stderr, abortedViaSubmitResult, hasSubmitResult };
@@ -1250,7 +1273,9 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 	}
 
 	// Update final progress
-	const wasAborted = abortedViaSubmitResult || (!hasSubmitResult && (done.aborted || signal?.aborted || false));
+	// When salvage recovered the output (exitCode became 0), the result is not aborted.
+	const wasAborted =
+		abortedViaSubmitResult || (!hasSubmitResult && exitCode !== 0 && (done.aborted || signal?.aborted || false));
 	const finalAbortReason = wasAborted
 		? abortedViaSubmitResult
 			? submitResultAbortReason

package/src/utils/tool-choice.ts

@@ -24,5 +24,5 @@ export function buildNamedToolChoice(toolName: string, model?: Model<Api>): Tool
 		return "required";
 	}
 
-	return undefined;
+	return "required";
 }