@clinebot/core 0.0.34 → 0.0.35

package/src/index.ts

@@ -61,14 +61,16 @@ export type {
 	WorkspaceManifestSchema,
 } from "@clinebot/shared";
 export {
+	buildClineSystemPrompt as getClineDefaultSystemPrompt,
 	ContributionRegistry,
 	createContributionRegistry,
 	createTool,
+	formatDisplayUserInput,
 	noopBasicLogger,
 	normalizeUserInput,
+	parseUserCommandEnvelope,
 	RPC_TEAM_LIFECYCLE_EVENT_TYPE,
 	RPC_TEAM_PROGRESS_EVENT_TYPE,
-	resolveHookLogPath,
 } from "@clinebot/shared";
 export * from "@clinebot/shared/storage";
 export {
@@ -151,23 +153,9 @@ export type {
 export {
 	ClineCore,
 	type ClineCoreOptions,
+	type ClineCoreStartInput,
 	type RpcOptions,
 } from "./ClineCore";
-export type {
-	ChatMessage,
-	ChatSessionConfig,
-	ChatSessionStatus,
-	ChatSummary,
-	ChatViewState,
-} from "./chat/chat-schema";
-export {
-	ChatMessageRoleSchema,
-	ChatMessageSchema,
-	ChatSessionConfigSchema,
-	ChatSessionStatusSchema,
-	ChatSummarySchema,
-	ChatViewStateSchema,
-} from "./chat/chat-schema";
 export type {
 	LoadAgentPluginFromPathOptions,
 	PluginInitializationFailure,
@@ -232,9 +220,6 @@ export {
 	parseWorkflowConfigFromMarkdown,
 	RULES_CONFIG_DIRECTORY_NAME,
 	resolveAgentTools,
-	resolveDocumentsHooksDirectoryPath,
-	resolveDocumentsRulesDirectoryPath,
-	resolveDocumentsWorkflowsDirectoryPath,
 	resolveHooksConfigSearchPaths,
 	resolveRulesConfigSearchPaths,
 	resolveRuntimeSlashCommandFromWatcher,
@@ -280,6 +265,36 @@ export {
 	resolveDefaultMcpSettingsPath,
 	resolveMcpServerRegistrations,
 } from "./extensions/mcp";
+export {
+	type AgentTask,
+	AgentTeam,
+	AgentTeamsRuntime,
+	type AgentTeamsRuntimeOptions,
+	type BootstrapAgentTeamsOptions,
+	type BootstrapAgentTeamsResult,
+	bootstrapAgentTeams,
+	buildDelegatedAgentConfig,
+	buildTeamProgressSummary,
+	type CreateAgentTeamsToolsOptions,
+	createAgentTeamsTools,
+	createDelegatedAgent,
+	createDelegatedAgentConfigProvider,
+	createSpawnAgentTool,
+	type DelegatedAgentConfigProvider,
+	type DelegatedAgentConnectionConfig,
+	type DelegatedAgentKind,
+	type DelegatedAgentRuntimeConfig,
+	reviveTeamStateDates,
+	type SpawnTeammateOptions,
+	type SubAgentEndContext,
+	type SubAgentStartContext,
+	sanitizeTeamName,
+	type TaskResult,
+	type TeamEvent,
+	type TeamMemberConfig,
+	type TeamTeammateRuntimeConfig,
+	toTeamProgressLifecycleEvent,
+} from "./extensions/tools/team";
 export {
 	createPersistentSubprocessHooks,
 	createSubprocessHooks,
@@ -301,65 +316,16 @@ export {
 	type SubprocessHookControl,
 	type SubprocessHooksOptions,
 } from "./hooks";
-export type {
-	FastFileIndexOptions,
-	MentionEnricherOptions,
-	MentionEnrichmentResult,
-} from "./input";
-export {
-	enrichPromptWithMentions,
-	getFileIndex,
-	prewarmFileIndex,
-} from "./input";
-export { getClineDefaultSystemPrompt } from "./prompt/default-system";
-export {
-	addLocalProvider,
-	type DeleteLocalProviderRequest,
-	deleteLocalProvider,
-	ensureCustomProvidersLoaded,
-	getLocalProviderModels,
-	listLocalProviders,
-	loginLocalProvider,
-	normalizeOAuthProvider,
-	resolveLocalClineAuthToken,
-	saveLocalProviderOAuthCredentials,
-	saveLocalProviderSettings,
-	type UpdateLocalProviderRequest,
-	updateLocalProvider,
-} from "./providers/local-provider-service";
 export type {
 	CheckpointEntry,
 	CheckpointMetadata,
-} from "./runtime/checkpoint-hooks";
-export {
-	formatRulesForSystemPrompt,
-	isRuleEnabled,
-	listEnabledRulesFromWatcher,
-	loadRulesForSystemPromptFromWatcher,
-} from "./runtime/rules";
-export {
-	createTeamName,
-	DefaultRuntimeBuilder,
-} from "./runtime/runtime-builder";
-export type {
-	BuiltRuntime,
-	RuntimeBuilder,
-	RuntimeBuilderInput,
-	SessionRuntime,
-	TeamToolsFactory,
-	TeamToolsFactoryOptions,
-	TeamToolsFactoryResult,
-} from "./runtime/session-runtime";
+} from "./hooks/checkpoint-hooks";
+export type { SessionBackend } from "./runtime/host";
 export {
-	type SandboxCallOptions,
-	SubprocessSandbox,
-	type SubprocessSandboxOptions,
-} from "./runtime/subprocess-sandbox";
-export {
-	type DesktopToolApprovalOptions,
-	requestDesktopToolApproval,
-} from "./runtime/tool-approval";
-export { DefaultSessionManager } from "./session/default-session-manager";
+	createRuntimeHost,
+	createRuntimeHost as createSessionHost,
+	resolveSessionBackend,
+} from "./runtime/host";
 export {
 	clearRpcDiscoveryIfAddressMatches,
 	type EnsureRpcRuntimeOptions,
@@ -372,109 +338,86 @@ export {
 	RPC_STARTUP_LOCK_BYPASS_ENV,
 	type RpcDiscoveryRecord,
 	type RpcOwnerContext,
+	type RpcStartupLockHandle,
 	recordRpcDiscovery,
 	resolveEnsuredRpcRuntime,
 	resolveRpcOwnerContext,
 	resolveRpcRuntimeBuildKey,
 	waitForCompatibleRpcRuntime,
 	withRpcStartupLock,
-} from "./session/rpc-runtime-ensure";
-export { RpcCoreSessionService } from "./session/rpc-session-service";
+} from "./runtime/rpc-runtime-ensure";
 export {
 	type RpcSpawnLease,
 	tryAcquireRpcSpawnLease,
-} from "./session/rpc-spawn-lease";
+} from "./runtime/rpc-spawn-lease";
 export {
-	deriveSubsessionStatus,
-	makeSubSessionId,
-	makeTeamTaskSubSessionId,
-	sanitizeSessionToken,
-} from "./session/session-graph";
-export type {
-	SessionBackend,
-	SessionHost,
-} from "./session/session-host";
+	formatRulesForSystemPrompt,
+	isRuleEnabled,
+	listEnabledRulesFromWatcher,
+	loadRulesForSystemPromptFromWatcher,
+} from "./runtime/rules";
 export {
-	createSessionHost,
-	resolveSessionBackend,
-} from "./session/session-host";
+	createTeamName,
+	DefaultRuntimeBuilder,
+} from "./runtime/runtime-builder";
 export type {
+	RuntimeHost,
+	RuntimeHost as SessionHost,
+	RuntimeHostMode,
 	SendSessionInput,
 	SessionAccumulatedUsage,
-	SessionManager,
 	StartSessionInput,
 	StartSessionResult,
-} from "./session/session-manager";
-export type { SessionManifest } from "./session/session-manifest";
+} from "./runtime/runtime-host";
+export { splitCoreSessionConfig } from "./runtime/runtime-host";
 export type {
-	CreateRootSessionWithArtifactsInput,
-	RootSessionArtifacts,
-} from "./session/session-service";
-export { CoreSessionService } from "./session/session-service";
+	BuiltRuntime,
+	RuntimeBuilder,
+	RuntimeBuilderInput,
+	SessionRuntime,
+	TeamToolsFactory,
+	TeamToolsFactoryOptions,
+	TeamToolsFactoryResult,
+} from "./runtime/session-runtime";
 export {
-	createSqliteRpcSessionBackend,
-	SqliteRpcSessionBackend,
-	type SqliteRpcSessionBackendOptions,
-} from "./session/sqlite-rpc-session-backend";
+	type SandboxCallOptions,
+	SubprocessSandbox,
+	type SubprocessSandboxOptions,
+} from "./runtime/subprocess-sandbox";
 export {
-	accumulateUsageTotals,
-	createInitialAccumulatedUsage,
-} from "./session/utils/usage";
-export type {
-	WorkspaceManager,
-	WorkspaceManagerEvent,
-} from "./session/workspace-manager";
-export { InMemoryWorkspaceManager } from "./session/workspace-manager";
+	type DesktopToolApprovalOptions,
+	requestDesktopToolApproval,
+} from "./runtime/tool-approval";
 export {
-	buildWorkspaceMetadata,
-	generateWorkspaceInfo,
-	normalizeWorkspacePath,
-} from "./session/workspace-manifest";
+	addLocalProvider,
+	type DeleteLocalProviderRequest,
+	deleteLocalProvider,
+	ensureCustomProvidersLoaded,
+	getLocalProviderModels,
+	listLocalProviders,
+	loginLocalProvider,
+	normalizeOAuthProvider,
+	resolveLocalClineAuthToken,
+	saveLocalProviderOAuthCredentials,
+	saveLocalProviderSettings,
+	type UpdateLocalProviderRequest,
+	updateLocalProvider,
+} from "./services/providers/local-provider-service";
 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";
