@clinebot/core 0.0.28 → 0.0.30

package/src/tools/definitions.test.ts

@@ -187,6 +187,82 @@ describe("default ask_question tool", () => {
 	});
 });
 
+describe("default submit_and_exit tool", () => {
+	it("is excluded by default even when executor is provided", () => {
+		const tools = createDefaultTools({
+			executors: {
+				submit: async () => "ok",
+			},
+		});
+		expect(tools.map((tool) => tool.name)).not.toContain("submit_and_exit");
+	});
+
+	it("is included only when enabled with a submit executor", () => {
+		const toolsWithoutExecutor = createDefaultTools({
+			executors: {},
+			enableSubmitAndExit: true,
+		});
+		expect(toolsWithoutExecutor.map((tool) => tool.name)).not.toContain(
+			"submit_and_exit",
+		);
+
+		const toolsWithExecutor = createDefaultTools({
+			executors: {
+				submit: async () => "ok",
+			},
+			enableSubmitAndExit: true,
+		});
+		expect(toolsWithExecutor.map((tool) => tool.name)).toContain(
+			"submit_and_exit",
+		);
+	});
+
+	it("validates and executes submit_and_exit input", async () => {
+		const execute = vi.fn(async () => "submitted");
+		const tools = createDefaultTools({
+			executors: {
+				submit: execute,
+			},
+			enableReadFiles: false,
+			enableSearch: false,
+			enableBash: false,
+			enableWebFetch: false,
+			enableEditor: false,
+			enableSkills: false,
+			enableAskQuestion: false,
+			enableSubmitAndExit: true,
+		});
+		const submitTool = tools.find((tool) => tool.name === "submit_and_exit");
+		expect(submitTool).toBeDefined();
+		if (!submitTool) {
+			throw new Error("Expected submit_and_exit tool to be defined.");
+		}
+
+		const result = await submitTool.execute(
+			{
+				summary: "Done and verified with the requested checks.",
+				verified: true,
+			},
+			{
+				agentId: "agent-1",
+				conversationId: "conv-1",
+				iteration: 1,
+			},
+		);
+
+		expect(result).toBe("submitted");
+		expect(execute).toHaveBeenCalledWith(
+			"Done and verified with the requested checks.",
+			true,
+			expect.objectContaining({
+				agentId: "agent-1",
+				conversationId: "conv-1",
+				iteration: 1,
+			}),
+		);
+	});
+});
+
 describe("default apply_patch tool", () => {
 	it("is included only when enabled with an applyPatch executor", () => {
 		const toolsWithoutExecutor = createDefaultTools({

package/src/tools/definitions.ts

@@ -4,8 +4,12 @@
  * Factory functions for creating the default tools.
  */
 
-import { createTool, type Tool } from "@clinebot/agents";
-import { validateWithZod, zodToJsonSchema } from "@clinebot/shared";
+import {
+	createTool,
+	type Tool,
+	validateWithZod,
+	zodToJsonSchema,
+} from "@clinebot/shared";
 import {
 	formatError,
 	formatReadFileQuery,
@@ -37,6 +41,8 @@ import {
 	SkillsInputSchema,
 	type StructuredCommandInput,
 	StructuredCommandsInputUnionSchema,
+	type SubmitInput,
+	SubmitInputSchema,
 } from "./schemas";
 import type {
 	ApplyPatchExecutor,
@@ -49,6 +55,7 @@ import type {
 	SearchExecutor,
 	SkillsExecutorWithMetadata,
 	ToolOperationResult,
+	VerifySubmitExecutor,
 	WebFetchExecutor,
 } from "./types";
 
@@ -603,6 +610,34 @@ export function createAskQuestionTool(
 	});
 }
 
+export function createSubmitAndExitTool(
+	executor: VerifySubmitExecutor,
+	config: Pick<DefaultToolsConfig, "submitTimeoutMs"> = {},
+): Tool<SubmitInput, string> {
+	const timeoutMs = config.submitTimeoutMs ?? 15000;
+
+	return createTool<SubmitInput, string>({
+		name: "submit_and_exit",
+		description:
+			"Submit the final answer and exit the conversation. " +
+			"For example, submit a summary of the investigation and confirm the issue is resolved. " +
+			"You should only submit once all necessary steps are completed. " +
+			"Provide a summary of the investigation and confirm the issue is resolved.",
+		inputSchema: zodToJsonSchema(SubmitInputSchema),
+		timeoutMs,
+		retryable: false,
+		maxRetries: 0,
+		execute: async (input, context) => {
+			const validatedInput = validateWithZod(SubmitInputSchema, input);
+			return withTimeout(
+				executor(validatedInput.summary, validatedInput.verified, context),
+				timeoutMs,
+				`submit_and_exit timed out after ${timeoutMs}ms`,
+			);
+		},
+	});
+}
+
 // =============================================================================
 // Default Tools Factory
 // =============================================================================
@@ -657,6 +692,7 @@ export function createDefaultTools(options: CreateDefaultToolsOptions): Tool[] {
 		enableEditor = true,
 		enableSkills = true,
 		enableAskQuestion = true,
+		enableSubmitAndExit = false,
 		...config
 	} = options;
 
@@ -703,6 +739,9 @@ export function createDefaultTools(options: CreateDefaultToolsOptions): Tool[] {
 	// Add ask_question tool if enabled and executor provided
 	if (enableAskQuestion && executors.askQuestion) {
 		tools.push(createAskQuestionTool(executors.askQuestion, config));
+	} else if (enableSubmitAndExit && executors.submit) {
+		// Add submit_and_exit tool if enabled and executor provided
+		tools.push(createSubmitAndExitTool(executors.submit, config));
 	}
 
 	return tools;

package/src/tools/executors/apply-patch.ts

@@ -6,7 +6,7 @@
 
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
-import type { ToolContext } from "@clinebot/agents";
+import type { ToolContext } from "@clinebot/shared";
 import type { ApplyPatchInput } from "../schemas";
 import type { ApplyPatchExecutor } from "../types";
 import {

package/src/tools/executors/editor.ts

@@ -6,7 +6,7 @@
 
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
-import type { ToolContext } from "@clinebot/agents";
+import type { ToolContext } from "@clinebot/shared";
 import type { EditFileInput } from "../schemas";
 import type { EditorExecutor } from "../types";
 

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

@@ -6,7 +6,7 @@
 
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
-import type { ToolContext } from "@clinebot/agents";
+import type { ToolContext } from "@clinebot/shared";
 import type { ReadFileRequest } from "../schemas";
 import type { FileReadExecutor } from "../types";
 

package/src/tools/executors/search.ts

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

package/src/tools/executors/web-fetch.ts

@@ -4,7 +4,7 @@
  * Built-in implementation for fetching web content using native fetch.
  */
 
-import type { ToolContext } from "@clinebot/agents";
+import type { ToolContext } from "@clinebot/shared";
 import type { WebFetchExecutor } from "../types";
 
 /**

package/src/tools/index.ts

@@ -18,6 +18,7 @@ export {
 	createReadFilesTool,
 	createSearchTool,
 	createSkillsTool,
+	createSubmitAndExitTool,
 	createWebFetchTool,
 	createWindowsShellTool,
 } from "./definitions";
@@ -47,6 +48,7 @@ export {
 export {
 	createDefaultToolsWithPreset,
 	createToolPoliciesWithPreset,
+	resolveToolPresetName,
 	type ToolPolicyPresetName,
 	type ToolPresetName,
 	ToolPresets,
@@ -71,6 +73,8 @@ export {
 	SearchCodebaseInputSchema,
 	type SkillsInput,
 	SkillsInputSchema,
+	type SubmitInput,
+	SubmitInputSchema,
 	type WebFetchRequest,
 	WebFetchRequestSchema,
 } from "./schemas";
@@ -90,6 +94,7 @@ export type {
 	SkillsExecutorWithMetadata,
 	ToolExecutors,
 	ToolOperationResult,
+	VerifySubmitExecutor,
 	WebFetchExecutor,
 } from "./types";
 
@@ -97,7 +102,7 @@ export type {
 // Convenience: Create Tools with Built-in Executors
 // =============================================================================
 
-import type { Tool } from "@clinebot/agents";
+import type { Tool } from "@clinebot/shared";
 import { createDefaultTools } from "./definitions";
 import {
 	createDefaultExecutors,

package/src/tools/model-tool-routing.ts

@@ -43,6 +43,7 @@ const TOOL_NAME_TO_FLAG: Record<
 		| "enableEditor"
 		| "enableSkills"
 		| "enableAskQuestion"
+		| "enableSubmitAndExit"
 	>
 > = {
 	read_files: "enableReadFiles",
@@ -53,6 +54,7 @@ const TOOL_NAME_TO_FLAG: Record<
 	editor: "enableEditor",
 	skills: "enableSkills",
 	ask_question: "enableAskQuestion",
+	submit_and_exit: "enableSubmitAndExit",
 };
 
 export const DEFAULT_MODEL_TOOL_ROUTING_RULES: ToolRoutingRule[] = [

package/src/tools/presets.test.ts

@@ -14,6 +14,14 @@ describe("default tool presets", () => {
 		expect(ToolPresets.yolo.enableAskQuestion).toBe(false);
 	});
 
+	it("disables spawn and team tools by default in yolo mode", () => {
+		expect(ToolPresets.development.enableSpawnAgent).toBe(true);
+		expect(ToolPresets.development.enableAgentTeams).toBe(true);
+		expect(ToolPresets.yolo.enableSpawnAgent).toBe(false);
+		expect(ToolPresets.yolo.enableAgentTeams).toBe(false);
+		expect(ToolPresets.yolo.enableSubmitAndExit).toBe(true);
+	});
+
 	it("yolo preset excludes ask_question even when its executor exists", () => {
 		const tools = createDefaultToolsWithPreset("yolo", {
 			executors: {

package/src/tools/presets.ts

@@ -9,6 +9,11 @@ import { ALL_DEFAULT_TOOL_NAMES } from "./constants";
 import { createDefaultTools } from "./definitions";
 import type { CreateDefaultToolsOptions, DefaultToolsConfig } from "./types";
 
+export interface ToolPresetConfig extends DefaultToolsConfig {
+	enableSpawnAgent?: boolean;
+	enableAgentTeams?: boolean;
+}
+
 /**
  * Preset configurations for common use cases
  */
@@ -25,6 +30,9 @@ export const ToolPresets = {
 		enableEditor: false,
 		enableSkills: true,
 		enableAskQuestion: true,
+		enableSubmitAndExit: false,
+		enableSpawnAgent: true,
+		enableAgentTeams: true,
 	},
 
 	/**
@@ -40,6 +48,9 @@ export const ToolPresets = {
 		enableEditor: false,
 		enableSkills: false,
 		enableAskQuestion: false,
+		enableSubmitAndExit: false,
+		enableSpawnAgent: true,
+		enableAgentTeams: true,
 	},
 
 	/**
@@ -55,6 +66,9 @@ export const ToolPresets = {
 		enableEditor: true,
 		enableSkills: true,
 		enableAskQuestion: true,
+		enableSubmitAndExit: true,
+		enableSpawnAgent: true,
+		enableAgentTeams: true,
 	},
 
 	/**
@@ -70,6 +84,9 @@ export const ToolPresets = {
 		enableEditor: false,
 		enableSkills: true,
 		enableAskQuestion: true,
+		enableSubmitAndExit: false,
+		enableSpawnAgent: true,
+		enableAgentTeams: true,
 	},
 
 	/**
@@ -85,6 +102,9 @@ export const ToolPresets = {
 		enableEditor: false,
 		enableSkills: false,
 		enableAskQuestion: true,
+		enableSubmitAndExit: false,
+		enableSpawnAgent: false,
+		enableAgentTeams: false,
 	},
 
 	/**
@@ -100,14 +120,27 @@ export const ToolPresets = {
 		enableEditor: true,
 		enableSkills: true,
 		enableAskQuestion: false,
+		enableSubmitAndExit: true,
+		enableSpawnAgent: false,
+		enableAgentTeams: false,
 	},
-} as const satisfies Record<string, DefaultToolsConfig>;
+} as const satisfies Record<string, ToolPresetConfig>;
 
 /**
  * Type for preset names
  */
 export type ToolPresetName = keyof typeof ToolPresets;
 
+export function resolveToolPresetName(options: {
+	mode?: "act" | "plan";
+	yolo?: boolean;
+}): ToolPresetName {
+	if (options.mode === "plan") {
+		return "readonly";
+	}
+	return options.yolo === true ? "yolo" : "development";
+}
+
 /**
  * Tool policy preset names
  */
@@ -161,8 +194,13 @@ export function createDefaultToolsWithPreset(
 		Partial<DefaultToolsConfig>,
 ): Tool[] {
 	const preset = ToolPresets[presetName];
+	const {
+		enableSpawnAgent: _enableSpawnAgent,
+		enableAgentTeams: _enableAgentTeams,
+		...toolConfig
+	} = preset;
 	return createDefaultTools({
-		...preset,
+		...toolConfig,
 		...options,
 	});
 }

package/src/tools/schemas.ts

@@ -269,6 +269,20 @@ export const AskQuestionInputSchema = z.object({
 		),
 });
 
+export const SubmitInputSchema = z.object({
+	summary: z
+		.string()
+		.min(10)
+		.describe(
+			"Summarization of the investigation, steps taken, and resolution status to submit at the end of the session. Before submitting, read the problem again along with any provided test's assertions carefully and confirm your fix produces the expected output.",
+		),
+	verified: z
+		.boolean()
+		.describe(
+			`Have you verified that the issue is resolved to the best of your knowledge, including updating and creating all the requested files and items? 'True' if you have completed the investigation and taken all necessary steps to resolve the issue.\n'False' if you have done all you can but cannot resolve the issue or if you are stuck and cannot proceed further. =\nIMPORTANT: You must run the specific failing test(s) mentioned in the issue or test patch and include the test output in your reasoning. If the test still fails after your fix, you must revise. Do NOT submit with 'true' unless the test output shows the test passing.`,
+		),
+});
+
 // =============================================================================
 // Type Definitions (derived from Zod schemas)
 // =============================================================================
@@ -325,3 +339,8 @@ export type SkillsInput = z.infer<typeof SkillsInputSchema>;
  * Input for the ask_followup_question tool
  */
 export type AskQuestionInput = z.infer<typeof AskQuestionInputSchema>;
+
+/**
+ * Input for the submit and exit tool
+ */
+export type SubmitInput = z.infer<typeof SubmitInputSchema>;

package/src/tools/types.ts

@@ -4,7 +4,7 @@
  * Type definitions for executors, configuration, and results.
  */
 
-import type { ToolContext } from "@clinebot/agents";
+import type { ToolContext } from "@clinebot/shared";
 import type {
 	ApplyPatchInput,
 	EditFileInput,
@@ -172,6 +172,20 @@ export interface SkillsExecutorWithMetadata {
 	configuredSkills?: SkillsExecutorSkillMetadata[];
 }
 
+/**
+ * Executor for verifying a user's response to a question
+ *
+ * @param summary - Summary of the solution ans steps taken
+ * @param verified - Boolean indicating if the solution has been verified
+ * @param context - Tool execution context
+ * @returns Executor-specific result payload
+ */
+export type VerifySubmitExecutor = (
+	summary: string,
+	verified: boolean,
+	context: ToolContext,
+) => Promise<string>;
+
 /**
  * Collection of all tool executors
  */
@@ -192,6 +206,8 @@ export interface ToolExecutors {
 	skills?: SkillsExecutorWithMetadata;
 	/** Follow-up question implementation */
 	askQuestion?: AskQuestionExecutor;
+	/** Final submission implementation */
+	submit?: VerifySubmitExecutor;
 }
 
 // =============================================================================
@@ -209,7 +225,8 @@ export type DefaultToolName =
 	| "apply_patch"
 	| "editor"
 	| "skills"
-	| "ask_question";
+	| "ask_question"
+	| "submit_and_exit";
 
 /**
  * Configuration for enabling/disabling default tools
@@ -263,6 +280,12 @@ export interface DefaultToolsConfig {
 	 */
 	enableAskQuestion?: boolean;
 
+	/**
+	 * Enable the submit_and_exit tool
+	 * @default false
+	 */
+	enableSubmitAndExit?: boolean;
+
 	/**
 	 * Current working directory for tools that need it
 	 */
@@ -315,6 +338,12 @@ export interface DefaultToolsConfig {
 	 * @default 15000
 	 */
 	askQuestionTimeoutMs?: number;
+
+	/**
+	 * Timeout for submit_and_exit operations in milliseconds
+	 * @default 15000
+	 */
+	submitTimeoutMs?: number;
 }
 
 /**

package/src/types/config.ts

@@ -1,21 +1,21 @@
+import type * as LlmsProviders from "@clinebot/llms";
 import type {
 	AgentConfig,
 	AgentHooks,
+	AgentMode,
+	BasicLogger,
 	ConsecutiveMistakeLimitContext,
 	ConsecutiveMistakeLimitDecision,
+	ExtensionContext,
 	HookErrorMode,
-	TeamEvent,
-	Tool,
-} from "@clinebot/agents";
-import type * as LlmsProviders from "@clinebot/llms/providers";
-import type {
-	AgentMode,
-	BasicLogger,
 	ITelemetryService,
+	MessageWithMetadata,
 	SessionExecutionConfig,
 	SessionPromptConfig,
 	SessionWorkspaceConfig,
+	Tool,
 } from "@clinebot/shared";
+import type { TeamEvent } from "../team";
 import type { ToolRoutingRule } from "../tools/model-tool-routing";
 
 export type CoreAgentMode = AgentMode;
@@ -42,6 +42,57 @@ export interface CoreRuntimeFeatures {
 	enableTools: boolean;
 	enableSpawnAgent: boolean;
 	enableAgentTeams: boolean;
+	yolo?: boolean;
+}
+
+export interface CoreCompactionContext {
+	agentId: string;
+	conversationId: string;
+	parentAgentId: string | null;
+	iteration: number;
+	messages: MessageWithMetadata[];
+	model: {
+		id: string;
+		provider: string;
+		info?: LlmsProviders.ModelInfo;
+	};
+	contextWindowTokens: number;
+	triggerTokens: number;
+	thresholdRatio: number;
+	utilizationRatio: number;
+}
+
+export interface CoreCompactionResult {
+	messages: MessageWithMetadata[];
+}
+
+export interface CoreCompactionSummarizerConfig {
+	providerId: string;
+	modelId: string;
+	apiKey?: string;
+	baseUrl?: string;
+	headers?: Record<string, string>;
+	knownModels?: Record<string, LlmsProviders.ModelInfo>;
+	providerConfig?: LlmsProviders.ProviderConfig;
+	maxOutputTokens?: number;
+}
+
+export type CoreCompactionStrategy = "basic" | "agentic";
+
+export interface CoreCompactionConfig {
+	enabled?: boolean;
+	strategy?: CoreCompactionStrategy;
+	thresholdRatio?: number;
+	reserveTokens?: number;
+	preserveRecentTokens?: number;
+	contextWindowTokens?: number;
+	summarizer?: CoreCompactionSummarizerConfig;
+	compact?: (
+		context: CoreCompactionContext,
+	) =>
+		| Promise<CoreCompactionResult | undefined>
+		| CoreCompactionResult
+		| undefined;
 }
 
 export interface CoreSessionConfig
@@ -67,10 +118,12 @@ export interface CoreSessionConfig
 	hookErrorMode?: HookErrorMode;
 	logger?: BasicLogger;
 	telemetry?: ITelemetryService;
+	extensionContext?: ExtensionContext;
 	extraTools?: Tool[];
 	pluginPaths?: string[];
 	extensions?: AgentConfig["extensions"];
 	execution?: AgentConfig["execution"];
+	compaction?: CoreCompactionConfig;
 	onTeamEvent?: (event: TeamEvent) => void;
 	onConsecutiveMistakeLimitReached?: (
 		context: ConsecutiveMistakeLimitContext,
@@ -83,4 +136,5 @@ export interface CoreSessionConfig
 	 * skills are surfaced in tool metadata and invocable by name.
 	 */
 	skills?: string[];
+	workspaceMetadata?: string;
 }

package/src/types/events.ts

@@ -60,7 +60,7 @@ export type CoreSessionEvent =
 			type: "agent_event";
 			payload: {
 				sessionId: string;
-				event: import("@clinebot/agents").AgentEvent;
+				event: import("@clinebot/shared").AgentEvent;
 			};
 	  }
 	| { type: "team_progress"; payload: SessionTeamProgressEvent }

package/src/types/index.ts

@@ -21,4 +21,3 @@ export type {
 } from "./provider-settings";
 export type { SessionRecord, SessionRef } from "./sessions";
 export type { ArtifactStore, SessionStore, TeamStore } from "./storage";
-export type { WorkspaceInfo } from "./workspace";

package/src/types/provider-settings.ts

@@ -1,4 +1,4 @@
-import * as LlmsProviders from "@clinebot/llms/providers";
+import * as LlmsProviders from "@clinebot/llms";
 import { z } from "zod";
 
 export type ProviderConfig = LlmsProviders.ProviderConfig;

package/src/types/storage.ts

@@ -1,8 +1,5 @@
-import type {
-	TeamEvent,
-	TeamRuntimeState,
-	TeamTeammateSpec,
-} from "@clinebot/agents";
+import type { TeamRuntimeState, TeamTeammateSpec } from "@clinebot/shared";
+import type { TeamEvent } from "../team";
 import type { SessionStatus } from "./common";
 import type { SessionRecord } from "./sessions";