@flue/client 0.0.29 → 0.0.31

package/dist/index.d.mts

@@ -90,6 +90,8 @@ interface FlueClientOptions {
   fetch: (request: Request) => Promise<Response>;
   /** Shell implementation for executing commands in the target environment. */
   shell: (command: string, options?: ShellOptions) => Promise<ShellResult>;
+  /** Enable verbose debug logging (default: false). */
+  debug?: boolean;
 }
 interface SkillOptions<S extends v.GenericSchema | undefined = undefined> {
   /** Key-value args serialized into the prompt. */
@@ -138,6 +140,7 @@ declare class FlueClient {
   private readonly model?;
   private readonly client;
   private readonly shellFn;
+  private readonly debug;
   constructor(options: FlueClientOptions);
   /** Run a named skill with a result schema. */
   skill<S extends v.GenericSchema>(name: string, options: SkillOptions<S> & {

package/dist/index.mjs

@@ -254,7 +254,7 @@ function buildSkillPrompt(name, args, schema, proxyInstructions) {
 * @returns The validated, typed result.
 * @throws {SkillOutputError} If no result block is found or validation fails.
 */
-function extractResult(parts, schema, sessionId) {
+function extractResult(parts, schema, sessionId, debug) {
 	const allText = parts.filter((p) => p.type === "text").map((p) => p.text).join("\n");
 	const resultBlock = extractLastResultBlock(allText);
 	if (resultBlock === null) {
@@ -287,7 +287,7 @@ function extractResult(parts, schema, sessionId) {
 			validationErrors: parsedResult.issues
 		});
 	}
-	console.log("[flue] extractResult: validated result:", JSON.stringify(parsedResult.output));
+	if (debug) console.log("[flue] extractResult: validated result:", JSON.stringify(parsedResult.output));
 	return parsedResult.output;
 }
 /**
@@ -316,7 +316,7 @@ const DEFAULT_POLL_TIMEOUT = 3600 * 1e3;
 * Both `flu.prompt()` and `flu.skill()` delegate to this function after
 * constructing their own prompt text.
 */
-async function runPrompt(client, workdir, label, prompt, options) {
+async function runPrompt(client, workdir, label, prompt, options, debug) {
 	const { result: schema, model, timeout } = options ?? {};
 	console.log(`[flue] ${label}: starting`);
 	console.log(`[flue] ${label}: creating session`);
@@ -324,87 +324,96 @@ async function runPrompt(client, workdir, label, prompt, options) {
 		body: { title: label },
 		query: { directory: workdir }
 	});
-	console.log(`[flue] ${label}: session created`, {
+	if (debug) console.log(`[flue] ${label}: session created`, {
 		hasData: !!session.data,
 		sessionId: session.data?.id,
 		error: session.error
 	});
 	if (!session.data) throw new Error(`Failed to create OpenCode session for "${label}".`);
 	const sessionId = session.data.id;
-	const promptStart = Date.now();
-	console.log(`[flue] ${label}: sending prompt async`);
-	const asyncResult = await client.session.promptAsync({
-		path: { id: sessionId },
-		query: { directory: workdir },
-		body: {
-			...model ? { model } : {},
-			parts: [{
-				type: "text",
-				text: prompt
-			}]
-		}
-	});
-	console.log(`[flue] ${label}: prompt sent`, {
-		hasError: !!asyncResult.error,
-		error: asyncResult.error,
-		data: asyncResult.data
-	});
-	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, timeout);
-	const promptElapsed = ((Date.now() - promptStart) / 1e3).toFixed(1);
-	console.log(`[flue] ${label}: completed (${promptElapsed}s)`);
-	if (!schema) return;
 	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({
+		const promptStart = Date.now();
+		if (debug) console.log(`[flue] ${label}: sending prompt async`);
+		const asyncResult = await client.session.promptAsync({
 			path: { id: sessionId },
 			query: { directory: workdir },
 			body: {
 				...model ? { model } : {},
 				parts: [{
 					type: "text",
-					text: buildResultExtractionPrompt(schema)
+					text: prompt
 				}]
 			}
 		});
-		if (followUpResult.error) {
-			if (followUpResult.error instanceof Error) followUpResult.error.cause = error;
-			throw followUpResult.error;
+		if (debug) console.log(`[flue] ${label}: prompt sent`, {
+			hasError: !!asyncResult.error,
+			error: asyncResult.error,
+			data: asyncResult.data
+		});
+		if (asyncResult.error) throw new Error(`Failed to send prompt for "${label}" (session ${sessionId}): ${JSON.stringify(asyncResult.error)}`);
+		await confirmSessionStarted(client, sessionId, workdir, label, debug);
+		if (debug) console.log(`[flue] ${label}: starting polling`);
+		const parts = await pollUntilIdle(client, sessionId, workdir, label, promptStart, timeout, debug);
+		const promptElapsed = ((Date.now() - promptStart) / 1e3).toFixed(1);
+		if (debug) console.log(`[flue] ${label}: completed (${promptElapsed}s)`);
+		if (!schema) return;
+		try {
+			return extractResult(parts, schema, sessionId, debug);
+		} 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, debug);
+			return extractResult(await pollUntilIdle(client, sessionId, workdir, label, Date.now(), timeout, debug), schema, sessionId, debug);
 		}
-		await confirmSessionStarted(client, sessionId, workdir, label);
-		return extractResult(await pollUntilIdle(client, sessionId, workdir, label, Date.now(), timeout), schema, sessionId);
+	} finally {
+		try {
+			await client.session.delete({
+				path: { id: sessionId },
+				query: { directory: workdir }
+			});
+		} catch {}
 	}
 }
 /**
 * 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) {
+async function runSkill(client, workdir, name, options, proxyInstructions, debug) {
 	const { args, result: schema, model, timeout } = options ?? {};
 	const prompt = buildSkillPrompt(name, args, schema, proxyInstructions);
 	return runPrompt(client, workdir, `skill("${name}")`, prompt, {
 		result: schema,
 		model,
 		timeout
-	});
+	}, debug);
 }
 /**
 * After promptAsync, confirm that OpenCode actually started processing the session.
 * Polls quickly (1s) to detect the session appearing as "busy" or a user message being recorded.
 * Fails fast (~15s) instead of letting the poll loop run for 5 minutes.
 */
-async function confirmSessionStarted(client, sessionId, workdir, label) {
+async function confirmSessionStarted(client, sessionId, workdir, label, debug) {
 	const maxAttempts = 15;
 	for (let attempt = 1; attempt <= maxAttempts; attempt++) {
 		await sleep(1e3);
 		if (((await client.session.status({ query: { directory: workdir } })).data?.[sessionId])?.type === "busy") {
-			console.log(`[flue] ${label}: session confirmed running`);
+			if (debug) console.log(`[flue] ${label}: session confirmed running`);
 			return;
 		}
 		const messages = (await client.session.messages({
@@ -412,13 +421,13 @@ async function confirmSessionStarted(client, sessionId, workdir, label) {
 			query: { directory: workdir }
 		})).data;
 		if (messages && messages.length > 0) {
-			console.log(`[flue] ${label}: session confirmed (${messages.length} messages)`);
+			if (debug) console.log(`[flue] ${label}: session confirmed (${messages.length} messages)`);
 			return;
 		}
 	}
 	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, timeout) {
+async function pollUntilIdle(client, sessionId, workdir, label, startTime, timeout, debug) {
 	const maxPollTime = timeout ?? DEFAULT_POLL_TIMEOUT;
 	let emptyPolls = 0;
 	let pollCount = 0;
@@ -487,11 +496,13 @@ var FlueClient = class {
 	model;
 	client;
 	shellFn;
+	debug;
 	constructor(options) {
 		this.proxyInstructions = options.proxies?.map((p) => p.instructions).filter((i) => !!i) ?? [];
 		this.workdir = options.workdir;
 		this.model = options.model;
 		this.shellFn = options.shell;
+		this.debug = options.debug ?? false;
 		this.client = createOpencodeClient({
 			baseUrl: options.opencodeUrl ?? "http://localhost:48765",
 			directory: this.workdir,
@@ -503,7 +514,7 @@ var FlueClient = class {
 			...options,
 			model: options?.model ?? this.model
 		};
-		return runSkill(this.client, this.workdir, name, mergedOptions, this.proxyInstructions);
+		return runSkill(this.client, this.workdir, name, mergedOptions, this.proxyInstructions, this.debug);
 	}
 	async prompt(promptText, options) {
 		const schema = options?.result;
@@ -522,7 +533,7 @@ var FlueClient = class {
 		return runPrompt(this.client, this.workdir, label, fullPrompt, {
 			result: options?.result,
 			model: options?.model ?? this.model
-		});
+		}, this.debug);
 	}
 	/** Execute a shell command with scoped environment variables. */
 	async shell(command, options) {

package/dist/proxies/index.mjs

@@ -91,7 +91,7 @@ function github(opts) {
 				"user-agent": "flue-proxy"
 			},
 			policy: resolvedPolicy,
-			setup: ["git config --global url.\"{{proxyUrl}}/\".insteadOf \"https://github.com/\"", "git config --global http.{{proxyUrl}}/.extraheader \"Authorization: Bearer proxy-placeholder\""],
+			setup: ["git config --global url.\"{{proxyUrl}}/\".insteadOf \"https://github.com/\"", "git config --global http.{{proxyUrl}}/.extraheader \"Authorization: Bearer {{proxyToken}}\""],
 			denyResponse
 		}];
 	};
@@ -130,11 +130,11 @@ function resolveGitHubPolicy(policy) {
 				},
 				{
 					method: "POST",
-					path: "/*/git-upload-pack"
+					path: "/**/git-upload-pack"
 				},
 				{
 					method: "GET",
-					path: "/*/info/refs"
+					path: "/**/info/refs"
 				},
 				...userAllow
 			],

package/package.json

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