@clinebot/core 0.0.0 → 0.0.3

package/src/session/utils/helpers.ts

@@ -0,0 +1,148 @@
+import type { AgentConfig, AgentEvent, AgentResult } from "@clinebot/agents";
+import type { providers as LlmsProviders } from "@clinebot/llms";
+import type { SessionSource } from "../../types/common";
+import type { SessionRecord } from "../../types/sessions";
+import { nowIso } from "../session-artifacts";
+import type { SessionRowShape } from "../session-service";
+import type { StoredMessageWithMetadata } from "./types";
+
+const WORKSPACE_CONFIGURATION_MARKER = "# Workspace Configuration";
+
+export function extractWorkspaceMetadataFromSystemPrompt(
+	systemPrompt: string,
+): string | undefined {
+	const markerIndex = systemPrompt.lastIndexOf(WORKSPACE_CONFIGURATION_MARKER);
+	if (markerIndex < 0) {
+		return undefined;
+	}
+	const metadata = systemPrompt.slice(markerIndex).trim();
+	return metadata.length > 0 ? metadata : undefined;
+}
+
+export function hasRuntimeHooks(hooks: AgentConfig["hooks"]): boolean {
+	if (!hooks) {
+		return false;
+	}
+	return Object.values(hooks).some((value) => typeof value === "function");
+}
+
+export function mergeAgentExtensions(
+	explicitExtensions: AgentConfig["extensions"] | undefined,
+	loadedExtensions: AgentConfig["extensions"] | undefined,
+): AgentConfig["extensions"] {
+	const merged = [...(explicitExtensions ?? []), ...(loadedExtensions ?? [])];
+	if (merged.length === 0) {
+		return undefined;
+	}
+	const deduped: NonNullable<AgentConfig["extensions"]> = [];
+	const seenNames = new Set<string>();
+	for (const extension of merged) {
+		if (seenNames.has(extension.name)) {
+			continue;
+		}
+		seenNames.add(extension.name);
+		deduped.push(extension);
+	}
+	return deduped;
+}
+
+export function serializeAgentEvent(event: AgentEvent): string {
+	return JSON.stringify(event, (_key, value) => {
+		if (value instanceof Error) {
+			return {
+				name: value.name,
+				message: value.message,
+				stack: value.stack,
+			};
+		}
+		return value;
+	});
+}
+
+export function withLatestAssistantTurnMetadata(
+	messages: LlmsProviders.Message[],
+	result: AgentResult,
+): StoredMessageWithMetadata[] {
+	const next = messages.map((message) => ({
+		...message,
+	})) as StoredMessageWithMetadata[];
+	const assistantIndex = [...next]
+		.reverse()
+		.findIndex((message) => message.role === "assistant");
+	if (assistantIndex === -1) {
+		return next;
+	}
+
+	const targetIndex = next.length - 1 - assistantIndex;
+	const target = next[targetIndex];
+	const usage = result.usage;
+	next[targetIndex] = {
+		...target,
+		providerId: target.providerId ?? result.model.provider,
+		modelId: target.modelId ?? result.model.id,
+		modelInfo: target.modelInfo ?? {
+			id: result.model.id,
+			provider: result.model.provider,
+		},
+		metrics: {
+			...(target.metrics ?? {}),
+			inputTokens: usage.inputTokens,
+			outputTokens: usage.outputTokens,
+			cacheReadTokens: usage.cacheReadTokens,
+			cacheWriteTokens: usage.cacheWriteTokens,
+			cost: usage.totalCost,
+		},
+		ts: target.ts ?? result.endedAt.getTime(),
+	};
+	return next;
+}
+
+export function toSessionRecord(row: SessionRowShape): SessionRecord {
+	const metadata =
+		typeof row.metadata_json === "string" && row.metadata_json.trim().length > 0
+			? (() => {
+					try {
+						const parsed = JSON.parse(row.metadata_json) as unknown;
+						if (
+							parsed &&
+							typeof parsed === "object" &&
+							!Array.isArray(parsed)
+						) {
+							return parsed as Record<string, unknown>;
+						}
+					} catch {
+						// Ignore malformed metadata payloads.
+					}
+					return undefined;
+				})()
+			: undefined;
+	return {
+		sessionId: row.session_id,
+		source: row.source as SessionSource,
+		pid: row.pid,
+		startedAt: row.started_at,
+		endedAt: row.ended_at ?? null,
+		exitCode: row.exit_code ?? null,
+		status: row.status,
+		interactive: row.interactive === 1,
+		provider: row.provider,
+		model: row.model,
+		cwd: row.cwd,
+		workspaceRoot: row.workspace_root,
+		teamName: row.team_name ?? undefined,
+		enableTools: row.enable_tools === 1,
+		enableSpawn: row.enable_spawn === 1,
+		enableTeams: row.enable_teams === 1,
+		parentSessionId: row.parent_session_id ?? undefined,
+		parentAgentId: row.parent_agent_id ?? undefined,
+		agentId: row.agent_id ?? undefined,
+		conversationId: row.conversation_id ?? undefined,
+		isSubagent: row.is_subagent === 1,
+		prompt: row.prompt ?? undefined,
+		metadata,
+		transcriptPath: row.transcript_path,
+		hookPath: row.hook_path,
+		messagesPath: row.messages_path ?? undefined,
+		updatedAt: row.updated_at ?? nowIso(),
+	};
+}

