@flue/client 0.0.28 → 0.0.29

package/dist/index.mjs

@@ -181,7 +181,6 @@ function buildResultInstructions(schema) {
 	const { $schema: _, ...schemaWithoutMeta } = toJsonSchema(schema, { errorMode: "ignore" });
 	return [
 		"",
-		"When complete, you MUST output your result between these exact delimiters conforming to this schema:",
 		"```json",
 		JSON.stringify(schemaWithoutMeta, null, 2),
 		"```",
@@ -205,6 +204,20 @@ function buildProxyInstructions(instructions) {
 	return "\n\n" + instructions.join("\n");
 }
 /**
+* Build a standalone follow-up prompt that asks the LLM to return its result.
+*
+* Used when the initial response is missing the ---RESULT_START--- /
+* ---RESULT_END--- block. Sent as a second message in the same session so the
+* format instructions are fresh in context.
+*/
+function buildResultExtractionPrompt(schema) {
+	return [
+		"Your task is complete. Now respond with ONLY your final result.",
+		"No explanation, no preamble — just the result in the following format, conforming to this schema:",
+		buildResultInstructions(schema)
+	].join("\n");
+}
+/**
 * Build the prompt text for a skill invocation.
 *
 * If `name` looks like a file path (contains '/' or ends with '.md'), the
@@ -220,7 +233,10 @@ function buildSkillPrompt(name, args, schema, proxyInstructions) {
 	];
 	if (args && Object.keys(args).length > 0) parts.push(`\nArguments:\n${JSON.stringify(args, null, 2)}`);
 	if (proxyInstructions && proxyInstructions.length > 0) parts.push(buildProxyInstructions(proxyInstructions));
-	if (schema) parts.push(buildResultInstructions(schema));
+	if (schema) {
+		parts.push("When complete, you MUST output your result between these exact delimiters conforming to this schema:");
+		parts.push(buildResultInstructions(schema));
+	}
 	return parts.join("\n");
 }
 
@@ -340,7 +356,30 @@ async function runPrompt(client, workdir, label, prompt, options) {
 	const promptElapsed = ((Date.now() - promptStart) / 1e3).toFixed(1);
 	console.log(`[flue] ${label}: completed (${promptElapsed}s)`);
 	if (!schema) return;
-	return extractResult(parts, schema, sessionId);
+	try {
+		return extractResult(parts, schema, sessionId);
+	} catch (error) {
+		if (!(error instanceof SkillOutputError)) throw error;
+		if (!error.message.includes("---RESULT_START---")) throw error;
+		console.log(`[flue] ${label}: result extraction failed, sending follow-up prompt to request result`);
+		const followUpResult = await client.session.promptAsync({
+			path: { id: sessionId },
+			query: { directory: workdir },
+			body: {
+				...model ? { model } : {},
+				parts: [{
+					type: "text",
+					text: buildResultExtractionPrompt(schema)
+				}]
+			}
+		});
+		if (followUpResult.error) {
+			if (followUpResult.error instanceof Error) followUpResult.error.cause = error;
+			throw followUpResult.error;
+		}
+		await confirmSessionStarted(client, sessionId, workdir, label);
+		return extractResult(await pollUntilIdle(client, sessionId, workdir, label, Date.now(), timeout), schema, sessionId);
+	}
 }
 /**
 * Run a named skill: builds the skill prompt from the name + args + schema,
@@ -474,7 +513,10 @@ var FlueClient = class {
 			promptText
 		];
 		if (this.proxyInstructions.length > 0) parts.push(buildProxyInstructions(this.proxyInstructions));
-		if (schema) parts.push(buildResultInstructions(schema));
+		if (schema) {
+			parts.push("When complete, you MUST output your result between these exact delimiters conforming to this schema:");
+			parts.push(buildResultInstructions(schema));
+		}
 		const fullPrompt = parts.join("\n");
 		const label = `prompt("${promptText.length > 40 ? promptText.slice(0, 40) + "…" : promptText}")`;
 		return runPrompt(this.client, this.workdir, label, fullPrompt, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flue/client",
-  "version": "0.0.28",
+  "version": "0.0.29",
   "type": "module",
   "license": "Apache-2.0",
   "exports": {