nexgenr 1.0.3 → 1.1.0

package/dist/main.mjs

@@ -188855,6 +188855,112 @@ var init_capability$6 = __esmMin((() => {
 		dynamically_loaded_tools: false
 	}, UNKNOWN_CAPABILITY_MARKER$1, { value: true }));
 }));
+// ../../packages/agent-core-v2/src/human/llm/repair/inline-tool-call.ts
+function parseParameterValue(raw) {
+	const trimmed = raw.trim();
+	if (trimmed === "") return "";
+	const first = trimmed[0];
+	if (first === "{" || first === "[" || first === "\"" || trimmed === "true" || trimmed === "false") try {
+		return JSON.parse(trimmed);
+	} catch {
+		return trimmed;
+	}
+	if (/^-?\d+(\.\d+)?$/.test(trimmed)) return Number(trimmed);
+	return trimmed;
+}
+function parseBlockBody(body) {
+	const trimmed = body.trim();
+	if (trimmed.startsWith("{")) try {
+		const decoded = JSON.parse(trimmed);
+		if (typeof decoded.name === "string" && decoded.name !== "") {
+			const args = decoded.arguments ?? decoded.parameters ?? {};
+			return {
+				name: decoded.name,
+				arguments: JSON.stringify(args)
+			};
+		}
+	} catch {
+		return;
+	}
+	const functionMatch = FUNCTION_PATTERN.exec(trimmed);
+	if (functionMatch === null) return void 0;
+	const name = functionMatch[1];
+	if (name === void 0 || name === "") return void 0;
+	const args = {};
+	for (const match of trimmed.matchAll(PARAMETER_PATTERN)) {
+		const key = match[1];
+		if (key === void 0 || key === "") continue;
+		args[key] = parseParameterValue(match[2] ?? "");
+	}
+	return {
+		name,
+		arguments: JSON.stringify(args)
+	};
+}
+function extractInlineToolCalls(content) {
+	if (!content.includes("<tool_call>")) return {
+		text: content,
+		calls: []
+	};
+	const calls = [];
+	let consumed = false;
+	const text = content.replace(BLOCK_PATTERN, (block, body) => {
+		const call = parseBlockBody(body);
+		if (call === void 0) return block;
+		calls.push(call);
+		consumed = true;
+		return "";
+	});
+	return consumed ? {
+		text: text.replace(/\n{3,}/g, "\n\n").trim(),
+		calls
+	} : {
+		text: content,
+		calls: []
+	};
+}
+function sameCall(left, call) {
+	return left.name === call.name && left.arguments === call.arguments;
+}
+function repairAssistantMessage(message) {
+	const recovered = [];
+	const kept = [];
+	for (const part of message.content) {
+		if (part.type !== "text") {
+			kept.push(part);
+			continue;
+		}
+		const scan = extractInlineToolCalls(part.text);
+		if (scan.calls.length === 0) {
+			kept.push(part);
+			continue;
+		}
+		recovered.push(...scan.calls);
+		const rest = scan.text.trim();
+		if (rest !== "") kept.push({
+			...part,
+			text: rest
+		});
+	}
+	if (recovered.length === 0) return;
+	message.content.length = 0;
+	message.content.push(...kept);
+	for (const call of recovered) {
+		if (message.toolCalls.some((existing) => sameCall(existing, call))) continue;
+		message.toolCalls.push({
+			type: "function",
+			id: crypto.randomUUID(),
+			name: call.name,
+			arguments: call.arguments
+		});
+	}
+}
+var BLOCK_PATTERN, FUNCTION_PATTERN, PARAMETER_PATTERN;
+var init_inline_tool_call = __esmMin((() => {
+	BLOCK_PATTERN = /<tool_call>([\s\S]*?)<\/tool_call>/g;
+	FUNCTION_PATTERN = /<function=([^>\s]+)>/;
+	PARAMETER_PATTERN = /<parameter=([^>\s]+)>([\s\S]*?)<\/parameter>/g;
+}));
 // ../../packages/agent-core-v2/src/human/llm/message.ts
 function isContentPart(part) {
 	const t = part.type;
@@ -188984,11 +189090,14 @@ function createMessageAccumulator() {
 		},
 		finish() {
 			flush();
+			repairAssistantMessage(message);
 			return message;
 		}
 	};
 }
