@clinebot/core 0.0.28 → 0.0.30

package/src/session/workspace-manifest.ts

@@ -1,26 +1,7 @@
 import { basename, resolve } from "node:path";
+import type { WorkspaceInfo } from "@clinebot/shared";
+import { processWorkspaceInfo } from "@clinebot/shared";
 import simpleGit from "simple-git";
-import { z } from "zod";
-import type { WorkspaceInfo } from "../types/workspace";
-
-export const WorkspaceInfoSchema = z.object({
-	rootPath: z.string().min(1),
-	hint: z.string().min(1).optional(),
-	associatedRemoteUrls: z.array(z.string().min(1)).optional(),
-	latestGitCommitHash: z.string().min(1).optional(),
-	latestGitBranchName: z.string().min(1).optional(),
-});
-
-export const WorkspaceManifestSchema = z.object({
-	currentWorkspacePath: z.string().min(1).optional(),
-	workspaces: z.record(z.string().min(1), WorkspaceInfoSchema),
-});
-
-export type WorkspaceManifest = z.infer<typeof WorkspaceManifestSchema>;
-
-export function emptyWorkspaceManifest(): WorkspaceManifest {
-	return { workspaces: {} };
-}
 
 export function normalizeWorkspacePath(workspacePath: string): string {
 	return resolve(workspacePath);
@@ -67,34 +48,7 @@ export async function generateWorkspaceInfo(
 	return info;
 }
 
-export function upsertWorkspaceInfo(
-	manifest: WorkspaceManifest,
-	info: WorkspaceInfo,
-): WorkspaceManifest {
-	const nextManifest: WorkspaceManifest = {
-		...manifest,
-		workspaces: {
-			...manifest.workspaces,
-			[info.rootPath]: info,
-		},
-	};
-	if (!nextManifest.currentWorkspacePath) {
-		nextManifest.currentWorkspacePath = info.rootPath;
-	}
-	return WorkspaceManifestSchema.parse(nextManifest);
-}
-
 export async function buildWorkspaceMetadata(cwd: string): Promise<string> {
 	const workspaceInfo = await generateWorkspaceInfo(cwd);
-	const workspaceConfig = {
-		workspaces: {
-			[workspaceInfo.rootPath]: {
-				hint: workspaceInfo.hint,
-				associatedRemoteUrls: workspaceInfo.associatedRemoteUrls,
-				latestGitCommitHash: workspaceInfo.latestGitCommitHash,
-				latestGitBranchName: workspaceInfo.latestGitBranchName,
-			},
-		},
-	};
-	return `# Workspace Configuration\n${JSON.stringify(workspaceConfig, null, 2)}`;
+	return processWorkspaceInfo(workspaceInfo);
 }

package/src/storage/file-team-store.ts

@@ -8,12 +8,9 @@ import {
 	writeFileSync,
 } from "node:fs";
 import { join } from "node:path";
-import type {
-	TeamEvent,
-	TeamRuntimeState,
-	TeamTeammateSpec,
-} from "@clinebot/agents";
+import type { TeamRuntimeState, TeamTeammateSpec } from "@clinebot/shared";
 import { resolveTeamDataDir } from "@clinebot/shared/storage";
+import type { TeamEvent } from "../team";
 import type { TeamStore } from "../types/storage";
 
 function nowIso(): string {

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

@@ -1,7 +1,7 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
-import * as LlmsModels from "@clinebot/llms/models";
-import * as LlmsProviders from "@clinebot/llms/providers";
+import * as LlmsModels from "@clinebot/llms";
+import * as LlmsProviders from "@clinebot/llms";
 import { resolveClineDataDir } from "@clinebot/shared/storage";
 import type { ProviderSettings } from "../types/provider-settings";
 import { emptyStoredProviderSettings } from "../types/provider-settings";

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

@@ -1,7 +1,7 @@
 import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import os from "node:os";
 import path from "node:path";
-import * as LlmsModels from "@clinebot/llms/models";
+import * as LlmsModels from "@clinebot/llms";
 import { afterEach, describe, expect, it } from "vitest";
 import { ProviderSettingsManager } from "./provider-settings-manager";
 

package/src/storage/sqlite-team-store.ts

@@ -1,12 +1,13 @@
 import { existsSync, mkdirSync } from "node:fs";
 import { join } from "node:path";
-import type {
-	TeamEvent,
-	TeamRuntimeState,
-	TeamTeammateSpec,
-} from "@clinebot/agents";
+import {
+	safeJsonParse,
+	type TeamRuntimeState,
+	type TeamTeammateSpec,
+} from "@clinebot/shared";
 import { loadSqliteDb, nowIso, type SqliteDb } from "@clinebot/shared/db";
 import { resolveTeamDataDir } from "@clinebot/shared/storage";
+import type { TeamEvent } from "../team";
 import type { TeamStore } from "../types/storage";
 
 function defaultTeamDir(): string {
@@ -41,6 +42,43 @@ interface TeamRunRow {
 	run_id: string;
 }
 
+function parseTeammatesJson(raw: string): TeamTeammateSpec[] {
+	const parsed = safeJsonParse<unknown>(raw);
+	if (!Array.isArray(parsed)) {
+		return [];
+	}
+	const out: TeamTeammateSpec[] = [];
+	for (const entry of parsed) {
+		if (!entry || typeof entry !== "object") {
+			continue;
+		}
+		const rec = entry as Record<string, unknown>;
+		const agentId = rec.agentId;
+		const rolePrompt = rec.rolePrompt;
+		if (typeof agentId !== "string" || !agentId.trim()) {
+			continue;
+		}
+		if (typeof rolePrompt !== "string" || !rolePrompt.trim()) {
+			continue;
+		}
+		const spec: TeamTeammateSpec = {
+			agentId: agentId.trim(),
+			rolePrompt,
+		};
+		if (typeof rec.modelId === "string" && rec.modelId.trim()) {
+			spec.modelId = rec.modelId.trim();
+		}
+		if (
+			typeof rec.maxIterations === "number" &&
+			Number.isFinite(rec.maxIterations)
+		) {
+			spec.maxIterations = Math.max(1, Math.floor(rec.maxIterations));
+		}
+		out.push(spec);
+	}
+	return out;
+}
+
 function reviveTeamRuntimeStateDates(
 	state: TeamRuntimeState,
 ): TeamRuntimeState {
@@ -122,6 +160,22 @@ export class SqliteTeamStore implements TeamStore {
 	private ensureSchema(db: SqliteDb): void {
 		db.exec("PRAGMA journal_mode = WAL;");
 		db.exec("PRAGMA busy_timeout = 5000;");
+		// Single-row table so ALTER-based upgrades can run in order (baseline = 1).
+		// Session/schedule schemas use separate migration paths in @clinebot/shared.
+		db.exec(`
+			CREATE TABLE IF NOT EXISTS team_store_schema_version (
+				lock INTEGER PRIMARY KEY CHECK (lock = 1),
+				version INTEGER NOT NULL
+			);
+		`);
+		const versionRow = db
+			.prepare("SELECT version FROM team_store_schema_version WHERE lock = 1")
+			.get() as { version: number } | null;
+		if (!versionRow) {
+			db.prepare(
+				"INSERT INTO team_store_schema_version (lock, version) VALUES (1, 1)",
+			).run();
+		}
 		db.exec(`
 			CREATE TABLE IF NOT EXISTS team_events (
 				id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -230,6 +284,23 @@ export class SqliteTeamStore implements TeamStore {
 			.all(...params) as T[];
 	}
 
+	/** Runs `work` in a single SQLite transaction (rollback on any error). */
+	private withTransaction(work: () => void): void {
+		const db = this.getRawDb();
+		db.exec("BEGIN IMMEDIATE;");
+		try {
+			work();
+			db.exec("COMMIT;");
+		} catch (error) {
+			try {
+				db.exec("ROLLBACK;");
+			} catch {
+				// ignore secondary failure
+			}
+			throw error;
+		}
+	}
+
 	listTeamNames(): string[] {
 		return this.queryAll<{ team_name: string }>(
 			`SELECT team_name FROM team_runtime_snapshot ORDER BY team_name ASC`,
@@ -244,9 +315,15 @@ export class SqliteTeamStore implements TeamStore {
 		if (!row) {
 			return undefined;
 		}
-		return reviveTeamRuntimeStateDates(
-			JSON.parse(row.state_json) as TeamRuntimeState,
-		);
+		const parsed = safeJsonParse<TeamRuntimeState>(row.state_json);
+		if (!parsed) {
+			return undefined;
+		}
+		try {
+			return reviveTeamRuntimeStateDates(parsed);
+		} catch {
+			return undefined;
+		}
 	}
 
 	readHistory(teamName: string, limit = 200): unknown[] {
@@ -257,11 +334,19 @@ export class SqliteTeamStore implements TeamStore {
 		}>(
 			`SELECT event_type, payload_json, ts FROM team_events WHERE team_name = ? ORDER BY id DESC LIMIT ?`,
 			[sanitizeTeamName(teamName), limit],
-		).map((row) => ({
-			eventType: row.event_type,
-			payload: JSON.parse(row.payload_json),
-			ts: row.ts,
-		}));
+		).flatMap((row) => {
+			try {
+				return [
+					{
+						eventType: row.event_type,
+						payload: JSON.parse(row.payload_json),
+						ts: row.ts,
+					},
+				];
+			} catch {
+				return [];
+			}
+		});
 	}
 
 	loadRuntime(teamName: string): TeamRuntimeLoadResult {
@@ -272,7 +357,7 @@ export class SqliteTeamStore implements TeamStore {
 			[safeTeamName],
 		);
 		const teammates = snapshotRow
-			? (JSON.parse(snapshotRow.teammates_json) as TeamTeammateSpec[])
+			? parseTeammatesJson(snapshotRow.teammates_json)
 			: [];
 		const interruptedRunIds = this.markInProgressRunsInterrupted(
 			safeTeamName,
@@ -311,123 +396,125 @@ export class SqliteTeamStore implements TeamStore {
 	): void {
 		const safeTeamName = sanitizeTeamName(teamName);
 		const now = nowIso();
-		this.run(
-			`INSERT INTO team_runtime_snapshot (team_name, state_json, teammates_json, updated_at)
-			 VALUES (?, ?, ?, ?)
-			 ON CONFLICT(team_name) DO UPDATE SET
-				state_json = excluded.state_json,
-				teammates_json = excluded.teammates_json,
-				updated_at = excluded.updated_at`,
-			[safeTeamName, JSON.stringify(state), JSON.stringify(teammates), now],
-		);
-
-		for (const task of state.tasks) {
+		this.withTransaction(() => {
 			this.run(
-				`INSERT INTO team_tasks (team_name, task_id, title, description, status, assignee, depends_on_json, summary, version, updated_at)
-				 VALUES (?, ?, ?, ?, ?, ?, ?, ?, 1, ?)
-				 ON CONFLICT(team_name, task_id) DO UPDATE SET
-					title = excluded.title,
-					description = excluded.description,
-					status = excluded.status,
-					assignee = excluded.assignee,
-					depends_on_json = excluded.depends_on_json,
-					summary = excluded.summary,
-					version = team_tasks.version + 1,
+				`INSERT INTO team_runtime_snapshot (team_name, state_json, teammates_json, updated_at)
+				 VALUES (?, ?, ?, ?)
+				 ON CONFLICT(team_name) DO UPDATE SET
+					state_json = excluded.state_json,
+					teammates_json = excluded.teammates_json,
 					updated_at = excluded.updated_at`,
-				[
-					safeTeamName,
-					task.id,
-					task.title,
-					task.description,
-					task.status,
-					task.assignee ?? null,
-					JSON.stringify(task.dependsOn ?? []),
-					task.summary ?? null,
-					task.updatedAt.toISOString(),
-				],
+				[safeTeamName, JSON.stringify(state), JSON.stringify(teammates), now],
 			);
-		}
 
-		for (const run of state.runs ?? []) {
-			this.run(
-				`INSERT INTO team_runs (team_name, run_id, agent_id, task_id, status, message, started_at, ended_at, error, lease_owner, heartbeat_at, version)
-				 VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1)
-				 ON CONFLICT(team_name, run_id) DO UPDATE SET
-					agent_id = excluded.agent_id,
-					task_id = excluded.task_id,
-					status = excluded.status,
-					message = excluded.message,
-					started_at = excluded.started_at,
-					ended_at = excluded.ended_at,
-					error = excluded.error,
-					lease_owner = excluded.lease_owner,
-					heartbeat_at = excluded.heartbeat_at,
-					version = team_runs.version + 1`,
-				[
-					safeTeamName,
-					run.id,
-					run.agentId,
-					run.taskId ?? null,
-					run.status,
-					run.message,
-					run.startedAt ? run.startedAt.toISOString() : null,
-					run.endedAt ? run.endedAt.toISOString() : null,
-					run.error ?? null,
-					run.leaseOwner ?? null,
-					run.heartbeatAt ? run.heartbeatAt.toISOString() : null,
-				],
-			);
-		}
+			for (const task of state.tasks) {
+				this.run(
+					`INSERT INTO team_tasks (team_name, task_id, title, description, status, assignee, depends_on_json, summary, version, updated_at)
+					 VALUES (?, ?, ?, ?, ?, ?, ?, ?, 1, ?)
+					 ON CONFLICT(team_name, task_id) DO UPDATE SET
+						title = excluded.title,
+						description = excluded.description,
+						status = excluded.status,
+						assignee = excluded.assignee,
+						depends_on_json = excluded.depends_on_json,
+						summary = excluded.summary,
+						version = team_tasks.version + 1,
+						updated_at = excluded.updated_at`,
+					[
+						safeTeamName,
+						task.id,
+						task.title,
+						task.description,
+						task.status,
+						task.assignee ?? null,
+						JSON.stringify(task.dependsOn ?? []),
+						task.summary ?? null,
+						task.updatedAt.toISOString(),
+					],
+				);
+			}
 
-		for (const outcome of state.outcomes ?? []) {
-			this.run(
-				`INSERT INTO team_outcomes (team_name, outcome_id, title, status, schema_json, finalized_at, version)
-				 VALUES (?, ?, ?, ?, ?, ?, 1)
-				 ON CONFLICT(team_name, outcome_id) DO UPDATE SET
-					title = excluded.title,
-					status = excluded.status,
-					schema_json = excluded.schema_json,
-					finalized_at = excluded.finalized_at,
-					version = team_outcomes.version + 1`,
-				[
-					safeTeamName,
-					outcome.id,
-					outcome.title,
-					outcome.status,
-					JSON.stringify({ requiredSections: outcome.requiredSections }),
-					outcome.finalizedAt ? outcome.finalizedAt.toISOString() : null,
-				],
-			);
-		}
+			for (const run of state.runs ?? []) {
+				this.run(
+					`INSERT INTO team_runs (team_name, run_id, agent_id, task_id, status, message, started_at, ended_at, error, lease_owner, heartbeat_at, version)
+					 VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1)
+					 ON CONFLICT(team_name, run_id) DO UPDATE SET
+						agent_id = excluded.agent_id,
+						task_id = excluded.task_id,
+						status = excluded.status,
+						message = excluded.message,
+						started_at = excluded.started_at,
+						ended_at = excluded.ended_at,
+						error = excluded.error,
+						lease_owner = excluded.lease_owner,
+						heartbeat_at = excluded.heartbeat_at,
+						version = team_runs.version + 1`,
+					[
+						safeTeamName,
+						run.id,
+						run.agentId,
+						run.taskId ?? null,
+						run.status,
+						run.message,
+						run.startedAt ? run.startedAt.toISOString() : null,
+						run.endedAt ? run.endedAt.toISOString() : null,
+						run.error ?? null,
+						run.leaseOwner ?? null,
+						run.heartbeatAt ? run.heartbeatAt.toISOString() : null,
+					],
+				);
+			}
 
-		for (const fragment of state.outcomeFragments ?? []) {
-			this.run(
-				`INSERT INTO team_outcome_fragments (team_name, outcome_id, fragment_id, section, source_agent_id, source_run_id, content, status, reviewed_by, reviewed_at, version)
-				 VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1)
-				 ON CONFLICT(team_name, fragment_id) DO UPDATE SET
-					outcome_id = excluded.outcome_id,
-					section = excluded.section,
-					source_agent_id = excluded.source_agent_id,
-					source_run_id = excluded.source_run_id,
-					content = excluded.content,
-					status = excluded.status,
-					reviewed_by = excluded.reviewed_by,
-					reviewed_at = excluded.reviewed_at,
-					version = team_outcome_fragments.version + 1`,
-				[
-					safeTeamName,
-					fragment.outcomeId,
-					fragment.id,
-					fragment.section,
-					fragment.sourceAgentId,
-					fragment.sourceRunId ?? null,
-					fragment.content,
-					fragment.status,
-					fragment.reviewedBy ?? null,
-					fragment.reviewedAt ? fragment.reviewedAt.toISOString() : null,
-				],
-			);
-		}
+			for (const outcome of state.outcomes ?? []) {
+				this.run(
+					`INSERT INTO team_outcomes (team_name, outcome_id, title, status, schema_json, finalized_at, version)
+					 VALUES (?, ?, ?, ?, ?, ?, 1)
+					 ON CONFLICT(team_name, outcome_id) DO UPDATE SET
+						title = excluded.title,
+						status = excluded.status,
+						schema_json = excluded.schema_json,
+						finalized_at = excluded.finalized_at,
+						version = team_outcomes.version + 1`,
+					[
+						safeTeamName,
+						outcome.id,
+						outcome.title,
+						outcome.status,
+						JSON.stringify({ requiredSections: outcome.requiredSections }),
+						outcome.finalizedAt ? outcome.finalizedAt.toISOString() : null,
+					],
+				);
+			}
+
+			for (const fragment of state.outcomeFragments ?? []) {
+				this.run(
+					`INSERT INTO team_outcome_fragments (team_name, outcome_id, fragment_id, section, source_agent_id, source_run_id, content, status, reviewed_by, reviewed_at, version)
+					 VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1)
+					 ON CONFLICT(team_name, fragment_id) DO UPDATE SET
+						outcome_id = excluded.outcome_id,
+						section = excluded.section,
+						source_agent_id = excluded.source_agent_id,
+						source_run_id = excluded.source_run_id,
+						content = excluded.content,
+						status = excluded.status,
+						reviewed_by = excluded.reviewed_by,
+						reviewed_at = excluded.reviewed_at,
+						version = team_outcome_fragments.version + 1`,
+					[
+						safeTeamName,
+						fragment.outcomeId,
+						fragment.id,
+						fragment.section,
+						fragment.sourceAgentId,
+						fragment.sourceRunId ?? null,
+						fragment.content,
+						fragment.status,
+						fragment.reviewedBy ?? null,
+						fragment.reviewedAt ? fragment.reviewedAt.toISOString() : null,
+					],
+				);
+			}
+		});
 	}
 
 	markInProgressRunsInterrupted(teamName: string, reason: string): string[] {

package/src/storage/team-store.ts

@@ -28,11 +28,7 @@ export function createLocalTeamStore(options: SqliteTeamStoreOptions = {}): {
 		const store = new SqliteTeamStore(options);
 		store.init();
 		return store;
-	} catch (error) {
-		console.warn(
-			"SQLite team persistence unavailable, falling back to file-based team storage.",
-			error,
-		);
+	} catch {
 		const store = new FileTeamStore({ teamDir: options.teamDir });
 		store.init();
 		return store;

package/src/team/delegated-agent.ts

@@ -0,0 +1,131 @@
+import { Agent } from "@clinebot/agents";
+import type {
+	AgentConfig,
+	AgentEvent,
+	AgentHooks,
+	BasicLogger,
+	HookErrorMode,
+	ITelemetryService,
+	Tool,
+	ToolApprovalRequest,
+	ToolApprovalResult,
+} from "@clinebot/shared";
+import {
+	buildSubAgentSystemPrompt,
+	buildTeammateSystemPrompt,
+} from "./subagent-prompts";
+
+type AgentExtension = NonNullable<AgentConfig["extensions"]>[number];
+
+export type DelegatedAgentConnectionConfig = Pick<
+	AgentConfig,
+	| "providerId"
+	| "modelId"
+	| "apiKey"
+	| "baseUrl"
+	| "headers"
+	| "providerConfig"
+	| "knownModels"
+	| "thinking"
+>;
+
+export interface DelegatedAgentRuntimeConfig
+	extends DelegatedAgentConnectionConfig {
+	cwd?: string;
+	providerId: string;
+	clinePlatform?: string;
+	clineIdeName?: string;
+	maxIterations?: number;
+	hooks?: AgentHooks;
+	extensions?: AgentExtension[];
+	logger?: BasicLogger;
+	telemetry?: ITelemetryService;
+	workspaceMetadata?: string;
+}
+
+export interface DelegatedAgentConfigProvider {
+	getRuntimeConfig(): DelegatedAgentRuntimeConfig;
+	getConnectionConfig(): DelegatedAgentConnectionConfig;
+	updateConnectionDefaults(
+		overrides: Partial<DelegatedAgentConnectionConfig>,
+	): void;
+}
+
+export type DelegatedAgentKind = "subagent" | "teammate";
+
+export interface BuildDelegatedAgentConfigOptions {
+	kind: DelegatedAgentKind;
+	prompt: string;
+	tools: Tool[];
+	configProvider: DelegatedAgentConfigProvider;
+	parentAgentId?: string;
+	maxIterations?: number;
+	abortSignal?: AbortSignal;
+	onEvent?: (event: AgentEvent) => void;
+	hookErrorMode?: HookErrorMode;
+	toolPolicies?: AgentConfig["toolPolicies"];
+	requestToolApproval?: (
+		request: ToolApprovalRequest,
+	) => Promise<ToolApprovalResult> | ToolApprovalResult;
+	role?: string;
+	cwd?: string;
+}
+
+export function createDelegatedAgentConfigProvider(
+	initialConfig: DelegatedAgentRuntimeConfig,
+): DelegatedAgentConfigProvider {
+	let runtimeConfig: DelegatedAgentRuntimeConfig = { ...initialConfig };
+
+	return {
+		getRuntimeConfig: () => runtimeConfig,
+		getConnectionConfig: () => ({
+			providerId: runtimeConfig.providerId,
+			modelId: runtimeConfig.modelId,
+			apiKey: runtimeConfig.apiKey,
+			baseUrl: runtimeConfig.baseUrl,
+			headers: runtimeConfig.headers,
+			providerConfig: runtimeConfig.providerConfig,
+			knownModels: runtimeConfig.knownModels,
+			thinking: runtimeConfig.thinking,
+		}),
+		updateConnectionDefaults: (overrides) => {
+			runtimeConfig = {
+				...runtimeConfig,
+				...overrides,
+			};
+		},
+	};
+}
+
+export function buildDelegatedAgentConfig(
+	options: BuildDelegatedAgentConfigOptions,
+): AgentConfig & { role?: string } {
+	const runtimeConfig = options.configProvider.getRuntimeConfig();
+	const systemPrompt =
+		options.kind === "teammate"
+			? buildTeammateSystemPrompt(options.prompt, runtimeConfig)
+			: buildSubAgentSystemPrompt(options.prompt, runtimeConfig);
+
+	return {
+		...options.configProvider.getConnectionConfig(),
+		systemPrompt,
+		tools: options.tools,
+		maxIterations: options.maxIterations ?? runtimeConfig.maxIterations,
+		parentAgentId: options.parentAgentId,
+		abortSignal: options.abortSignal,
+		onEvent: options.onEvent,
+		hooks: runtimeConfig.hooks,
+		extensions: runtimeConfig.extensions,
+		hookErrorMode: options.hookErrorMode,
+		toolPolicies: options.toolPolicies,
+		requestToolApproval: options.requestToolApproval,
+		logger: runtimeConfig.logger,
+		role: options.role,
+	};
+}
+
+export function createDelegatedAgent(
+	options: BuildDelegatedAgentConfigOptions,
+): Agent {
+	return new Agent(buildDelegatedAgentConfig(options));
+}

package/src/team/index.ts

@@ -2,3 +2,4 @@ export {
 	buildTeamProgressSummary,
 	toTeamProgressLifecycleEvent,
 } from "./projections";
+export * from "./runtime";