+} from "./services/storage/provider-settings-legacy-migration";
+export { ProviderSettingsManager } from "./services/storage/provider-settings-manager";
+export { SqliteSessionStore } from "./services/storage/sqlite-session-store";
 export {
 	SqliteTeamStore,
 	type SqliteTeamStoreOptions,
-} from "./storage/team-store";
-export {
-	type AgentTask,
-	AgentTeam,
-	AgentTeamsRuntime,
-	type AgentTeamsRuntimeOptions,
-	type BootstrapAgentTeamsOptions,
-	type BootstrapAgentTeamsResult,
-	bootstrapAgentTeams,
-	buildDelegatedAgentConfig,
-	buildTeamProgressSummary,
-	type CreateAgentTeamsToolsOptions,
-	createAgentTeamsTools,
-	createDelegatedAgent,
-	createDelegatedAgentConfigProvider,
-	createSpawnAgentTool,
-	type DelegatedAgentConfigProvider,
-	type DelegatedAgentConnectionConfig,
-	type DelegatedAgentKind,
-	type DelegatedAgentRuntimeConfig,
-	reviveTeamStateDates,
-	type SpawnTeammateOptions,
-	type SubAgentEndContext,
-	type SubAgentStartContext,
-	sanitizeTeamName,
-	type TaskResult,
-	type TeamEvent,
-	type TeamMemberConfig,
-	type TeamTeammateRuntimeConfig,
-	toTeamProgressLifecycleEvent,
-} from "./team";
+} from "./services/storage/team-store";
 export type {
 	TelemetryAgentIdentityProperties,
 	TelemetryAgentKind,
-} from "./telemetry/core-events";
+} from "./services/telemetry/core-events";
 export {
 	CORE_TELEMETRY_EVENTS,
 	captureAgentCreated,
@@ -499,28 +442,85 @@ export {
 	captureTokenUsage,
 	captureToolUsage,
 	identifyAccount,
-} from "./telemetry/core-events";
-export type { ITelemetryAdapter } from "./telemetry/ITelemetryAdapter";
+} from "./services/telemetry/core-events";
+export type { ITelemetryAdapter } from "./services/telemetry/ITelemetryAdapter";
 export {
 	type CreateOpenTelemetryTelemetryServiceOptions,
 	createConfiguredTelemetryService,
 	createOpenTelemetryTelemetryService,
 	OpenTelemetryProvider,
 	type OpenTelemetryProviderOptions,
-} from "./telemetry/OpenTelemetryProvider";
+} from "./services/telemetry/OpenTelemetryProvider";
 export {
 	TelemetryLoggerSink,
 	type TelemetryLoggerSinkOptions,
-} from "./telemetry/TelemetryLoggerSink";
+} from "./services/telemetry/TelemetryLoggerSink";
+export {
+	accumulateUsageTotals,
+	createInitialAccumulatedUsage,
+} from "./services/usage";
+export type {
+	FastFileIndexOptions,
+	MentionEnricherOptions,
+	MentionEnrichmentResult,
+} from "./services/workspace";
+export {
+	enrichPromptWithMentions,
+	getFileIndex,
+	prewarmFileIndex,
+} from "./services/workspace";
+export {
+	buildWorkspaceMetadata,
+	generateWorkspaceInfo,
+	normalizeWorkspacePath,
+} from "./services/workspace-manifest";
+export { RpcCoreSessionService } from "./session/rpc-session-service";
+export {
+	deriveSubsessionStatus,
+	makeSubSessionId,
+	makeTeamTaskSubSessionId,
+	sanitizeSessionToken,
+} from "./session/session-graph";
+export type { SessionManifest } from "./session/session-manifest";
+export type {
+	CreateRootSessionWithArtifactsInput,
+	RootSessionArtifacts,
+	SessionRow,
+} 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 { LocalRuntimeHost } from "./transports/local";
+export { RpcRuntimeHost } from "./transports/rpc";
+export type {
+	ChatMessage,
+	ChatSessionConfig,
+	ChatSessionStatus,
+	ChatSummary,
+	ChatViewState,
+} from "./types/chat-schema";
+export {
+	ChatMessageRoleSchema,
+	ChatMessageSchema,
+	ChatSessionConfigSchema,
+	ChatSessionStatusSchema,
+	ChatSummarySchema,
+	ChatViewStateSchema,
+} from "./types/chat-schema";
+export type { SessionMessagesArtifactUploader } from "./types/session";
 export { CORE_BUILD_VERSION } from "./version";
 export async function loadOpenTelemetryAdapter() {
-	return import("./telemetry/index.js");
+	return import("./services/telemetry/index.js");
 }
 export { createContextCompactionPrepareTurn } from "./extensions/context/compaction";
