@clinebot/core 0.0.34 → 0.0.35

package/src/session/session-service.ts

@@ -9,16 +9,20 @@ import {
 } from "node:fs";
 import { join } from "node:path";
 import type { TeamTeammateSpec } from "@clinebot/shared";
-import { resolveTeamDataDir } from "@clinebot/shared/storage";
-import type { SqliteSessionStore } from "../storage/sqlite-session-store";
-import type { AgentTeamsRuntime, TeamEvent } from "../team";
+import {
+	resolveSessionDataDir,
+	resolveTeamDataDir,
+} from "@clinebot/shared/storage";
+import type { AgentTeamsRuntime, TeamEvent } from "../extensions/tools/team";
+import { nowIso } from "../services/session-artifacts";
+import type { SqliteSessionStore } from "../services/storage/sqlite-session-store";
 import type { SessionSource, SessionStatus } from "../types/common";
+import type { SessionMessagesArtifactUploader } from "../types/session";
 import type {
 	PersistedSessionUpdateInput,
 	SessionPersistenceAdapter,
 } from "./persistence-service";
 import { UnifiedSessionPersistenceService } from "./persistence-service";
-import { nowIso } from "./session-artifacts";
 import type { SessionManifest } from "./session-manifest";
 
 export interface SessionRow {
@@ -46,8 +50,7 @@ export interface SessionRow {
 	isSubagent: boolean;
 	prompt?: string | null;
 	metadata?: Record<string, unknown> | null;
-	transcriptPath: string;
-	hookPath: string;
+	hookPath?: string;
 	messagesPath?: string | null;
 	updatedAt: string;
 }
@@ -68,8 +71,6 @@ export interface CreateRootSessionInput {
 	enableTeams: boolean;
 	prompt?: string;
 	metadata?: Record<string, unknown>;
-	transcriptPath: string;
-	hookPath: string;
 	messagesPath: string;
 }
 
@@ -93,8 +94,6 @@ export interface CreateRootSessionWithArtifactsInput {
 
 export interface RootSessionArtifacts {
 	manifestPath: string;
-	transcriptPath: string;
-	hookPath: string;
 	messagesPath: string;
 	manifest: SessionManifest;
 }
@@ -135,7 +134,6 @@ const SESSION_SELECT_COLUMNS = `
 	is_subagent    AS isSubagent,
 	prompt,
 	metadata_json  AS metadata,
-	transcript_path AS transcriptPath,
 	hook_path       AS hookPath,
 	messages_path   AS messagesPath,
 	updated_at      AS updatedAt`;
@@ -386,10 +384,16 @@ export class FileTeamPersistenceStore {
 }
 
 class LocalSessionPersistenceAdapter implements SessionPersistenceAdapter {
-	constructor(private readonly store: SqliteSessionStore) {}
+	constructor(
+		private readonly store: SqliteSessionStore,
+		private readonly sessionsDirPath: string = resolveSessionDataDir(),
+	) {}
 
 	ensureSessionsDir(): string {
-		return this.store.ensureSessionsDir();
+		if (!existsSync(this.sessionsDirPath)) {
+			mkdirSync(this.sessionsDirPath, { recursive: true });
+		}
+		return this.sessionsDirPath;
 	}
 
 	async upsertSession(row: SessionRow): Promise<void> {
@@ -425,8 +429,8 @@ class LocalSessionPersistenceAdapter implements SessionPersistenceAdapter {
 				row.isSubagent ? 1 : 0,
 				row.prompt ?? null,
 				stringifyMetadata(row.metadata),
-				row.transcriptPath,
-				row.hookPath,
+				"",
+				row.hookPath ?? "",
 				row.messagesPath ?? null,
 				row.updatedAt,
 			],
@@ -623,8 +627,17 @@ class LocalSessionPersistenceAdapter implements SessionPersistenceAdapter {
 }
 
 export class CoreSessionService extends UnifiedSessionPersistenceService {
-	constructor(private readonly store: SqliteSessionStore) {
-		super(new LocalSessionPersistenceAdapter(store));
+	constructor(
+		private readonly store: SqliteSessionStore,
+		options: {
+			sessionArtifactsDir?: string;
+			messagesArtifactUploader?: SessionMessagesArtifactUploader;
+		} = {},
+	) {
+		super(
+			new LocalSessionPersistenceAdapter(store, options.sessionArtifactsDir),
+			options,
+		);
 	}
 
 	createRootSession(input: CreateRootSessionInput): void {
@@ -660,8 +673,8 @@ export class CoreSessionService extends UnifiedSessionPersistenceService {
 				0,
 				input.prompt ?? null,
 				input.metadata ? JSON.stringify(input.metadata) : null,
-				input.transcriptPath,
-				input.hookPath,
+				"",
+				"",
 				input.messagesPath,
 				nowIso(),
 			],

package/src/session/session-team-coordination.ts

@@ -1,11 +1,15 @@
-import { type AgentResult, formatUserInputBlock } from "@clinebot/shared";
-import type { TeamEvent } from "../team";
+import {
+	type AgentMode,
+	type AgentResult,
+	formatUserInputBlock,
+} from "@clinebot/shared";
+import type { TeamEvent } from "../extensions/tools/team";
 import {
 	buildTeamProgressSummary,
 	toTeamProgressLifecycleEvent,
-} from "../team";
+} from "../extensions/tools/team";
 import type { CoreSessionEvent } from "../types/events";
-import type { ActiveSession, TeamRunUpdate } from "./utils/types";
+import type { ActiveSession, TeamRunUpdate } from "../types/session";
 
 export function trackTeamRunState(
 	session: ActiveSession,
@@ -227,7 +231,10 @@ export function buildTeamRunContinuationPrompt(
 
 export function formatModePrompt(
 	prompt: string,
-	mode: "act" | "plan" | undefined,
+	mode: AgentMode | undefined,
 ): string {
-	return formatUserInputBlock(prompt, mode === "plan" ? "plan" : "act");
+	return formatUserInputBlock(
+		prompt,
+		mode === "plan" ? "plan" : mode === "yolo" ? "yolo" : "act",
+	);
 }

package/src/session/sqlite-rpc-session-backend.ts

@@ -12,7 +12,7 @@ import {
 	nowIso,
 	toBoolInt,
 } from "@clinebot/shared/db";
-import { SqliteSessionStore } from "../storage/sqlite-session-store";
+import { SqliteSessionStore } from "../services/storage/sqlite-session-store";
 
 export interface SqliteRpcSessionBackendOptions {
 	sessionsDir?: string;
@@ -62,8 +62,8 @@ export class SqliteRpcSessionBackend implements RpcSessionBackend {
 				toBoolInt(row.isSubagent),
 				row.prompt ?? null,
 				row.metadata ? JSON.stringify(row.metadata) : null,
-				row.transcriptPath,
-				row.hookPath,
+				"",
+				"",
 				row.messagesPath ?? null,
 				row.updatedAt || nowIso(),
 			],
@@ -75,7 +75,7 @@ export class SqliteRpcSessionBackend implements RpcSessionBackend {
 			`SELECT session_id, source, pid, started_at, ended_at, exit_code, status, status_lock, interactive,
 				provider, model, cwd, workspace_root, team_name, enable_tools, enable_spawn, enable_teams,
 				parent_session_id, parent_agent_id, agent_id, conversation_id, is_subagent, prompt,
-				metadata_json, transcript_path, hook_path, messages_path, updated_at
+				metadata_json, hook_path, messages_path, updated_at
 			 FROM sessions WHERE session_id = ?`,
 			[sessionId],
 		);
@@ -121,8 +121,6 @@ export class SqliteRpcSessionBackend implements RpcSessionBackend {
 				}
 				return undefined;
 			})(),
-			transcriptPath: asString(row.transcript_path),
-			hookPath: asString(row.hook_path),
 			messagesPath: asOptionalString(row.messages_path),
 			updatedAt: asString(row.updated_at) || nowIso(),
 		};

package/src/session/workspace-manager.ts

@@ -7,7 +7,7 @@ import {
 import {
 	generateWorkspaceInfo,
 	normalizeWorkspacePath,
-} from "./workspace-manifest";
+} from "../services/workspace-manifest";
 
 export interface WorkspaceManagerEvent {
 	type: "workspace_added" | "workspace_switched";

package/src/{session/default-session-manager.e2e.test.ts → transports/local.e2e.test.ts}

@@ -14,10 +14,14 @@ import type { AgentResult } from "@clinebot/shared";
 import { setClineDir, setHomeDir } from "@clinebot/shared/storage";
 import { nanoid } from "nanoid";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { splitCoreSessionConfig } from "../runtime/runtime-host";
+import type { SessionManifest } from "../session/session-manifest";
+import type {
+	RootSessionArtifacts,
+	SessionRow,
+} from "../session/session-service";
 import type { SessionSource, SessionStatus } from "../types/common";
-import { DefaultSessionManager } from "./default-session-manager";
-import type { SessionManifest } from "./session-manifest";
-import type { RootSessionArtifacts, SessionRow } from "./session-service";
+import { LocalRuntimeHost as RuntimeHostUnderTest } from "./local";
 
 function nowIso(): string {
 	return new Date().toISOString();
@@ -78,8 +82,6 @@ class LocalFileSessionService {
 		mkdirSync(sessionPath, { recursive: true });
 
 		const manifestPath = join(sessionPath, `${sessionId}.json`);
-		const transcriptPath = join(sessionPath, `${sessionId}.log`);
-		const hookPath = join(sessionPath, `${sessionId}.hooks.jsonl`);
 		const messagesPath = join(sessionPath, `${sessionId}.messages.json`);
 		const prompt = input.prompt?.trim() || undefined;
 		const manifest: SessionManifest = {
@@ -106,8 +108,6 @@ class LocalFileSessionService {
 			`${JSON.stringify(manifest, null, 2)}\n`,
 			"utf8",
 		);
-		writeFileSync(transcriptPath, "", "utf8");
-		writeFileSync(hookPath, "", "utf8");
 		writeFileSync(
 			messagesPath,
 			`${JSON.stringify({ version: 1, updated_at: startedAt, messages: [] }, null, 2)}\n`,
@@ -138,16 +138,13 @@ class LocalFileSessionService {
 			conversationId: null,
 			isSubagent: false,
 			prompt: prompt ?? null,
-			transcriptPath,
-			hookPath,
+			hookPath: "",
 			messagesPath,
 			updatedAt: startedAt,
 		});
 
 		return {
 			manifestPath,
-			transcriptPath,
-			hookPath,
 			messagesPath,
 			manifest,
 		};
@@ -214,15 +211,13 @@ class LocalFileSessionService {
 			return { deleted: false };
 		}
 		this.rows.delete(sessionId);
-		unlinkSync(row.transcriptPath);
-		unlinkSync(row.hookPath);
 		unlinkSync(row.messagesPath ?? "");
 		unlinkSync(join(this.sessionsDir, sessionId, `${sessionId}.json`));
 		return { deleted: true };
 	}
 }
 
-describe("DefaultSessionManager e2e", () => {
+describe("LocalRuntimeHost e2e", () => {
 	const envSnapshot = {
 		HOME: process.env.HOME,
 		CLINE_DIR: process.env.CLINE_DIR,
@@ -302,7 +297,7 @@ describe("DefaultSessionManager e2e", () => {
 		});
 		const agentShutdown = vi.fn().mockResolvedValue(undefined);
 
-		const manager = new DefaultSessionManager({
+		const manager = new RuntimeHostUnderTest({
 			distinctId: `test-${nanoid(5)}`,
 			sessionService: sessionService as never,
 			runtimeBuilder: runtimeBuilder as never,
@@ -323,16 +318,17 @@ describe("DefaultSessionManager e2e", () => {
 
 		const started = await manager.start({
 			interactive: true,
-			config: {
+			...splitCoreSessionConfig({
 				providerId: "anthropic",
 				modelId: "claude-sonnet-4-6",
 				apiKey: "test-key",
 				cwd: sessionsDir,
 				systemPrompt: "You are a test agent",
+				mode: "act",
 				enableTools: false,
 				enableSpawnAgent: false,
 				enableAgentTeams: false,
-			},
+			}),
 		});
 
 		expect(started.sessionId.length).toBeGreaterThan(0);