-var init_message$2 = __esmMin((() => {}));
+var init_message$2 = __esmMin((() => {
+	init_inline_tool_call();
+}));
 // ../../packages/agent-core-v2/src/llm-adapter/contract/message.ts
 function createUserMessage(content) {
 	return {
@@ -197085,7 +197194,9 @@ function extractReasoningStrings(source) {
 			value
 		});
 	}
-	return found;
+	const [first] = found;
+	if (first === void 0 || found.length === 1) return found;
+	return found.every((entry) => entry.value === first.value) ? [first] : found;
 }
 function extractReasoning(source, explicitKey) {
 	if (explicitKey !== void 0) {
@@ -200163,12 +200274,24 @@ function createEmptyResponseError(model, finish, thinkOnly) {
 		rawFinishReason: finish.rawFinishReason
 	};
 }
+function createUnrecoveredToolCallError(model, finish) {
+	return {
+		kind: "empty_response",
+		message: `The model wrote a tool call as text instead of calling a tool, and it could not be recovered from the response.${formatFinishReasonHint(finish)} Provider: ${model.provider}, model: ${model.model}`,
+		finishReason: finish.finishReason,
+		rawFinishReason: finish.rawFinishReason
+	};
+}
+function hasUnrecoveredToolCallText(message) {
+	return message.content.some((part) => part.type === "text" && part.text.includes("<tool_call"));
+}
 function emptyResponseError(message, model, finish) {
 	const hasToolCalls = message.toolCalls.length > 0;
 	if (message.content.length === 0 && !hasToolCalls) return createEmptyResponseError(model, finish, false);
 	const hasThink = message.content.some((part) => part.type === "think");
 	const hasText = message.content.some((part) => part.type === "text" && part.text.trim().length > 0);
 	if (hasThink && !hasText && !hasToolCalls) return createEmptyResponseError(model, finish, true);
+	if (!hasToolCalls && hasUnrecoveredToolCallText(message)) return createUnrecoveredToolCallError(model, finish);
 	return null;
 }
 var init_empty_response = __esmMin((() => {}));
@@ -223949,7 +224072,7 @@ function createAgentMachine({ abortTimeoutMs, maxStepsPerTurn }) {
 								event: [...event.output.produced.map((message) => messageAppended({ message })), turnEnded({
 									turnId: context.activeTurnId ?? context.turnId,
 									outcome: event.output.type,
-									errorMessage: event.output.type === "failed" ? String(event.output.error) : void 0
+									errorMessage: event.output.type === "failed" ? toErrorMessage(event.output.error) : void 0
 								})]
 							}))
 						]
@@ -223967,7 +224090,7 @@ function createAgentMachine({ abortTimeoutMs, maxStepsPerTurn }) {
 							event: turnEnded({
 								turnId: context.activeTurnId ?? context.turnId,
 								outcome: "failed",
-								errorMessage: String(event.error)
+								errorMessage: toErrorMessage(event.error)
 							})
 						}))]
 					},
