@flue/client 0.0.27 → 0.0.29

package/dist/index.d.mts

@@ -101,6 +101,8 @@ interface SkillOptions<S extends v.GenericSchema | undefined = undefined> {
     providerID: string;
     modelID: string;
   };
+  /** Max time to wait for the skill to complete (ms). Defaults to 60 minutes. */
+  timeout?: number;
 }
 interface PromptOptions<S extends v.GenericSchema | undefined = undefined> {
   /** Valibot schema for structured result extraction. */
@@ -110,6 +112,8 @@ interface PromptOptions<S extends v.GenericSchema | undefined = undefined> {
     providerID: string;
     modelID: string;
   };
+  /** Max time to wait for the prompt to complete (ms). Defaults to 60 minutes. */
+  timeout?: number;
 }
 interface ShellOptions {
   /** Environment variables scoped to this subprocess only. */

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");
 }
 
@@ -291,8 +307,8 @@ function extractLastResultBlock(text) {
 const POLL_INTERVAL = 15e3;
 /** Max times we'll see 0 assistant messages before giving up. */
 const MAX_EMPTY_POLLS = 20;
-/** Max time to poll before timing out (ms) - 45 minutes. */
-const MAX_POLL_TIME = 2700 * 1e3;
+/** Default max time to poll before timing out (ms) - 60 minutes. */
+const DEFAULT_POLL_TIMEOUT = 3600 * 1e3;
 /**
 * Low-level primitive: send a fully-formed prompt to OpenCode, poll until
 * idle, and optionally extract a typed result.
@@ -301,7 +317,7 @@ const MAX_POLL_TIME = 2700 * 1e3;
 * constructing their own prompt text.
 */
 async function runPrompt(client, workdir, label, prompt, options) {
-	const { result: schema, model } = options ?? {};
+	const { result: schema, model, timeout } = options ?? {};
 	console.log(`[flue] ${label}: starting`);
 	console.log(`[flue] ${label}: creating session`);
 	const session = await client.session.create({
@@ -336,22 +352,46 @@ async function runPrompt(client, workdir, label, prompt, options) {
 	if (asyncResult.error) throw new Error(`Failed to send prompt for "${label}" (session ${sessionId}): ${JSON.stringify(asyncResult.error)}`);
 	await confirmSessionStarted(client, sessionId, workdir, label);
 	console.log(`[flue] ${label}: starting polling`);
-	const parts = await pollUntilIdle(client, sessionId, workdir, label, promptStart);
+	const parts = await pollUntilIdle(client, sessionId, workdir, label, promptStart, timeout);
 	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,
 * then delegates to runPrompt().
 */
 async function runSkill(client, workdir, name, options, proxyInstructions) {
-	const { args, result: schema, model } = options ?? {};
+	const { args, result: schema, model, timeout } = options ?? {};
 	const prompt = buildSkillPrompt(name, args, schema, proxyInstructions);
 	return runPrompt(client, workdir, `skill("${name}")`, prompt, {
 		result: schema,
-		model
+		model,
+		timeout
 	});
 }
 /**
@@ -378,14 +418,15 @@ async function confirmSessionStarted(client, sessionId, workdir, label) {
 	}
 	throw new Error(`"${label}" failed to start: session ${sessionId} has no messages after 15s.\nThe prompt was accepted but OpenCode never began processing it.\nThis usually means no model is configured. Pass --model to the flue CLI or set "model" in opencode.json.`);
 }
-async function pollUntilIdle(client, sessionId, workdir, label, startTime) {
+async function pollUntilIdle(client, sessionId, workdir, label, startTime, timeout) {
+	const maxPollTime = timeout ?? DEFAULT_POLL_TIMEOUT;
 	let emptyPolls = 0;
 	let pollCount = 0;
 	for (;;) {
 		await sleep(POLL_INTERVAL);
 		pollCount++;
 		const elapsed = ((Date.now() - startTime) / 1e3).toFixed(0);
-		if (Date.now() - startTime > MAX_POLL_TIME) throw new Error(`"${label}" timed out after ${elapsed}s. Session never went idle. This may indicate a stuck session or OpenCode bug.`);
+		if (Date.now() - startTime > maxPollTime) throw new Error(`"${label}" timed out after ${elapsed}s. Session never went idle. This may indicate a stuck session or OpenCode bug.`);
 		const statusResult = await client.session.status({ query: { directory: workdir } });
 		const sessionStatus = statusResult.data?.[sessionId];
 		if (!sessionStatus || sessionStatus.type === "idle") {
@@ -472,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.27",
+  "version": "0.0.29",
   "type": "module",
   "license": "Apache-2.0",
   "exports": {