@clinebot/core 0.0.34 → 0.0.35

package/src/extensions/config/agent-config-parser.ts

@@ -1,7 +1,7 @@
 import type { AgentConfig, Tool } from "@clinebot/shared";
 import YAML from "yaml";
 import { z } from "zod";
-import { ALL_DEFAULT_TOOL_NAMES, type DefaultToolName } from "../../tools";
+import { ALL_DEFAULT_TOOL_NAMES, type DefaultToolName } from "../tools/";
 
 const AgentConfigFrontmatterSchema = z.object({
 	name: z.string().trim().min(1),

package/src/extensions/config/hooks-config-loader.ts

@@ -2,12 +2,11 @@ import { existsSync, readdirSync } from "node:fs";
 import { basename, extname, join } from "node:path";
 import {
 	HOOKS_CONFIG_DIRECTORY_NAME,
-	resolveDocumentsHooksDirectoryPath,
 	resolveHooksConfigSearchPaths as resolveHooksConfigSearchPathsFromShared,
 } from "@clinebot/shared/storage";
 import type { HookEventName } from "../../hooks";
 
-export { HOOKS_CONFIG_DIRECTORY_NAME, resolveDocumentsHooksDirectoryPath };
+export { HOOKS_CONFIG_DIRECTORY_NAME };
 
 export function resolveHooksConfigSearchPaths(
 	workspacePath?: string,

package/src/extensions/config/index.ts

@@ -17,7 +17,6 @@ export {
 	resolveAgentConfigSearchPaths,
 	resolveAgentsConfigDirPath,
 	resolveAgentTools,
-	resolveDocumentsAgentConfigDirectoryPath,
 	toPartialAgentConfig,
 } from "./agent-config-loader";
 export {
@@ -26,7 +25,6 @@ export {
 	type HookConfigFileEntry,
 	HookConfigFileName,
 	listHookConfigFiles,
-	resolveDocumentsHooksDirectoryPath,
 	resolveHooksConfigSearchPaths,
 	toHookConfigFileName,
 } from "./hooks-config-loader";
@@ -71,8 +69,6 @@ export {
 	parseSkillConfigFromMarkdown,
 	parseWorkflowConfigFromMarkdown,
 	RULES_CONFIG_DIRECTORY_NAME,
-	resolveDocumentsRulesDirectoryPath,
-	resolveDocumentsWorkflowsDirectoryPath,
 	resolveRulesConfigSearchPaths,
 	resolveSkillsConfigSearchPaths,
 	resolveWorkflowsConfigSearchPaths,

package/src/extensions/config/user-instruction-config-loader.ts

@@ -2,8 +2,6 @@ import { readdir, readFile, stat } from "node:fs/promises";
 import { basename, dirname, extname, join } from "node:path";
 import {
 	RULES_CONFIG_DIRECTORY_NAME,
-	resolveDocumentsRulesDirectoryPath,
-	resolveDocumentsWorkflowsDirectoryPath,
 	resolveRulesConfigSearchPaths as resolveRulesConfigSearchPathsFromShared,
 	resolveSkillsConfigSearchPaths as resolveSkillsConfigSearchPathsFromShared,
 	resolveWorkflowsConfigSearchPaths as resolveWorkflowsConfigSearchPathsFromShared,
@@ -25,8 +23,6 @@ const MARKDOWN_EXTENSIONS = new Set([".md", ".markdown", ".txt"]);
 
 export {
 	RULES_CONFIG_DIRECTORY_NAME,
-	resolveDocumentsRulesDirectoryPath,
-	resolveDocumentsWorkflowsDirectoryPath,
 	SKILLS_CONFIG_DIRECTORY_NAME,
 	WORKFLOWS_CONFIG_DIRECTORY_NAME,
 };

package/src/extensions/plugin/plugin-config-loader.test.ts

@@ -168,10 +168,12 @@ describe("plugin-config-loader", () => {
 				cwd: root,
 			});
 
-			expect(loaded.extensions.map((plugin) => plugin.name)).toEqual([
-				"duplicate-plugin",
-			]);
-			expect(loaded.extensions[0]?.manifest.capabilities).toEqual(["commands"]);
+			// Filter to only our test plugins to ignore any discovered system plugins
+			const testPlugins = loaded.extensions.filter(
+				(plugin) => plugin.name === "duplicate-plugin",
+			);
+			expect(testPlugins).toHaveLength(1);
+			expect(testPlugins[0]?.manifest.capabilities).toEqual(["commands"]);
 			expect(loaded.failures).toHaveLength(1);
 			expect(loaded.warnings).toHaveLength(1);
 			expect(loaded.warnings[0]?.overriddenPluginPath).toBe(first);

package/src/{tools → extensions/tools}/definitions.ts

@@ -81,7 +81,7 @@ export function createReadFilesTool(
 	return createTool<ReadFilesInput, ToolOperationResult[]>({
 		name: "read_files",
 		description:
-			"Read the full content of text files at the provided absolute paths, or return only an inclusive one-based line range when start_line/end_line are provided. " +
+			"Read the full content of text or image files at the provided absolute paths, or return only an inclusive one-based line range when start_line/end_line are provided. " +
 			"Returns file contents or error messages for each path.",
 		inputSchema: zodToJsonSchema(ReadFilesInputSchema),
 		timeoutMs: timeoutMs * 2, // Account for multiple files

package/src/extensions/tools/executors/file-read.test.ts

@@ -0,0 +1,125 @@
+import * as fs from "node:fs/promises";
+import * as os from "node:os";
+import * as path from "node:path";
+import { describe, expect, it } from "vitest";
+import { createFileReadExecutor } from "./file-read";
+
+describe("createFileReadExecutor", () => {
+	it("reads a file from an absolute path", async () => {
+		const dir = await fs.mkdtemp(path.join(os.tmpdir(), "agents-file-read-"));
+		const filePath = path.join(dir, "example.txt");
+		await fs.writeFile(filePath, "hello absolute path", "utf-8");
+
+		try {
+			const readFile = createFileReadExecutor();
+			const result = await readFile(
+				{ path: filePath },
+				{
+					agentId: "agent-1",
+					conversationId: "conv-1",
+					iteration: 1,
+				},
+			);
+			expect(result).toBe("1 | hello absolute path");
+		} finally {
+			await fs.rm(dir, { recursive: true, force: true });
+		}
+	});
+
+	it("returns only the requested inclusive line range", async () => {
+		const dir = await fs.mkdtemp(path.join(os.tmpdir(), "agents-file-read-"));
+		const filePath = path.join(dir, "example.txt");
+		await fs.writeFile(filePath, "alpha\nbeta\ngamma\ndelta", "utf-8");
+
+		try {
+			const readFile = createFileReadExecutor();
+			const result = await readFile(
+				{ path: filePath, start_line: 2, end_line: 3 },
+				{
+					agentId: "agent-1",
+					conversationId: "conv-1",
+					iteration: 1,
+				},
+			);
+			expect(result).toBe("2 | beta\n3 | gamma");
+		} finally {
+			await fs.rm(dir, { recursive: true, force: true });
+		}
+	});
+
+	it("returns image blocks for image files when the model supports images", async () => {
+		const dir = await fs.mkdtemp(path.join(os.tmpdir(), "agents-file-read-"));
+		const filePath = path.join(dir, "example.png");
+		const pngBytes = Buffer.from(
+			"iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z8BQDwAEhQGAhKmMIQAAAABJRU5ErkJggg==",
+			"base64",
+		);
+		await fs.writeFile(filePath, pngBytes);
+
+		try {
+			const readFile = createFileReadExecutor();
+			const result = await readFile(
+				{ path: filePath },
+				{
+					agentId: "agent-1",
+					conversationId: "conv-1",
+					iteration: 1,
+					metadata: {
+						modelSupportsImages: true,
+					},
+				},
+			);
+			expect(result).toEqual([
+				{
+					type: "text",
+					text: "Successfully read image",
+				},
+				{
+					type: "image",
+					data: pngBytes.toString("base64"),
+					mediaType: "image/png",
+				},
+			]);
+		} finally {
+			await fs.rm(dir, { recursive: true, force: true });
+		}
+	});
+
+	it("returns image blocks for gif files when the model supports images", async () => {
+		const dir = await fs.mkdtemp(path.join(os.tmpdir(), "agents-file-read-"));
+		const filePath = path.join(dir, "example.gif");
+		const gifBytes = Buffer.from(
+			"R0lGODdhAQABAIABAP///wAAACwAAAAAAQABAAACAkQBADs=",
+			"base64",
+		);
+		await fs.writeFile(filePath, gifBytes);
+
+		try {
+			const readFile = createFileReadExecutor();
+			const result = await readFile(
+				{ path: filePath },
+				{
+					agentId: "agent-1",
+					conversationId: "conv-1",
+					iteration: 1,
+					metadata: {
+						modelSupportsImages: true,
+					},
+				},
+			);
+			expect(result).toEqual([
+				{
+					type: "text",
+					text: "Successfully read image",
+				},
+				{
+					type: "image",
+					data: gifBytes.toString("base64"),
+					mediaType: "image/gif",
+				},
+			]);
+		} finally {
+			await fs.rm(dir, { recursive: true, force: true });
+		}
+	});
+});

package/src/{tools → extensions/tools}/executors/file-read.ts

@@ -10,6 +10,14 @@ import type { ToolContext } from "@clinebot/shared";
 import type { ReadFileRequest } from "../schemas";
 import type { FileReadExecutor } from "../types";
 
+const IMAGE_MEDIA_TYPES = new Map<string, string>([
+	[".gif", "image/gif"],
+	[".png", "image/png"],
+	[".jpg", "image/jpeg"],
+	[".jpeg", "image/jpeg"],
+	[".webp", "image/webp"],
+]);
+
 /**
  * Options for the file read executor
  */
@@ -60,14 +68,13 @@ export function createFileReadExecutor(
 		...options,
 	};
 
-	return async (
-		request: ReadFileRequest,
-		_context: ToolContext,
-	): Promise<string> => {
+	return async (request: ReadFileRequest, context: ToolContext) => {
 		const { path: filePath, start_line, end_line } = request;
 		const resolvedPath = path.isAbsolute(filePath)
 			? path.normalize(filePath)
 			: path.resolve(process.cwd(), filePath);
+		const extension = path.extname(resolvedPath).toLowerCase();
+		const imageMediaType = IMAGE_MEDIA_TYPES.get(extension);
 
 		// Check if file exists
 		const stat = await fs.stat(resolvedPath);
@@ -84,6 +91,24 @@ export function createFileReadExecutor(
 			);
 		}
 
+		if (imageMediaType) {
+			if (context.metadata?.modelSupportsImages !== true) {
+				throw new Error("Current model does not support image input");
+			}
+			const data = await fs.readFile(resolvedPath);
+			return [
+				{
+					type: "text",
+					text: "Successfully read image",
+				},
+				{
+					type: "image",
+					data: data.toString("base64"),
+					mediaType: imageMediaType,
+				},
+			];
+		}
+
 		// Read file content
 		const content = await fs.readFile(resolvedPath, encoding);
 		const allLines = content.split("\n");

package/src/{tools → extensions/tools}/executors/search.ts

@@ -7,7 +7,7 @@
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import type { ToolContext } from "@clinebot/shared";
-import { getFileIndex } from "../../input";
+import { getFileIndex } from "../../../services/workspace";
 import type { SearchExecutor } from "../types";
 
 /**

package/src/{tools → extensions/tools}/model-tool-routing.ts

@@ -1,4 +1,4 @@
-import type { CoreAgentMode } from "../types/config";
+import type { CoreAgentMode } from "../../types/config";
 import type { DefaultToolName, DefaultToolsConfig } from "./types";
 
 export interface ToolRoutingRule {

package/src/{tools → extensions/tools}/presets.ts

@@ -132,13 +132,12 @@ export const ToolPresets = {
 export type ToolPresetName = keyof typeof ToolPresets;
 
 export function resolveToolPresetName(options: {
-	mode?: "act" | "plan";
-	yolo?: boolean;
+	mode?: "act" | "plan" | "yolo";
 }): ToolPresetName {
 	if (options.mode === "plan") {
 		return "readonly";
 	}
-	return options.yolo === true ? "yolo" : "development";
+	return options.mode === "yolo" ? "yolo" : "development";
 }
 
 /**