@flue/sdk 0.1.1 → 0.1.3

package/dist/{session-0gnaB_aY.mjs → session-CiAMTsLZ.mjs}

@@ -1,437 +1,9 @@
+import { i as loadSkillByPath, n as createTools, r as discoverSessionContext, t as BUILTIN_TOOL_NAMES } from "./agent-BYG0nVbQ.mjs";
+import { completeSimple, isContextOverflow } from "@mariozechner/pi-ai";
 import { Agent } from "@mariozechner/pi-agent-core";
-import { Type, completeSimple, isContextOverflow } from "@mariozechner/pi-ai";
 import { toJsonSchema } from "@valibot/to-json-schema";
 import * as v from "valibot";
 
-//#region src/context.ts
-/** Parse optional YAML frontmatter (--- delimited). Basic `key: value` only. */
-function parseFrontmatterFile(content, defaultName) {
-	const frontmatterMatch = content.match(/^---\s*\n([\s\S]*?)\n---\s*\n([\s\S]*)$/);
-	if (!frontmatterMatch) return {
-		name: defaultName,
-		description: "",
-		body: content.trim(),
-		frontmatter: {}
-	};
-	const rawFrontmatter = frontmatterMatch[1] ?? "";
-	const body = frontmatterMatch[2] ?? "";
-	const frontmatter = {};
-	for (const line of rawFrontmatter.split("\n")) {
-		const match = line.match(/^(\w+):\s*(.+)$/);
-		if (match?.[1] && match[2]) frontmatter[match[1]] = match[2].trim();
-	}
-	return {
-		name: frontmatter.name || defaultName,
-		description: frontmatter.description || "",
-		body: body.trim(),
-		frontmatter
-	};
-}
-/** Read AGENTS.md (and CLAUDE.md if present) from a directory. Returns concatenated contents. */
-async function readAgentsMd(env, basePath) {
-	const parts = [];
-	for (const filename of ["AGENTS.md", "CLAUDE.md"]) {
-		const filePath = basePath.endsWith("/") ? basePath + filename : `${basePath}/${filename}`;
-		if (await env.exists(filePath)) {
-			const content = await env.readFile(filePath);
-			parts.push(content.trim());
-		}
-	}
-	return parts.join("\n\n");
-}
-/**
-* Load a skill directly by relative path under `.agents/skills/`.
-*
-* The path is taken as-is — no extension is auto-appended. Callers reference
-* the full filename, e.g. `'triage/reproduce.md'`. Returns `null` if the file
-* doesn't exist.
-*
-* Used as a fallback by `session.skill()` when the requested name doesn't match
-* a discovered skill's frontmatter `name:` field. Lets users organise skills as
-* a pack of sibling markdown files under one directory (orchestration SKILL.md
-* + stage files) without forcing each stage into its own `SKILL.md` subdirectory.
-*/
-async function loadSkillByPath(env, basePath, relPath) {
-	const filePath = `${basePath.endsWith("/") ? `${basePath}.agents/skills` : `${basePath}/.agents/skills`}/${relPath}`;
-	if (!await env.exists(filePath)) return null;
-	const parsed = parseFrontmatterFile(await env.readFile(filePath), relPath.replace(/\.(md|markdown)$/i, ""));
-	return {
-		name: parsed.name,
-		description: parsed.description,
-		instructions: parsed.body
-	};
-}
-/** Discover skills from .agents/skills/<name>/SKILL.md under basePath. */
-async function discoverLocalSkills(env, basePath) {
-	const skillsDir = basePath.endsWith("/") ? `${basePath}.agents/skills` : `${basePath}/.agents/skills`;
-	if (!await env.exists(skillsDir)) return {};
-	const skills = {};
-	const entries = await env.readdir(skillsDir);
-	for (const entry of entries) {
-		const skillDir = `${skillsDir}/${entry}`;
-		try {
-			if (!(await env.stat(skillDir)).isDirectory) continue;
-		} catch {
-			continue;
-		}
-		const skillMdPath = `${skillDir}/SKILL.md`;
-		if (!await env.exists(skillMdPath)) continue;
-		const parsed = parseFrontmatterFile(await env.readFile(skillMdPath), entry);
-		skills[parsed.name] = {
-			name: parsed.name,
-			description: parsed.description,
-			instructions: parsed.body
-		};
-	}
-	return skills;
-}
-function composeSystemPrompt(agentsMd, skills, env) {
-	const parts = [];
-	if (agentsMd) parts.push(agentsMd);
-	const skillEntries = Object.values(skills);
-	if (skillEntries.length > 0) {
-		parts.push("", "## Available Skills", "");
-		for (const skill of skillEntries) {
-			const desc = skill.description ? ` - ${skill.description}` : "";
-			parts.push(`- **${skill.name}**${desc}`);
-		}
-	}
-	if (env) {
-		const date = (/* @__PURE__ */ new Date()).toLocaleDateString("en-US", {
-			weekday: "short",
-			year: "numeric",
-			month: "short",
-			day: "numeric"
-		});
-		parts.push("", `Date: ${date}`);
-		parts.push(`Working directory: ${env.cwd}`);
-		if (env.directoryListing && env.directoryListing.length > 0) parts.push("", "Directory structure:", env.directoryListing.join("\n"));
-	}
-	return parts.join("\n");
-}
-/** Discover AGENTS.md, local skills, and directory listing from the session's cwd. */
-async function discoverSessionContext(env) {
-	const cwd = env.cwd;
-	const agentsMd = await readAgentsMd(env, cwd);
-	const skills = await discoverLocalSkills(env, cwd);
-	let directoryListing;
-	try {
-		directoryListing = await env.readdir(cwd);
-	} catch {}
-	return {
-		systemPrompt: composeSystemPrompt(agentsMd, skills, {
-			cwd,
-			directoryListing
-		}),
-		skills
-	};
-}
-
-//#endregion
-//#region src/agent.ts
-const MAX_READ_LINES = 2e3;
-const MAX_READ_BYTES = 50 * 1024;
-const MAX_GREP_MATCHES = 100;
-const MAX_GREP_LINE_LENGTH = 500;
-const MAX_GLOB_RESULTS = 1e3;
-const BUILTIN_TOOL_NAMES = new Set([
-	"read",
-	"write",
-	"edit",
-	"bash",
-	"grep",
-	"glob"
-]);
-function createTools(env) {
-	return [
-		createReadTool(env),
-		createWriteTool(env),
-		createEditTool(env),
-		createBashTool(env),
-		createGrepTool(env),
-		createGlobTool(env)
-	];
-}
-function createReadTool(env) {
-	return {
-		name: "read",
-		label: "Read File",
-		description: "Read a file or list a directory. For files, output is truncated to 2000 lines or 50KB — use offset/limit for large files. For directories, returns the list of entries.",
-		parameters: Type.Object({
-			path: Type.String({ description: "Path to the file to read" }),
-			offset: Type.Optional(Type.Number({ description: "Line number to start from (1-indexed)" })),
-			limit: Type.Optional(Type.Number({ description: "Maximum number of lines to read" }))
-		}),
-		async execute(_toolCallId, params, signal) {
-			throwIfAborted(signal);
-			try {
-				if ((await env.stat(params.path)).isDirectory) {
-					const entries = await env.readdir(params.path);
-					return {
-						content: [{
-							type: "text",
-							text: entries.join("\n") || "(empty directory)"
-						}],
-						details: {
-							path: params.path,
-							isDirectory: true,
-							entries: entries.length
-						}
-					};
-				}
-			} catch {}
-			const allLines = (await env.readFile(params.path)).split("\n");
-			const startLine = params.offset ? Math.max(0, params.offset - 1) : 0;
-			if (startLine >= allLines.length) throw new Error(`Offset ${params.offset} is beyond end of file (${allLines.length} lines total)`);
-			const endLine = params.limit ? startLine + params.limit : allLines.length;
-			const { text: truncatedText, wasTruncated } = truncateHead(allLines.slice(startLine, endLine), MAX_READ_LINES, MAX_READ_BYTES);
-			let output = truncatedText;
-			if (wasTruncated) {
-				const shownEnd = startLine + truncatedText.split("\n").length;
-				output += `\n\n[Showing lines ${startLine + 1}-${shownEnd} of ${allLines.length}. Use offset=${shownEnd + 1} to continue.]`;
-			}
-			return {
-				content: [{
-					type: "text",
-					text: output
-				}],
-				details: {
-					path: params.path,
-					lines: allLines.length
-				}
-			};
-		}
-	};
-}
-function createWriteTool(env) {
-	return {
-		name: "write",
-		label: "Write File",
-		description: "Write content to a file. Creates the file and parent directories if they do not exist.",
-		parameters: Type.Object({
-			path: Type.String({ description: "Path to the file to write" }),
-			content: Type.String({ description: "Content to write to the file" })
-		}),
-		async execute(_toolCallId, params, signal) {
-			throwIfAborted(signal);
-			const resolved = env.resolvePath(params.path);
-			const dir = resolved.replace(/\/[^/]*$/, "");
-			if (dir && dir !== resolved) await env.mkdir(dir, { recursive: true });
-			await env.writeFile(resolved, params.content);
-			return {
-				content: [{
-					type: "text",
-					text: `Successfully wrote ${params.content.length} bytes to ${params.path}`
-				}],
-				details: {
-					path: params.path,
-					size: params.content.length
-				}
-			};
-		}
-	};
-}
-function createEditTool(env) {
-	return {
-		name: "edit",
-		label: "Edit File",
-		description: "Edit a file using exact text replacement. The oldText must match a unique region of the file. Use replaceAll to replace all occurrences.",
-		parameters: Type.Object({
-			path: Type.String({ description: "Path to the file to edit" }),
-			oldText: Type.String({ description: "Exact text to find (must be unique)" }),
-			newText: Type.String({ description: "Replacement text" }),
-			replaceAll: Type.Optional(Type.Boolean({ description: "Replace all occurrences" }))
-		}),
-		async execute(_toolCallId, params, signal) {
-			throwIfAborted(signal);
-			const content = await env.readFile(params.path);
-			if (params.replaceAll) {
-				const newContent = content.replaceAll(params.oldText, params.newText);
-				if (newContent === content) throw new Error(`Could not find the text in ${params.path}. No changes made.`);
-				await env.writeFile(params.path, newContent);
-				const count = content.split(params.oldText).length - 1;
-				return {
-					content: [{
-						type: "text",
-						text: `Replaced ${count} occurrences in ${params.path}`
-					}],
-					details: {
-						path: params.path,
-						replacements: count
-					}
-				};
-			}
-			const occurrences = countOccurrences(content, params.oldText);
-			if (occurrences === 0) throw new Error(`Could not find the exact text in ${params.path}. Make sure your oldText matches exactly, including whitespace and indentation.`);
-			if (occurrences > 1) throw new Error(`Found ${occurrences} occurrences of the text in ${params.path}. Provide more surrounding context to make the match unique, or use replaceAll.`);
-			const newContent = content.replace(params.oldText, params.newText);
-			await env.writeFile(params.path, newContent);
-			return {
-				content: [{
-					type: "text",
-					text: `Successfully edited ${params.path}`
-				}],
-				details: { path: params.path }
-			};
-		}
-	};
-}
-function createBashTool(env) {
-	return {
-		name: "bash",
-		label: "Run Command",
-		description: "Execute a bash command. Returns stdout and stderr. Output is truncated to the last 2000 lines or 50KB.",
-		parameters: Type.Object({
-			command: Type.String({ description: "Bash command to execute" }),
-			timeout: Type.Optional(Type.Number({ description: "Timeout in seconds" }))
-		}),
-		async execute(_toolCallId, params, signal) {
-			throwIfAborted(signal);
-			return formatBashResult(await env.exec(params.command), params.command);
-		}
-	};
-}
-function formatBashResult(result, command) {
-	const { text: output } = truncateTail((result.stdout + (result.stderr ? "\n" + result.stderr : "")).trim(), MAX_READ_LINES, MAX_READ_BYTES);
-	if (result.exitCode !== 0) throw new Error(`${output}\n\nCommand exited with code ${result.exitCode}`);
-	return {
-		content: [{
-			type: "text",
-			text: output || "(no output)"
-		}],
-		details: {
-			command,
-			exitCode: result.exitCode
-		}
-	};
-}
-function createGrepTool(env) {
-	return {
-		name: "grep",
-		label: "Search Files",
-		description: "Search file contents for a regex pattern. Returns matching lines with file paths and line numbers.",
-		parameters: Type.Object({
-			pattern: Type.String({ description: "Search pattern (regex)" }),
-			path: Type.Optional(Type.String({ description: "Directory or file to search (default: .)" })),
-			include: Type.Optional(Type.String({ description: "Glob filter, e.g. \"*.ts\"" }))
-		}),
-		async execute(_toolCallId, params, signal) {
-			throwIfAborted(signal);
-			const searchPath = params.path || ".";
-			let cmd = `grep -rn "${escapeShellArg(params.pattern)}" ${escapeShellArg(searchPath)}`;
-			if (params.include) cmd = `grep -rn --include="${escapeShellArg(params.include)}" "${escapeShellArg(params.pattern)}" ${escapeShellArg(searchPath)}`;
-			const result = await env.exec(cmd);
-			if (result.exitCode === 1 && !result.stdout.trim()) return {
-				content: [{
-					type: "text",
-					text: "No matches found."
-				}],
-				details: { matchCount: 0 }
-			};
-			if (result.exitCode > 1) throw new Error(`grep failed: ${result.stderr}`);
-			const lines = result.stdout.trim().split("\n");
-			let finalOutput = lines.slice(0, MAX_GREP_MATCHES).map((line) => line.length > MAX_GREP_LINE_LENGTH ? line.slice(0, MAX_GREP_LINE_LENGTH) + "..." : line).join("\n");
-			if (lines.length > MAX_GREP_MATCHES) finalOutput += `\n\n[Showing ${MAX_GREP_MATCHES} of ${lines.length} matches. Narrow your search.]`;
-			return {
-				content: [{
-					type: "text",
-					text: finalOutput
-				}],
-				details: { matchCount: Math.min(lines.length, MAX_GREP_MATCHES) }
-			};
-		}
-	};
-}
-function createGlobTool(env) {
-	return {
-		name: "glob",
-		label: "Find Files",
-		description: "Find files by glob pattern. Returns matching file paths.",
-		parameters: Type.Object({
-			pattern: Type.String({ description: "Glob pattern, e.g. \"**/*.ts\"" }),
-			path: Type.Optional(Type.String({ description: "Directory to search in (default: .)" }))
-		}),
-		async execute(_toolCallId, params, signal) {
-			throwIfAborted(signal);
-			const cmd = `find ${escapeShellArg(params.path || ".")} -type f -name "${escapeShellArg(params.pattern)}" 2>/dev/null | head -${MAX_GLOB_RESULTS}`;
-			const result = await env.exec(cmd);
-			if (result.exitCode !== 0 && !result.stdout.trim()) return {
-				content: [{
-					type: "text",
-					text: "No files found matching pattern."
-				}],
-				details: { matchCount: 0 }
-			};
-			const paths = result.stdout.trim().split("\n").filter(Boolean);
-			if (paths.length === 0) return {
-				content: [{
-					type: "text",
-					text: "No files found matching pattern."
-				}],
-				details: { matchCount: 0 }
-			};
-			return {
-				content: [{
-					type: "text",
-					text: paths.join("\n")
-				}],
-				details: { matchCount: paths.length }
-			};
-		}
-	};
-}
-function throwIfAborted(signal) {
-	if (signal?.aborted) throw new Error("Operation aborted");
-}
-function countOccurrences(str, substr) {
-	let count = 0;
-	let pos = str.indexOf(substr, 0);
-	while (pos !== -1) {
-		count++;
-		pos = str.indexOf(substr, pos + substr.length);
-	}
-	return count;
-}
-function escapeShellArg(arg) {
-	return arg.replace(/\\/g, "\\\\").replace(/"/g, "\\\"").replace(/\$/g, "\\$").replace(/`/g, "\\`");
-}
-function truncateHead(lines, maxLines, maxBytes) {
-	let result = "";
-	let lineCount = 0;
-	let wasTruncated = false;
-	for (const line of lines) {
-		if (lineCount >= maxLines) {
-			wasTruncated = true;
-			break;
-		}
-		const next = lineCount === 0 ? line : "\n" + line;
-		if (result.length + next.length > maxBytes) {
-			wasTruncated = true;
-			break;
-		}
-		result += next;
-		lineCount++;
-	}
-	return {
-		text: result,
-		wasTruncated
-	};
-}
-function truncateTail(text, maxLines, maxBytes) {
-	const lines = text.split("\n");
-	if (lines.length <= maxLines && text.length <= maxBytes) return {
-		text,
-		wasTruncated: false
-	};
-	let result = lines.slice(-maxLines).join("\n");
-	if (result.length > maxBytes) result = result.slice(-maxBytes);
-	return {
-		text: result,
-		wasTruncated: true
-	};
-}
-
-//#endregion
 //#region src/compaction.ts
 const DEFAULT_COMPACTION_SETTINGS = {
 	enabled: true,
@@ -936,11 +508,13 @@ var Session = class Session {
 	compactionAbortController;
 	eventCallback;
 	builtinTools;
-	constructor(id, config, env, store, existingData, onAgentEvent) {
+	sessionCommands;
+	constructor(id, config, env, store, existingData, onAgentEvent, sessionCommands) {
 		this.id = id;
 		this.config = config;
 		this.env = env;
 		this.store = store;
+		this.sessionCommands = sessionCommands ?? [];
 		this.metadata = existingData?.metadata ?? {};
 		this.createdAt = existingData?.createdAt;
 		this.lastCompaction = existingData?.lastCompaction;
@@ -1014,8 +588,9 @@ var Session = class Session {
 		const promptWithRole = this.injectRoleInstructions(text, options?.role);
 		const schema = options?.result;
 		const fullPrompt = buildPromptText(promptWithRole, schema);
-		if (options?.commands) this.assertCommandSupport(options.commands);
-		const registeredCommandNames = options?.commands ? this.registerCommands(options.commands) : [];
+		const effectiveCommands = this.mergeCommands(options?.commands);
+		if (effectiveCommands.length > 0) this.assertCommandSupport(effectiveCommands);
+		const registeredCommandNames = this.registerCommands(effectiveCommands);
 		const registeredToolNames = options?.tools ? this.registerCustomTools(options.tools) : [];
 		try {
 			await this.agent.prompt(fullPrompt);
@@ -1044,8 +619,9 @@ var Session = class Session {
 		const schema = options?.result;
 		const skillPrompt = buildSkillPrompt(registeredSkill.instructions, options?.args, schema);
 		const promptWithRole = this.injectRoleInstructions(skillPrompt, options?.role);
-		if (options?.commands) this.assertCommandSupport(options.commands);
-		const registeredCommandNames = options?.commands ? this.registerCommands(options.commands) : [];
+		const effectiveCommands = this.mergeCommands(options?.commands);
+		if (effectiveCommands.length > 0) this.assertCommandSupport(effectiveCommands);
+		const registeredCommandNames = this.registerCommands(effectiveCommands);
 		const registeredToolNames = options?.tools ? this.registerCustomTools(options.tools) : [];
 		try {
 			await this.agent.prompt(promptWithRole);
@@ -1060,8 +636,9 @@ var Session = class Session {
 		}
 	}
 	async shell(command, options) {
-		if (options?.commands) this.assertCommandSupport(options.commands);
-		const registeredNames = options?.commands ? this.registerCommands(options.commands) : [];
+		const effectiveCommands = this.mergeCommands(options?.commands);
+		if (effectiveCommands.length > 0) this.assertCommandSupport(effectiveCommands);
+		const registeredNames = this.registerCommands(effectiveCommands);
 		try {
 			const result = await this.env.exec(command, {
 				env: options?.env,
@@ -1178,6 +755,19 @@ var Session = class Session {
 		if (commands.length === 0) return;
 		if (!this.env.commandSupport) throw new Error("[flue] Cannot use commands: this environment does not support command registration. Commands are only available in isolate sandbox mode. Remote sandboxes handle command execution at the platform level.");
 	}
+	/**
+	* Merge session-wide `commands` (from init()) with per-call commands. When
+	* both define a command with the same name, the per-call entry wins for
+	* that call.
+	*/
+	mergeCommands(perCall) {
+		if (!perCall || perCall.length === 0) return this.sessionCommands;
+		if (this.sessionCommands.length === 0) return perCall;
+		const byName = /* @__PURE__ */ new Map();
+		for (const cmd of this.sessionCommands) byName.set(cmd.name, cmd);
+		for (const cmd of perCall) byName.set(cmd.name, cmd);
+		return Array.from(byName.values());
+	}
 	registerCommands(commands) {
 		if (!this.env.commandSupport || commands.length === 0) return [];
 		const names = [];
@@ -1350,4 +940,4 @@ function normalizePath(p) {
 }
 
 //#endregion
-export { createTools as a, BUILTIN_TOOL_NAMES as i, Session as n, discoverSessionContext as o, normalizePath as r, parseFrontmatterFile as s, InMemorySessionStore as t };
+export { Session as n, normalizePath as r, InMemorySessionStore as t };

package/dist/{types-C97_qJ21.d.mts → types-BZPltYah.d.mts}

@@ -1,5 +1,5 @@
-import { AgentMessage } from "@mariozechner/pi-agent-core";
 import { Model, TSchema } from "@mariozechner/pi-ai";
+import { AgentMessage } from "@mariozechner/pi-agent-core";
 import * as v from "valibot";
 
 //#region src/types.d.ts
@@ -146,6 +146,13 @@ interface SessionInit {
    * Precedence (highest wins): per-call `model` > role `model` > session `model` > build-time default.
    */
   model?: string;
+  /**
+   * Session-wide commands. Every prompt(), skill(), and shell() call inherits
+   * this list. Per-call `commands` are merged on top — if a per-call command
+   * shares a name with a session command, the per-call version wins for that
+   * call.
+   */
+  commands?: Command[];
 }
 interface FlueSession {
   prompt<S extends v.GenericSchema>(text: string, options: PromptOptions<S> & {
@@ -317,7 +324,6 @@ interface BuildContext {
   roles: Record<string, Role>;
   agentDir: string;
   options: BuildOptions;
-  resolveSDKImport: (module: string) => string;
 }
 /** Controls the build output format for a target platform. */
 interface BuildPlugin {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flue/sdk",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "type": "module",
   "license": "Apache-2.0",
   "exports": {
@@ -16,9 +16,17 @@
       "types": "./dist/sandbox.d.mts",
       "import": "./dist/sandbox.mjs"
     },
+    "./internal": {
+      "types": "./dist/internal.d.mts",
+      "import": "./dist/internal.mjs"
+    },
     "./cloudflare": {
       "types": "./dist/cloudflare/index.d.mts",
       "import": "./dist/cloudflare/index.mjs"
+    },
+    "./node": {
+      "types": "./dist/node/index.d.mts",
+      "import": "./dist/node/index.mjs"
     }
   },
   "main": "./dist/index.mjs",