-export {
-	TelemetryService,
-	type TelemetryServiceOptions,
-} from "./telemetry/TelemetryService";
 export {
 	ALL_DEFAULT_TOOL_NAMES,
 	type AskQuestionExecutor,
@@ -539,7 +539,11 @@ export {
 	type ToolPolicyPresetName,
 	type ToolPresetName,
 	ToolPresets,
-} from "./tools";
+} from "./extensions/tools";
+export {
+	TelemetryService,
+	type TelemetryServiceOptions,
+} from "./services/telemetry/TelemetryService";
 // Compatibility barrel (legacy imports).
 export type { RuntimeEnvironment } from "./types";
 export type { SessionStatus } from "./types/common";
@@ -574,5 +578,10 @@ export {
 	StoredProviderSettingsEntrySchema,
 	StoredProviderSettingsSchema,
 } from "./types/provider-settings";
-export type { SessionRecord, SessionRef } from "./types/sessions";
+export type {
+	SessionHistoryMetadata,
+	SessionHistoryRecord,
+	SessionRecord,
+	SessionRef,
+} from "./types/sessions";
 export type { ArtifactStore, SessionStore, TeamStore } from "./types/storage";

package/src/runtime/history.test.ts

@@ -0,0 +1,114 @@
+import { describe, expect, it, vi } from "vitest";
+import type { SessionRecord } from "../types/sessions";
+import { hydrateSessionHistory } from "./history";
+
+function createRow(
+	overrides: Partial<SessionRecord> & Pick<SessionRecord, "sessionId">,
+): SessionRecord {
+	return {
+		source: "cli",
+		pid: 1,
+		startedAt: "2026-04-21T02:17:46.169Z",
+		status: "completed",
+		interactive: false,
+		provider: "",
+		model: "",
+		cwd: "/tmp/workspace",
+		workspaceRoot: "/tmp/workspace",
+		enableTools: true,
+		enableSpawn: false,
+		enableTeams: false,
+		isSubagent: false,
+		updatedAt: "2026-04-21T02:17:46.169Z",
+		...overrides,
+	};
+}
+
+describe("hydrateSessionHistory", () => {
+	it("preserves rows that already have history display metadata", async () => {
+		const readMessages = vi.fn();
+		const rows = await hydrateSessionHistory({ readMessages }, [
+			createRow({
+				sessionId: "sess_1",
+				provider: "cline",
+				model: "anthropic/claude-sonnet-4.6",
+				prompt: "hello",
+				metadata: {
+					title: "hello",
+					totalCost: 0.02,
+				},
+			}),
+		]);
+
+		expect(rows).toEqual([
+			expect.objectContaining({
+				sessionId: "sess_1",
+				provider: "cline",
+				model: "anthropic/claude-sonnet-4.6",
+				metadata: expect.objectContaining({
+					title: "hello",
+					totalCost: 0.02,
+				}),
+			}),
+		]);
+		expect(readMessages).not.toHaveBeenCalled();
+	});
+
+	it("hydrates missing provider, model, and cost from stored messages", async () => {
+		const readMessages = vi.fn().mockResolvedValue([
+			{
+				role: "user",
+				content: [{ type: "text", text: "hello" }],
+			},
+			{
+				role: "assistant",
+				content: [{ type: "text", text: "hi" }],
+				modelInfo: {
+					provider: "cline",
+					id: "anthropic/claude-sonnet-4.6",
+				},
+				metrics: {
+					cost: 0.02,
+				},
+			},
+		]);
+
+		const [row] = await hydrateSessionHistory({ readMessages }, [
+			createRow({
+				sessionId: "sess_2",
+				prompt: "hello",
+				metadata: {},
+			}),
+		]);
+
+		expect(readMessages).toHaveBeenCalledWith("sess_2");
+		expect(row).toMatchObject({
+			sessionId: "sess_2",
+			provider: "cline",
+			model: "anthropic/claude-sonnet-4.6",
+			metadata: {
+				title: "hello",
+				totalCost: 0.02,
+			},
+		});
+	});
+
+	it("falls back to nested metadata provider/model ids before reading messages", async () => {
+		const readMessages = vi.fn().mockResolvedValue([]);
+
+		const [row] = await hydrateSessionHistory({ readMessages }, [
+			createRow({
+				sessionId: "sess_3",
+				metadata: {
+					title: "hello",
+					provider: { id: "cline" },
+					model: { id: "anthropic/claude-haiku-4.5" },
+				},
+			}),
+		]);
+
+		expect(row.provider).toBe("cline");
+		expect(row.model).toBe("anthropic/claude-haiku-4.5");
+		expect(readMessages).toHaveBeenCalledWith("sess_3");
+	});
+});