package/src/session/utils/types.ts

@@ -0,0 +1,46 @@
+import type { Agent } from "@clinebot/agents";
+import type { providers as LlmsProviders } from "@clinebot/llms";
+import type { BuiltRuntime } from "../../runtime/session-runtime";
+import type { SessionSource } from "../../types/common";
+import type { CoreSessionConfig } from "../../types/config";
+import type { SessionAccumulatedUsage } from "../session-manager";
+import type { RootSessionArtifacts } from "../session-service";
+
+export type ActiveSession = {
+	sessionId: string;
+	config: CoreSessionConfig;
+	artifacts?: RootSessionArtifacts;
+	source: SessionSource;
+	startedAt: string;
+	pendingPrompt?: string;
+	runtime: BuiltRuntime;
+	agent: Agent;
+	started: boolean;
+	aborting: boolean;
+	interactive: boolean;
+	activeTeamRunIds: Set<string>;
+	pendingTeamRunUpdates: TeamRunUpdate[];
+	teamRunWaiters: Array<() => void>;
+	pluginSandboxShutdown?: () => Promise<void>;
+	turnUsageBaseline?: SessionAccumulatedUsage;
+};
+
+export type TeamRunUpdate = {
+	runId: string;
+	agentId: string;
+	taskId?: string;
+	status: "completed" | "failed" | "cancelled" | "interrupted";
+	error?: string;
+	iterations?: number;
+};
+
+export type StoredMessageWithMetadata = LlmsProviders.MessageWithMetadata & {
+	providerId?: string;
+	modelId?: string;
+};
+
+export type PreparedTurnInput = {
+	prompt: string;
+	userImages?: string[];
+	userFiles?: string[];
+};

package/src/session/utils/usage.ts

@@ -0,0 +1,32 @@
+import type { SessionAccumulatedUsage } from "../session-manager";
+
+export function createInitialAccumulatedUsage(): SessionAccumulatedUsage {
+	return {
+		inputTokens: 0,
+		outputTokens: 0,
+		cacheReadTokens: 0,
+		cacheWriteTokens: 0,
+		totalCost: 0,
+	};
+}
+
+export function accumulateUsageTotals(
+	baseline: SessionAccumulatedUsage,
+	usage: {
+		inputTokens?: number;
+		outputTokens?: number;
+		cacheReadTokens?: number;
+		cacheWriteTokens?: number;
+		totalCost?: number;
+	},
+): SessionAccumulatedUsage {
+	return {
+		inputTokens: baseline.inputTokens + Math.max(0, usage.inputTokens ?? 0),
+		outputTokens: baseline.outputTokens + Math.max(0, usage.outputTokens ?? 0),
+		cacheReadTokens:
+			baseline.cacheReadTokens + Math.max(0, usage.cacheReadTokens ?? 0),
+		cacheWriteTokens:
+			baseline.cacheWriteTokens + Math.max(0, usage.cacheWriteTokens ?? 0),
+		totalCost: baseline.totalCost + Math.max(0, usage.totalCost ?? 0),
+	};
+}

