@flue/client 0.0.6 → 0.0.8

package/dist/index.mjs

@@ -191,12 +191,6 @@ async function runShell(command, options) {
 //#endregion
 //#region src/prompt.ts
 /**
-* Checks if a Valibot schema represents a plain string type.
-*/
-function isStringSchema(schema) {
-	return schema.type === "string";
-}
-/**
 * Checks if a skill name is a file path (contains '/' or ends with '.md').
 */
 function isFilePath(name) {
@@ -222,10 +216,9 @@ function buildSkillPrompt(name, args, schema) {
 		isFilePath(name) ? `Read and use the .opencode/skills/${name} skill.` : `Use the ${name} skill.`
 	];
 	if (args && Object.keys(args).length > 0) parts.push(`\nArguments:\n${JSON.stringify(args, null, 2)}`);
-	if (schema) if (isStringSchema(schema)) parts.push("\nWhen complete, output your result between these exact delimiters (the result can contain any content including code blocks):", "---RESULT_START---", "Your text output here", "---RESULT_END---");
-	else {
+	if (schema) {
 		const { $schema: _, ...schemaWithoutMeta } = toJsonSchema(schema, { errorMode: "ignore" });
-		parts.push("\nWhen complete, output your result between these exact delimiters as JSON conforming to this schema:", "```json", JSON.stringify(schemaWithoutMeta, null, 2), "```", "", "Format:", "---RESULT_START---", "{\"key\": \"value\"}", "---RESULT_END---");
+		parts.push("\nWhen complete, you MUST output your result between these exact delimiters conforming to this schema:", "```json", JSON.stringify(schemaWithoutMeta, null, 2), "```", "", "Example: (Object)", "---RESULT_START---", "{\"key\": \"value\"}", "---RESULT_END---", "", "Example: (String)", "---RESULT_START---", "Hello, world!", "---RESULT_END---");
 	}
 	return parts.join("\n");
 }
@@ -255,43 +248,30 @@ function extractResult(parts, schema, sessionId) {
 			rawOutput: allText
 		});
 	}
-	console.log(`[flue] extractResult: found result block (${resultBlock.length} chars, session: ${sessionId})`);
-	if (schema.type === "string") {
-		const parseResult = v.safeParse(schema, resultBlock);
-		if (!parseResult.success) {
-			console.error("[flue] extractResult: string validation failed", parseResult.issues);
-			throw new SkillOutputError("Result validation failed for string schema.", {
-				sessionId,
-				rawOutput: resultBlock,
-				validationErrors: parseResult.issues
-			});
-		}
-		console.log(`[flue] extractResult: validated string result (${resultBlock.length} chars)`);
-		return parseResult.output;
-	}
-	let parsed;
-	try {
-		parsed = JSON.parse(resultBlock);
-	} catch (err) {
-		console.error(`[flue] extractResult: JSON parse failed for block: ${resultBlock.slice(0, 200)}`);
-		throw new SkillOutputError("Failed to parse result block as JSON.", {
+	let result = resultBlock;
+	if (schema.type === "object" || schema.type === "array") try {
+		result = JSON.parse(result);
+	} catch {
+		console.error("[flue] extractResult: schema validation failed", schema);
+		console.error("[flue] extractResult: parsed value was:", JSON.stringify(resultBlock));
+		throw new SkillOutputError("Result does not match the expected schema.", {
 			sessionId,
 			rawOutput: resultBlock,
-			validationErrors: err
+			validationErrors: ["JSON.parse(result) failed"]
 		});
 	}
-	const parseResult = v.safeParse(schema, parsed);
-	if (!parseResult.success) {
-		console.error("[flue] extractResult: schema validation failed", parseResult.issues);
-		console.error("[flue] extractResult: parsed value was:", JSON.stringify(parsed));
+	const parsedResult = v.safeParse(schema, result);
+	if (!parsedResult.success) {
+		console.error("[flue] extractResult: schema validation failed", parsedResult.issues);
+		console.error("[flue] extractResult: parsed value was:", JSON.stringify(result));
 		throw new SkillOutputError("Result does not match the expected schema.", {
 			sessionId,
-			rawOutput: resultBlock,
-			validationErrors: parseResult.issues
+			rawOutput: result,
+			validationErrors: parsedResult.issues
 		});
 	}
-	console.log("[flue] extractResult: validated result:", JSON.stringify(parseResult.output));
-	return parseResult.output;
+	console.log("[flue] extractResult: validated result:", JSON.stringify(parsedResult.output));
+	return parsedResult.output;
 }
 /**
 * Extracts the content of the last ---RESULT_START--- / ---RESULT_END--- block from text.

package/package.json

@@ -1,28 +1,28 @@
 {
-	"name": "@flue/client",
-	"version": "0.0.6",
-	"type": "module",
-	"exports": {
-		".": {
-			"types": "./dist/index.d.mts",
-			"import": "./dist/index.mjs"
-		}
-	},
-	"main": "./dist/index.mjs",
-	"types": "./dist/index.d.mts",
-	"files": [
-		"dist"
-	],
-	"scripts": {
-		"build": "tsdown",
-		"check:types": "tsc --noEmit"
-	},
-	"dependencies": {
-		"@opencode-ai/sdk": "latest",
-		"@valibot/to-json-schema": "^1.0.0",
-		"valibot": "^1.0.0"
-	},
-	"devDependencies": {
-		"tsdown": "^0.20.3"
-	}
-}
+  "name": "@flue/client",
+  "version": "0.0.8",
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.mts",
+      "import": "./dist/index.mjs"
+    }
+  },
+  "main": "./dist/index.mjs",
+  "types": "./dist/index.d.mts",
+  "files": [
+    "dist"
+  ],
+  "dependencies": {
+    "@opencode-ai/sdk": "^1.1.56",
+    "@valibot/to-json-schema": "^1.0.0",
+    "valibot": "^1.0.0"
+  },
+  "devDependencies": {
+    "tsdown": "^0.20.3"
+  },
+  "scripts": {
+    "build": "tsdown",
+    "check:types": "tsc --noEmit"
+  }
+}