@@ -224093,6 +224216,7 @@ function createAgentMachine({ abortTimeoutMs, maxStepsPerTurn }) {
 }
 var init_machine$2 = __esmMin((() => {
 	init_xstate2();
+	init_errorMessage();
 	init_message$2();
 	init_machine$3();
 	init_wait_for$1();
@@ -270915,7 +271039,7 @@ function preflightToolCall(toolRegistry, toolCall, guard, describeUnavailableToo
 		toolCall,
 		toolName,
 		args: parsedArgs.data,
-		output: describeMissingTool?.(toolName) ?? `Tool "${toolName}" not found`
+		output: describeMissingTool?.(toolName) ?? missingToolMessage(toolRegistry, toolName)
 	};
 	const source = toolRegistry.list().find((entry) => entry.name === toolName)?.source ?? "builtin";
 	const denied = guard?.({
@@ -270953,6 +271077,19 @@ function preflightToolCall(toolRegistry, toolCall, guard, describeUnavailableToo
 		args: parsedArgs.data
 	};
 }
+function missingToolMessage(toolRegistry, toolName) {
+	const base = `Tool "${toolName}" not found`;
+	const wanted = toolName.toLowerCase();
+	const suggestions = [];
+	for (const entry of toolRegistry.list()) {
+		if (!entry.name.startsWith("mcp__")) continue;
+		if (!entry.name.toLowerCase().includes(wanted)) continue;
+		suggestions.push(entry.name);
+		if (suggestions.length === 5) break;
+	}
+	if (suggestions.length === 0) return base;
+	return `${base}. Registered MCP tools with a similar name: ${suggestions.join(", ")}. Use the exact name.`;
+}
 function validateExecutableToolArgs(tool, args) {
 	const schema = tool.parameters;
 	let cached = validators.get(tool);
@@ -279532,6 +279669,7 @@ var init_toolRegistryService = __esmMin((() => {
 	init_scopes();
 	init_scope();
 	init_toolRegistry();
+	init_tool_naming();
 	init_builtinToolAssemblyService();
 	AgentToolRegistryService = class {
 		tools = /* @__PURE__ */ new Map();
@@ -279564,7 +279702,22 @@ var init_toolRegistryService = __esmMin((() => {
 			})).toSorted((a, b) => a.name.localeCompare(b.name));
 		}
 		resolve(name) {
-			return this.tools.get(name)?.tool;
+			const direct = this.tools.get(name)?.tool;
+			if (direct !== void 0) return direct;
+			return this.resolveMcpAlias(name);
+		}
+		resolveMcpAlias(name) {
+			if (name.startsWith("mcp__")) return void 0;
+			const wanted = sanitizeMcpNamePart(name);
+			const matches = [];
+			for (const [qualified, entry] of this.tools) {
+				if (!qualified.startsWith("mcp__")) continue;
+				const rest = qualified.slice(5);
+				const separator = rest.indexOf("__");
+				if (separator < 0) continue;
+				if (rest.slice(separator + 2) === wanted) matches.push(entry);
+			}
+			return matches.length === 1 ? matches[0]?.tool : void 0;
 		}
 		unregisterTool(name) {
 			const entry = this.tools.get(name);
@@ -279863,6 +280016,7 @@ var init_src$10 = __esmMin((() => {
 	init_capability$6();
 	init_errors$38();
 	init_message$1();
+	init_message$2();
 	init_request_trace();
 	init_sessionIndex();
 	init_sessionIndexService();
@@ -323257,6 +323411,51 @@ async function callRedteamTool(input) {
 		text: text.slice(0, 2e3)
 	};
 }
+async function listRedteamToolNames(input) {
+	const doFetch = input.fetchImpl ?? fetch;
+	const timeoutMs = input.timeoutMs ?? PROBE_TIMEOUT_MS$1;
+	const origin = input.origin ?? "https://redteam.nexgen.systems";
+	const headers = {
+		...mcpHeaders(input.apiKey),
+		"content-type": "application/json",
+		accept: "application/json, text/event-stream"
+	};
+	const initResponse = await timedFetch(doFetch, `${origin}/mcp`, {
+		method: "POST",
+		headers,
+		body: JSON.stringify({
+			jsonrpc: "2.0",
+			id: 1,
+			method: "initialize",
+			params: {
+				protocolVersion: "2025-06-18",
+				capabilities: {},
+				clientInfo: {
+					name: "nexgenr-doctor",
+					version: "1"
+				}
+			}
+		})
+	}, timeoutMs);
+	if (!initResponse.ok) return [];
+	const sessionId = initResponse.headers.get("mcp-session-id") ?? "";
+	await readJsonRpc(initResponse, 1);
+	const listResponse = await timedFetch(doFetch, `${origin}/mcp`, {
+		method: "POST",
+		headers: sessionId === "" ? headers : {
+			...headers,
+			"mcp-session-id": sessionId
+		},
+		body: JSON.stringify({
+			jsonrpc: "2.0",
+			id: 2,
+			method: "tools/list",
+			params: {}
+		})
+	}, timeoutMs);
+	if (!listResponse.ok) return [];
+	return (((await readJsonRpc(listResponse, 2))?.["result"])?.tools ?? []).flatMap((tool) => typeof tool.name === "string" ? [tool.name] : []);
+}
 async function probeRedteam(input = {}) {
 	const doFetch = input.fetchImpl ?? fetch;
 	const timeoutMs = input.timeoutMs ?? PROBE_TIMEOUT_MS$1;
@@ -323316,6 +323515,19 @@ async function handleDoctorRedteam(deps) {
 	}
 	const verdict = verdictOf$1(rows);
 	deps.stdout.write(deps.json === true ? formatJson$1(rows, verdict) : formatTable$1(rows, verdict));
+	if (deps.listTools === true) {
+		const names = await listRedteamToolNames({
+			apiKey: process.env["NEXGENR_REDTEAM_MCP_KEY"] ?? apiKey,
+			fetchImpl: deps.fetchImpl
+		});
+		deps.stdout.write([
+			`Gateway tools (${names.length}):`,
+			...names.map((name) => `  ${name}`),
+			"",
+			"The model sees them as mcp__<server>__<name>. A bare gateway name resolves only when it is unambiguous.",
+			""
+		].join("\n"));
+	}
 	deps.exit(EXIT_CODES$1[verdict]);
 }
 function formatJson$1(rows, verdict) {
@@ -323707,7 +323919,7 @@ function registerDoctorCommand(parent, deps) {
 			json: options.json === true
 		});
 	});
-	doctor.command("redteam").description("Probe the red-team surface: contract, inference catalog and MCP gateway.").option("--json", "Emit a machine-readable report instead of the table.").option("--call <tool>", "Call one MCP tool after the probes (this spends service credits).").option("--args <json>", "JSON arguments for --call.").action(async (options) => {
+	doctor.command("redteam").description("Probe the red-team surface: contract, inference catalog and MCP gateway.").option("--json", "Emit a machine-readable report instead of the table.").option("--tools", "List the gateway tool names after the probes.").option("--call <tool>", "Call one MCP tool after the probes (this spends service credits).").option("--args <json>", "JSON arguments for --call.").action(async (options) => {
 		const resolved = resolveDeps$1(deps);
 		let args;
 		if (options.args !== void 0) try {
@@ -323721,6 +323933,7 @@ function registerDoctorCommand(parent, deps) {
 			stderr: resolved.stderr,
 			exit: resolved.exit,
 			json: options.json === true,
+			listTools: options.tools === true,
 			call: options.call === void 0 ? void 0 : {
 				tool: options.call,
 				args
@@ -497579,7 +497792,7 @@ function sameStringArrays(a, b) {
 	return a.length === b.length && a.every((value, index) => value === b[index]);
 }
 function createInitialAppState(input) {
-	const startupPermission = input.cliOptions.auto ? "auto" : input.cliOptions.yolo ? "yolo" : "manual";
+	const startupPermission = input.cliOptions.yolo ? "yolo" : "auto";
 	return {
 		model: "",
 		workDir: input.workDir,
@@ -499251,7 +499464,7 @@ var NexgenTUI = class {
 		const { startup } = this.options;
 		const config = await this.harness.getConfig({ reload: true });
 		const patch = includeModel ? lazyModelSelection(config, startup.model ?? config.defaultModel) : {};
-		if (!startup.auto && !startup.yolo) patch.permissionMode = config.defaultPermissionMode ?? "manual";
+		if (!startup.auto && !startup.yolo) patch.permissionMode = config.defaultPermissionMode ?? "auto";
 		patch.configDefaultPlanMode = config.defaultPlanMode === true;
 		if (!startup.plan) patch.planMode = config.defaultPlanMode === true;
 		if (startup.agentProfile !== void 0 || startup.agentFiles !== void 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nexgenr",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "description": "NexgenR — terminal AI coding agent",
   "license": "MIT",
   "author": "NexgenR",