@f5xc-salesdemos/xcsh 18.63.0 → 18.63.1

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@f5xc-salesdemos/xcsh",
-	"version": "18.63.0",
+	"version": "18.63.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.63.0",
-		"@f5xc-salesdemos/pi-agent-core": "18.63.0",
-		"@f5xc-salesdemos/pi-ai": "18.63.0",
-		"@f5xc-salesdemos/pi-natives": "18.63.0",
-		"@f5xc-salesdemos/pi-tui": "18.63.0",
-		"@f5xc-salesdemos/pi-utils": "18.63.0",
+		"@f5xc-salesdemos/xcsh-stats": "18.63.1",
+		"@f5xc-salesdemos/pi-agent-core": "18.63.1",
+		"@f5xc-salesdemos/pi-ai": "18.63.1",
+		"@f5xc-salesdemos/pi-natives": "18.63.1",
+		"@f5xc-salesdemos/pi-tui": "18.63.1",
+		"@f5xc-salesdemos/pi-utils": "18.63.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.63.0",
-	"commit": "8d5a9fc0bb6d4a264e25e3066f29273b7f0a6760",
-	"shortCommit": "8d5a9fc",
+	"version": "18.63.1",
+	"commit": "cc43e44c0c304f8ed8778d3dc1566286cd656275",
+	"shortCommit": "cc43e44",
 	"branch": "main",
-	"tag": "v18.63.0",
-	"commitDate": "2026-05-11T07:20:24Z",
-	"buildDate": "2026-05-11T07:45:28.251Z",
-	"dirty": true,
+	"tag": "v18.63.1",
+	"commitDate": "2026-05-13T17:59:16Z",
+	"buildDate": "2026-05-13T18:24:01.435Z",
+	"dirty": false,
 	"prNumber": "",
 	"repoUrl": "https://github.com/f5xc-salesdemos/xcsh",
 	"repoSlug": "f5xc-salesdemos/xcsh",
-	"commitUrl": "https://github.com/f5xc-salesdemos/xcsh/commit/8d5a9fc0bb6d4a264e25e3066f29273b7f0a6760",
-	"releaseUrl": "https://github.com/f5xc-salesdemos/xcsh/releases/tag/v18.63.0"
+	"commitUrl": "https://github.com/f5xc-salesdemos/xcsh/commit/cc43e44c0c304f8ed8778d3dc1566286cd656275",
+	"releaseUrl": "https://github.com/f5xc-salesdemos/xcsh/releases/tag/v18.63.1"
 };

package/src/session/messages.ts

@@ -374,6 +374,12 @@ function repairToolResultOrdering(messages: Message[]): Message[] {
 	// When an assistant-with-tool-calls gets displaced (wedged between another assistant's
 	// tool_use and its tool_result), the first pass pushes it to result but the outer loop
 	// jumps past it — so its own tool_results are never resolved.
+	//
+	// Uses a non-mutating rebuild to avoid index corruption from splice-during-iteration
+	// (the prior splice approach corrupted indices in long conversations with 1000+ messages).
+	const indicesToRemove = new Set<number>();
+	const insertions: Array<{ afterIndex: number; messages: ToolResultMessage[] }> = [];
+
 	for (let i = 0; i < result.length; i++) {
 		const msg = result[i];
 		if (msg.role !== "assistant") continue;
@@ -381,7 +387,6 @@ function repairToolResultOrdering(messages: Message[]): Message[] {
 		const toolCalls = assistantMsg.content.filter((c): c is ToolCall => c.type === "toolCall");
 		if (toolCalls.length === 0) continue;
 
-		// Check if every tool call has a toolResult immediately following
 		const expectedIds = new Set(toolCalls.map(tc => tc.id));
 		let j = i + 1;
 		while (j < result.length && result[j].role === "toolResult") {
@@ -391,17 +396,18 @@ function repairToolResultOrdering(messages: Message[]): Message[] {
 
 		if (expectedIds.size === 0) continue;
 
-		// For missing tool calls: relocate existing result from later in array, or synthesize
 		const toInsert: ToolResultMessage[] = [];
 		for (const id of expectedIds) {
-			// Check if a toolResult for this ID exists later in result
 			const laterIndex = result.findIndex(
-				(m, idx) => idx > j && m.role === "toolResult" && (m as ToolResultMessage).toolCallId === id,
+				(m, idx) =>
+					idx > j &&
+					!indicesToRemove.has(idx) &&
+					m.role === "toolResult" &&
+					(m as ToolResultMessage).toolCallId === id,
 			);
 			if (laterIndex !== -1) {
-				// Relocate the existing result to right after the assistant
-				const [relocated] = result.splice(laterIndex, 1);
-				toInsert.push(relocated as ToolResultMessage);
+				toInsert.push(result[laterIndex] as ToolResultMessage);
+				indicesToRemove.add(laterIndex);
 			} else {
 				const toolCall = toolCalls.find(tc => tc.id === id);
 				toInsert.push({
@@ -414,9 +420,26 @@ function repairToolResultOrdering(messages: Message[]): Message[] {
 				} as ToolResultMessage);
 			}
 		}
-		result.splice(i + 1, 0, ...toInsert);
-		i += toInsert.length; // Skip past inserted results
-		repaired = true;
+		if (toInsert.length > 0) {
+			insertions.push({ afterIndex: i, messages: toInsert });
+			repaired = true;
+		}
+	}
+
+	if (insertions.length > 0 || indicesToRemove.size > 0) {
+		const rebuilt: Message[] = [];
+		const insertionMap = new Map(insertions.map(ins => [ins.afterIndex, ins.messages]));
+		for (let i = 0; i < result.length; i++) {
+			if (!indicesToRemove.has(i)) {
+				rebuilt.push(result[i]);
+			}
+			const ins = insertionMap.get(i);
+			if (ins) {
+				rebuilt.push(...ins);
+			}
+		}
+		result.length = 0;
+		result.push(...rebuilt);
 	}
 
 	if (repaired) {
@@ -536,5 +559,39 @@ export function convertToLlm(messages: AgentMessage[]): Message[] {
 			}
 		})
 		.filter(m => m !== undefined);
-	return repairToolResultOrdering(converted);
+	const repaired = repairToolResultOrdering(converted);
+	return mergeConsecutiveUserTextMessages(repaired);
+}
+
+/**
+ * Merge consecutive user messages that contain only text into single messages.
+ * The Claude API internally merges consecutive same-role messages before validation,
+ * which shifts message indices. Pre-merging here keeps xcsh's indices aligned with
+ * the API's view, preventing phantom index mismatches in error reports.
+ */
+function mergeConsecutiveUserTextMessages(messages: Message[]): Message[] {
+	if (messages.length < 2) return messages;
+
+	const result: Message[] = [messages[0]];
+	for (let i = 1; i < messages.length; i++) {
+		const prev = result[result.length - 1];
+		const curr = messages[i];
+
+		if (
+			prev.role === "user" &&
+			curr.role === "user" &&
+			Array.isArray(prev.content) &&
+			Array.isArray(curr.content) &&
+			prev.content.every(c => c.type === "text") &&
+			curr.content.every(c => c.type === "text")
+		) {
+			result[result.length - 1] = {
+				...prev,
+				content: [...prev.content, ...curr.content],
+			};
+		} else {
+			result.push(curr);
+		}
+	}
+	return result;
 }