package/src/storage/provider-settings-legacy-migration.test.ts

@@ -19,7 +19,7 @@ describe("migrateLegacyProviderSettings", () => {
 			path.join(os.tmpdir(), "core-legacy-provider-"),
 		);
 		tempDirs.push(tempDir);
-		const providersPath = path.join(tempDir, "settings", "providers.json");
+		const providersPath = path.join(tempDir, "provider-settings.json");
 		const manager = new ProviderSettingsManager({ filePath: providersPath });
 
 		writeFileSync(
@@ -72,7 +72,7 @@ describe("migrateLegacyProviderSettings", () => {
 			path.join(os.tmpdir(), "core-legacy-provider-"),
 		);
 		tempDirs.push(tempDir);
-		const providersPath = path.join(tempDir, "settings", "providers.json");
+		const providersPath = path.join(tempDir, "provider-settings.json");
 		const manager = new ProviderSettingsManager({ filePath: providersPath });
 
 		manager.saveProviderSettings({
@@ -119,7 +119,7 @@ describe("migrateLegacyProviderSettings", () => {
 			path.join(os.tmpdir(), "core-legacy-provider-"),
 		);
 		tempDirs.push(tempDir);
-		const providersPath = path.join(tempDir, "settings", "providers.json");
+		const providersPath = path.join(tempDir, "provider-settings.json");
 		const manager = new ProviderSettingsManager({ filePath: providersPath });
 
 		writeFileSync(

package/src/storage/provider-settings-manager.test.ts

@@ -45,6 +45,40 @@ describe("ProviderSettingsManager", () => {
 		expect(reloaded.read().providers.anthropic?.tokenSource).toBe("manual");
 	});
 
+	it("migrates legacy provider settings during manager construction", () => {
+		const tempDir = mkdtempSync(
+			path.join(os.tmpdir(), "core-provider-settings-"),
+		);
+		tempDirs.push(tempDir);
+		const filePath = path.join(tempDir, "settings", "providers.json");
+
+		writeFileSync(
+			path.join(tempDir, "globalState.json"),
+			JSON.stringify(
+				{
+					mode: "act",
+					actModeApiProvider: "anthropic",
+					actModeApiModelId: "claude-sonnet-4-6",
+				},
+				null,
+				2,
+			),
+		);
+		writeFileSync(
+			path.join(tempDir, "secrets.json"),
+			JSON.stringify({ apiKey: "legacy-key" }, null, 2),
+		);
+
+		const manager = new ProviderSettingsManager({ filePath, dataDir: tempDir });
+
+		expect(manager.getLastUsedProviderSettings()).toEqual({
+			provider: "anthropic",
+			model: "claude-sonnet-4-6",
+			apiKey: "legacy-key",
+		});
+		expect(manager.read().providers.anthropic?.tokenSource).toBe("migration");
+	});
+
 	it("tracks provider-specific settings while preserving last-used provider", () => {
 		const tempDir = mkdtempSync(
 			path.join(os.tmpdir(), "core-provider-settings-"),

package/src/storage/provider-settings-manager.ts

@@ -1,5 +1,5 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { dirname } from "node:path";
+import { basename, dirname } from "node:path";
 import { resolveProviderSettingsPath } from "@clinebot/shared/storage";
 import {
 	emptyStoredProviderSettings,
@@ -11,6 +11,7 @@ import {
 	StoredProviderSettingsSchema,
 	toProviderConfig,
 } from "../types/provider-settings";
+import { migrateLegacyProviderSettings } from "./provider-settings-legacy-migration";
 
 function nowIso(): string {
 	return new Date().toISOString();
@@ -18,6 +19,7 @@ function nowIso(): string {
 
 export interface ProviderSettingsManagerOptions {
 	filePath?: string;
+	dataDir?: string;
 }
 
 export interface SaveProviderSettingsOptions {
@@ -25,11 +27,30 @@ export interface SaveProviderSettingsOptions {
 	tokenSource?: ProviderTokenSource;
 }
 
+function inferLegacyDataDir(filePath: string): string | undefined {
+	if (basename(filePath) !== "providers.json") {
+		return undefined;
+	}
+	const settingsDir = dirname(filePath);
+	if (basename(settingsDir) !== "settings") {
+		return undefined;
+	}
+	return dirname(settingsDir);
+}
+
 export class ProviderSettingsManager {
 	private readonly filePath: string;
+	private readonly dataDir?: string;
 
 	constructor(options: ProviderSettingsManagerOptions = {}) {
 		this.filePath = options.filePath ?? resolveProviderSettingsPath();
+		this.dataDir = options.dataDir ?? inferLegacyDataDir(this.filePath);
+		if (this.dataDir || !options.filePath) {
+			migrateLegacyProviderSettings({
+				providerSettingsManager: this,
+				dataDir: this.dataDir,
+			});
+		}
 	}
 
 	getFilePath(): string {

package/src/types/config.ts

@@ -1,6 +1,8 @@
 import type {
 	AgentConfig,
 	AgentHooks,
+	ConsecutiveMistakeLimitContext,
+	ConsecutiveMistakeLimitDecision,
 	HookErrorMode,
 	TeamEvent,
 	Tool,
@@ -13,6 +15,7 @@ import type {
 	SessionPromptConfig,
 	SessionWorkspaceConfig,
 } from "@clinebot/shared";
+import type { ToolRoutingRule } from "../default-tools/model-tool-routing.js";
 
 export type CoreAgentMode = AgentMode;
 
@@ -28,6 +31,10 @@ export interface CoreModelConfig {
 	 * Request model-side thinking/reasoning when supported.
 	 */
 	thinking?: boolean;
+	/**
+	 * Explicit reasoning effort override for capable models.
+	 */
+	reasoningEffort?: LlmsProviders.ProviderConfig["reasoningEffort"];
 }
 
 export interface CoreRuntimeFeatures {
@@ -61,4 +68,10 @@ export interface CoreSessionConfig
 	pluginPaths?: string[];
 	extensions?: AgentConfig["extensions"];
 	onTeamEvent?: (event: TeamEvent) => void;
+	onConsecutiveMistakeLimitReached?: (
+		context: ConsecutiveMistakeLimitContext,
+	) =>
+		| Promise<ConsecutiveMistakeLimitDecision>
+		| ConsecutiveMistakeLimitDecision;
+	toolRoutingRules?: ToolRoutingRule[];
 }

package/src/types.ts

@@ -84,6 +84,7 @@ export type {
 } from "./session/session-host";
 export type {
 	SendSessionInput,
+	SessionAccumulatedUsage,
 	SessionManager,
 	StartSessionInput,
 	StartSessionResult,

package/dist/server/index.d.ts

@@ -1,47 +0,0 @@
-/**
- * @clinebot/core/server
- *
- * Node/runtime services for host applications (CLI, desktop runtime, servers).
- */
-export { type ClineAccountBalance, type ClineAccountOperations, type ClineAccountOrganization, type ClineAccountOrganizationBalance, type ClineAccountOrganizationUsageTransaction, type ClineAccountPaymentTransaction, ClineAccountService, type ClineAccountServiceOptions, type ClineAccountUsageTransaction, type ClineAccountUser, executeRpcClineAccountAction, isRpcClineAccountActionRequest, RpcClineAccountService, type RpcProviderActionExecutor, } from "../account";
-export type { AgentConfigWatcher, AgentConfigWatcherEvent, AgentYamlConfig, BuildAgentConfigOverridesOptions, CreateAgentConfigWatcherOptions, CreateInstructionWatcherOptions, CreateRulesConfigDefinitionOptions, CreateSkillsConfigDefinitionOptions, CreateUserInstructionConfigWatcherOptions, CreateWorkflowsConfigDefinitionOptions, HookConfigFileEntry, LoadAgentPluginFromPathOptions, ParseMarkdownFrontmatterResult, ParseYamlFrontmatterResult, ResolveAgentPluginPathsOptions, RuleConfig, SkillConfig, UnifiedConfigDefinition, UnifiedConfigFileCandidate, UnifiedConfigFileContext, UnifiedConfigRecord, UnifiedConfigWatcherEvent, UnifiedConfigWatcherOptions, UserInstructionConfig, UserInstructionConfigType, UserInstructionConfigWatcher, UserInstructionConfigWatcherEvent, WorkflowConfig, } from "../agents";
-export { createAgentConfigDefinition, createAgentConfigWatcher, createRulesConfigDefinition, createSkillsConfigDefinition, createUserInstructionConfigWatcher, createWorkflowsConfigDefinition, discoverPluginModulePaths, HOOK_CONFIG_FILE_EVENT_MAP, HOOKS_CONFIG_DIRECTORY_NAME, HookConfigFileName, listHookConfigFiles, loadAgentPluginFromPath, loadAgentPluginsFromPaths, parseAgentConfigFromYaml, parsePartialAgentConfigFromYaml, parseRuleConfigFromMarkdown, parseSkillConfigFromMarkdown, parseWorkflowConfigFromMarkdown, RULES_CONFIG_DIRECTORY_NAME, resolveAgentPluginPaths, resolveAgentTools, resolveAndLoadAgentPlugins, resolveDocumentsHooksDirectoryPath, resolveDocumentsRulesDirectoryPath, resolveDocumentsWorkflowsDirectoryPath, resolveHooksConfigSearchPaths, resolvePluginConfigSearchPaths, resolveRulesConfigSearchPaths, resolveSkillsConfigSearchPaths, resolveWorkflowsConfigSearchPaths, SKILLS_CONFIG_DIRECTORY_NAME, toHookConfigFileName, toPartialAgentConfig, UnifiedConfigFileWatcher, WORKFLOWS_CONFIG_DIRECTORY_NAME, } from "../agents";
-export { createOAuthClientCallbacks, type OAuthClientCallbacksOptions, } from "../auth/client";
-export { createClineOAuthProvider, getValidClineCredentials, loginClineOAuth, refreshClineToken, } from "../auth/cline";
-export { getValidOpenAICodexCredentials, isOpenAICodexTokenExpired, loginOpenAICodex, normalizeOpenAICodexCredentials, openaiCodexOAuthProvider, refreshOpenAICodexToken, } from "../auth/codex";
-export { createOcaOAuthProvider, createOcaRequestHeaders, DEFAULT_EXTERNAL_IDCS_CLIENT_ID, DEFAULT_EXTERNAL_IDCS_SCOPES, DEFAULT_EXTERNAL_IDCS_URL, DEFAULT_EXTERNAL_OCA_BASE_URL, DEFAULT_INTERNAL_IDCS_CLIENT_ID, DEFAULT_INTERNAL_IDCS_SCOPES, DEFAULT_INTERNAL_IDCS_URL, DEFAULT_INTERNAL_OCA_BASE_URL, generateOcaOpcRequestId, getValidOcaCredentials, loginOcaOAuth, OCI_HEADER_OPC_REQUEST_ID, refreshOcaToken, } from "../auth/oca";
-export { startLocalOAuthServer } from "../auth/server";
-export type { OAuthCredentials, OAuthLoginCallbacks, OAuthPrompt, OAuthProviderInterface, OcaClientMetadata, OcaMode, OcaOAuthConfig, OcaOAuthEnvironmentConfig, OcaOAuthProviderOptions, OcaTokenResolution, } from "../auth/types";
-export { ALL_DEFAULT_TOOL_NAMES, type AskQuestionExecutor, type CreateBuiltinToolsOptions, type CreateDefaultToolsOptions, createBuiltinTools, createDefaultExecutors, createDefaultTools, createDefaultToolsWithPreset, createToolPoliciesWithPreset, type DefaultExecutorsOptions, type DefaultToolName, DefaultToolNames, type DefaultToolsConfig, type ToolExecutors, type ToolPolicyPresetName, type ToolPresetName, ToolPresets, } from "../default-tools";
-export type { FastFileIndexOptions, MentionEnricherOptions, MentionEnrichmentResult, } from "../input";
-export { enrichPromptWithMentions, getFileIndex, prewarmFileIndex, } from "../input";
-export type { LoadMcpSettingsOptions, McpConnectionStatus, McpManager, McpManagerOptions, McpServerClient, McpServerClientFactory, McpServerRegistration, McpServerSnapshot, McpServerTransportConfig, McpSettingsFile, McpSseTransportConfig, McpStdioTransportConfig, McpStreamableHttpTransportConfig, RegisterMcpServersFromSettingsOptions, } from "../mcp";
-export { hasMcpSettingsFile, InMemoryMcpManager, loadMcpSettingsFile, registerMcpServersFromSettingsFile, resolveDefaultMcpSettingsPath, resolveMcpServerRegistrations, } from "../mcp";
-export { formatRulesForSystemPrompt, isRuleEnabled, listEnabledRulesFromWatcher, loadRulesForSystemPromptFromWatcher, } from "../runtime/rules";
-export { createTeamName, DefaultRuntimeBuilder, } from "../runtime/runtime-builder";
-export { type SandboxCallOptions, SubprocessSandbox, type SubprocessSandboxOptions, } from "../runtime/sandbox/subprocess-sandbox";
-export type { BuiltRuntime, RuntimeBuilder, RuntimeBuilderInput, SessionRuntime, } from "../runtime/session-runtime";
-export { type DesktopToolApprovalOptions, requestDesktopToolApproval, } from "../runtime/tool-approval";
-export type { AvailableWorkflow } from "../runtime/workflows";
-export { listAvailableWorkflowsFromWatcher, resolveWorkflowSlashCommandFromWatcher, } from "../runtime/workflows";
-export { DefaultSessionManager } from "../session/default-session-manager";
-export { RpcCoreSessionService } from "../session/rpc-session-service";
-export { deriveSubsessionStatus, makeSubSessionId, makeTeamTaskSubSessionId, sanitizeSessionToken, } from "../session/session-graph";
-export type { CreateSessionHostOptions, SessionHost, } from "../session/session-host";
-export { createSessionHost } from "../session/session-host";
-export type { SendSessionInput, SessionManager, StartSessionInput, StartSessionResult, } from "../session/session-manager";
-export type { SessionManifest } from "../session/session-manifest";
-export type { CreateRootSessionWithArtifactsInput, RootSessionArtifacts, } from "../session/session-service";
-export { CoreSessionService } from "../session/session-service";
-export { createSqliteRpcSessionBackend, SqliteRpcSessionBackend, type SqliteRpcSessionBackendOptions, } from "../session/sqlite-rpc-session-backend";
-export type { WorkspaceManager, WorkspaceManagerEvent, } from "../session/workspace-manager";
-export { InMemoryWorkspaceManager } from "../session/workspace-manager";
-export type { WorkspaceManifest } from "../session/workspace-manifest";
-export { buildWorkspaceMetadata, emptyWorkspaceManifest, generateWorkspaceInfo, normalizeWorkspacePath, upsertWorkspaceInfo, WorkspaceInfoSchema, WorkspaceManifestSchema, } from "../session/workspace-manifest";
-export { type MigrateLegacyProviderSettingsOptions, type MigrateLegacyProviderSettingsResult, migrateLegacyProviderSettings, } from "../storage/provider-settings-legacy-migration";
-export { ProviderSettingsManager } from "../storage/provider-settings-manager";
-export { SqliteSessionStore } from "../storage/sqlite-session-store";
-export type { SessionStatus } from "../types/common";
-export { SESSION_STATUSES, SessionSource } from "../types/common";
-export type { CoreAgentMode, CoreModelConfig, CoreRuntimeFeatures, CoreSessionConfig, } from "../types/config";
-export type { WorkspaceInfo } from "../types/workspace";