@clinebot/core 0.0.6 → 0.0.10

package/package.json

@@ -1,10 +1,11 @@
 {
 	"name": "@clinebot/core",
-	"version": "0.0.6",
+	"version": "0.0.10",
 	"main": "./dist/index.node.js",
 	"dependencies": {
-		"@clinebot/agents": "0.0.6",
-		"@clinebot/llms": "0.0.6",
+		"@clinebot/agents": "0.0.10",
+		"@clinebot/llms": "0.0.10",
+		"@clinebot/shared": "0.0.10",
 		"@opentelemetry/api": "^1.9.0",
 		"@opentelemetry/api-logs": "^0.56.0",
 		"@opentelemetry/exporter-logs-otlp-http": "^0.56.0",

package/src/agents/hooks-config-loader.ts

@@ -20,6 +20,7 @@ export enum HookConfigFileName {
 	TaskResume = "TaskResume",
 	TaskCancel = "TaskCancel",
 	TaskComplete = "TaskComplete",
+	TaskError = "TaskError",
 	PreToolUse = "PreToolUse",
 	PostToolUse = "PostToolUse",
 	UserPromptSubmit = "UserPromptSubmit",
@@ -34,6 +35,7 @@ export const HOOK_CONFIG_FILE_EVENT_MAP: Readonly<
 	[HookConfigFileName.TaskResume]: "agent_resume",
 	[HookConfigFileName.TaskCancel]: "agent_abort",
 	[HookConfigFileName.TaskComplete]: "agent_end",
+	[HookConfigFileName.TaskError]: "agent_error",
 	[HookConfigFileName.PreToolUse]: "tool_call",
 	[HookConfigFileName.PostToolUse]: "tool_result",
 	[HookConfigFileName.UserPromptSubmit]: "prompt_submit",

package/src/auth/cline.ts

@@ -1,3 +1,11 @@
+import type { ITelemetryService } from "@clinebot/shared";
+import {
+	captureAuthFailed,
+	captureAuthLoggedOut,
+	captureAuthStarted,
+	captureAuthSucceeded,
+	identifyAccount,
+} from "../telemetry/core-events";
 import { startLocalOAuthServer } from "./server.js";
 import type {
 	OAuthCredentials,
@@ -63,6 +71,7 @@ export interface ClineOAuthProviderOptions {
 	callbackPath?: string;
 	callbackPorts?: number[];
 	requestTimeoutMs?: number;
+	telemetry?: ITelemetryService;
 	/**
 	 * Optional identity provider name for token exchange.
 	 */
@@ -253,6 +262,7 @@ export async function loginClineOAuth(
 		callbacks: OAuthLoginCallbacks;
 	},
 ): Promise<ClineOAuthCredentials> {
+	captureAuthStarted(options.telemetry, options.provider ?? "cline");
 	const callbackPorts = options.callbackPorts?.length
 		? options.callbackPorts
 		: DEFAULT_CALLBACK_PORTS;
@@ -312,7 +322,26 @@ export async function loginClineOAuth(
 			throw new Error("Missing authorization code");
 		}
 
-		return exchangeAuthorizationCode(code, callbackUrl, options, provider);
+		const credentials = await exchangeAuthorizationCode(
+			code,
+			callbackUrl,
+			options,
+			provider,
+		);
+		captureAuthSucceeded(options.telemetry, provider ?? "cline");
+		identifyAccount(options.telemetry, {
+			id: credentials.accountId,
+			email: credentials.email,
+			provider: provider ?? "cline",
+		});
+		return credentials;
+	} catch (error) {
+		captureAuthFailed(
+			options.telemetry,
+			options.provider ?? "cline",
+			error instanceof Error ? error.message : String(error),
+		);
+		throw error;
 	} finally {
 		localServer.close();
 	}
@@ -384,6 +413,11 @@ export async function getValidClineCredentials(
 		return await refreshClineToken(currentCredentials, providerOptions);
 	} catch (error) {
 		if (error instanceof ClineOAuthTokenError && error.isLikelyInvalidGrant()) {
+			captureAuthLoggedOut(
+				providerOptions.telemetry,
+				providerOptions.provider ?? "cline",
+				"invalid_grant",
+			);
 			return null;
 		}
 		if (currentCredentials.expires - Date.now() > retryableTokenGraceMs) {

package/src/auth/codex.ts

@@ -5,7 +5,15 @@
  * It is only intended for CLI use, not browser environments.
  */
 
+import type { ITelemetryService } from "@clinebot/shared";
 import { nanoid } from "nanoid";
+import {
+	captureAuthFailed,
+	captureAuthLoggedOut,
+	captureAuthStarted,
+	captureAuthSucceeded,
+	identifyAccount,
+} from "../telemetry/core-events";
 import { startLocalOAuthServer } from "./server.js";
 import type {
 	OAuthCredentials,
@@ -295,7 +303,9 @@ export async function loginOpenAICodex(options: {
 	onProgress?: (message: string) => void;
 	onManualCodeInput?: () => Promise<string>;
 	originator?: string;
+	telemetry?: ITelemetryService;
 }): Promise<OAuthCredentials> {
+	captureAuthStarted(options.telemetry, "openai-codex");
 	const callbackConfig = resolveCallbackServerConfig();
 	const { verifier, state, url } = await createAuthorizationFlow(
 		options.originator,
@@ -352,7 +362,21 @@ export async function loginOpenAICodex(options: {
 			throw new Error("Token exchange failed");
 		}
 
-		return toCodexCredentials(tokenResult);
+		const credentials = toCodexCredentials(tokenResult);
+		captureAuthSucceeded(options.telemetry, "openai-codex");
+		identifyAccount(options.telemetry, {
+			id: credentials.accountId,
+			email: credentials.email,
+			provider: "openai-codex",
+		});
+		return credentials;
+	} catch (error) {
+		captureAuthFailed(
+			options.telemetry,
+			"openai-codex",
+			error instanceof Error ? error.message : String(error),
+		);
+		throw error;
 	} finally {
 		server.close();
 	}
@@ -378,7 +402,7 @@ export async function refreshOpenAICodexToken(
 
 export async function getValidOpenAICodexCredentials(
 	currentCredentials: OAuthCredentials | null,
-	options?: RefreshTokenResolution,
+	options?: RefreshTokenResolution & { telemetry?: ITelemetryService },
 ): Promise<OAuthCredentials | null> {
 	if (!currentCredentials) {
 		return null;
@@ -409,6 +433,7 @@ export async function getValidOpenAICodexCredentials(
 			error instanceof OpenAICodexOAuthTokenError &&
 			error.isLikelyInvalidGrant()
 		) {
+			captureAuthLoggedOut(options?.telemetry, "openai-codex", "invalid_grant");
 			return null;
 		}
 		if (currentCredentials.expires - Date.now() > retryableTokenGraceMs) {

package/src/auth/oca.ts

@@ -1,4 +1,12 @@
+import type { ITelemetryService } from "@clinebot/shared";
 import { nanoid } from "nanoid";
+import {
+	captureAuthFailed,
+	captureAuthLoggedOut,
+	captureAuthStarted,
+	captureAuthSucceeded,
+	identifyAccount,
+} from "../telemetry/core-events";
 import { startLocalOAuthServer } from "./server.js";
 import type {
 	OAuthCredentials,
@@ -325,8 +333,12 @@ function buildAuthorizationUrl(input: {
 }
 
 export async function loginOcaOAuth(
-	options: OcaOAuthProviderOptions & { callbacks: OAuthLoginCallbacks },
+	options: OcaOAuthProviderOptions & {
+		callbacks: OAuthLoginCallbacks;
+		telemetry?: ITelemetryService;
+	},
 ): Promise<OAuthCredentials> {
+	captureAuthStarted(options.telemetry, "oca");
 	const config = resolveConfig(options.config);
 	const mode = resolveMode(options.mode);
 	const callbackPorts = options.callbackPorts?.length
@@ -391,13 +403,27 @@ export async function loginOcaOAuth(
 			throw new Error("State mismatch");
 		}
 
-		return await exchangeAuthorizationCode({
+		const credentials = await exchangeAuthorizationCode({
 			code,
 			state: returnedState,
 			mode,
 			config,
 			requestTimeoutMs,
 		});
+		captureAuthSucceeded(options.telemetry, "oca");
+		identifyAccount(options.telemetry, {
+			id: credentials.accountId,
+			email: credentials.email,
+			provider: "oca",
+		});
+		return credentials;
+	} catch (error) {
+		captureAuthFailed(
+			options.telemetry,
+			"oca",
+			error instanceof Error ? error.message : String(error),
+		);
+		throw error;
 	} finally {
 		localServer.close();
 	}
@@ -447,8 +473,8 @@ export async function refreshOcaToken(
 
 export async function getValidOcaCredentials(
 	currentCredentials: OAuthCredentials | null,
-	options?: OcaTokenResolution,
-	providerOptions?: OcaOAuthProviderOptions,
+	options?: OcaTokenResolution & { telemetry?: ITelemetryService },
+	providerOptions?: OcaOAuthProviderOptions & { telemetry?: ITelemetryService },
 ): Promise<OAuthCredentials | null> {
 	if (!currentCredentials) {
 		return null;
@@ -475,6 +501,7 @@ export async function getValidOcaCredentials(
 		return await refreshOcaToken(currentCredentials, providerOptions);
 	} catch (error) {
 		if (error instanceof OcaOAuthTokenError && error.isLikelyInvalidGrant()) {
+			captureAuthLoggedOut(providerOptions?.telemetry, "oca", "invalid_grant");
 			return null;
 		}
 		if (currentCredentials.expires - Date.now() > retryableTokenGraceMs) {

package/src/auth/types.ts

@@ -1,3 +1,5 @@
+import type { ITelemetryService } from "@clinebot/shared";
+
 export interface OAuthPrompt {
 	message: string;
 	defaultValue?: string;
@@ -69,6 +71,7 @@ export interface OcaOAuthProviderOptions {
 	requestTimeoutMs?: number;
 	refreshBufferMs?: number;
 	retryableTokenGraceMs?: number;
+	telemetry?: ITelemetryService;
 }
 
 export interface OcaTokenResolution {

package/src/index.node.ts

@@ -170,6 +170,10 @@ export {
 } from "./runtime/workflows";
 export { DefaultSessionManager } from "./session/default-session-manager";
 export { RpcCoreSessionService } from "./session/rpc-session-service";
+export {
+	type RpcSpawnLease,
+	tryAcquireRpcSpawnLease,
+} from "./session/rpc-spawn-lease";
 export {
 	deriveSubsessionStatus,
 	makeSubSessionId,

package/src/index.ts

@@ -13,6 +13,7 @@ export {
 	type ToolApprovalResult,
 	type ToolContext,
 } from "@clinebot/agents";
+export { LlmsModels, LlmsProviders } from "@clinebot/llms";
 // Shared contracts and path helpers re-exported for app consumers.
 export type {
 	AgentMode,
@@ -57,7 +58,10 @@ export {
 	ensureHookLogDir,
 	ensureParentDir,
 	resolveClineDataDir,
+	resolveClineDir,
 	resolveSessionDataDir,
+	setClineDir,
+	setClineDirIfUnset,
 	setHomeDir,
 	setHomeDirIfUnset,
 } from "@clinebot/shared/storage";
@@ -123,6 +127,29 @@ export {
 	buildTeamProgressSummary,
 	toTeamProgressLifecycleEvent,
 } from "./team";
+export {
+	captureAuthFailed,
+	captureAuthLoggedOut,
+	captureAuthStarted,
+	captureAuthSucceeded,
+	captureConversationTurnEvent,
+	captureDiffEditFailure,
+	captureHookDiscovery,
+	captureMentionFailed,
+	captureMentionSearchResults,
+	captureMentionUsed,
+	captureModeSwitch,
+	captureProviderApiError,
+	captureSkillUsed,
+	captureSubagentExecution,
+	captureTaskCompleted,
+	captureTaskCreated,
+	captureTaskRestarted,
+	captureTokenUsage,
+	captureToolUsage,
+	identifyAccount,
+	LegacyTelemetryEvents,
+} from "./telemetry/core-events";
 export type { ITelemetryAdapter } from "./telemetry/ITelemetryAdapter";
 export {
 	LoggerTelemetryAdapter,

package/src/input/file-indexer.test.ts

@@ -84,4 +84,44 @@ describe("file indexer", () => {
 			await rm(cwd, { recursive: true, force: true });
 		}
 	});
+
+	it("evicts stale workspace indexes after 10 minutes when multiple workspaces exist", async () => {
+		vi.useFakeTimers();
+		const firstWorkspace = await createTempWorkspace();
+		const secondWorkspace = await createTempWorkspace();
+		try {
+			await writeFile(
+				path.join(firstWorkspace, "first.ts"),
+				"export const first = 1\n",
+				"utf8",
+			);
+			await writeFile(
+				path.join(secondWorkspace, "second.ts"),
+				"export const second = 2\n",
+				"utf8",
+			);
+
+			const firstIndex = await getFileIndex(firstWorkspace, { ttlMs: 60_000 });
+			expect(firstIndex.has("first.ts")).toBe(true);
+
+			await getFileIndex(secondWorkspace, { ttlMs: 60_000 });
+			vi.advanceTimersByTime(10 * 60_000 + 1);
+
+			await getFileIndex(secondWorkspace, { ttlMs: 60_000 });
+			await writeFile(
+				path.join(firstWorkspace, "later.ts"),
+				"export const later = 3\n",
+				"utf8",
+			);
+
+			const rebuiltFirstIndex = await getFileIndex(firstWorkspace, {
+				ttlMs: 60_000,
+			});
+			expect(rebuiltFirstIndex.has("later.ts")).toBe(true);
+		} finally {
+			vi.useRealTimers();
+			await rm(firstWorkspace, { recursive: true, force: true });
+			await rm(secondWorkspace, { recursive: true, force: true });
+		}
+	});
 });

package/src/input/file-indexer.ts

@@ -4,6 +4,7 @@ import path from "node:path";
 import { isMainThread, parentPort, Worker } from "node:worker_threads";
 
 const DEFAULT_INDEX_TTL_MS = 15_000;
+const STALE_CACHE_EVICTION_MS = 10 * 60_000;
 const WORKER_INDEX_REQUEST_TIMEOUT_MS = 1_000;
 const DEFAULT_EXCLUDE_DIRS = new Set([
 	".git",
@@ -21,6 +22,7 @@ const DEFAULT_EXCLUDE_DIRS = new Set([
 interface CacheEntry {
 	files: Set<string>;
 	lastBuiltAt: number;
+	lastAccessedAt: number;
 	pending: Promise<Set<string>> | null;
 }
 
@@ -43,6 +45,20 @@ interface IndexResponseMessage {
 
 const CACHE = new Map<string, CacheEntry>();
 
+function pruneStaleCacheEntries(now: number): void {
+	if (CACHE.size <= 1) {
+		return;
+	}
+	for (const [cwd, entry] of CACHE.entries()) {
+		if (entry.pending) {
+			continue;
+		}
+		if (now - entry.lastAccessedAt > STALE_CACHE_EVICTION_MS) {
+			CACHE.delete(cwd);
+		}
+	}
+}
+
 function toPosixRelative(cwd: string, absolutePath: string): string {
 	return path.relative(cwd, absolutePath).split(path.sep).join("/");
 }
@@ -265,6 +281,7 @@ export async function getFileIndex(
 ): Promise<Set<string>> {
 	const ttlMs = options.ttlMs ?? DEFAULT_INDEX_TTL_MS;
 	const now = Date.now();
+	pruneStaleCacheEntries(now);
 	const existing = CACHE.get(cwd);
 
 	if (
@@ -273,10 +290,12 @@ export async function getFileIndex(
 		now - existing.lastBuiltAt <= ttlMs &&
 		existing.files.size > 0
 	) {
+		existing.lastAccessedAt = now;
 		return existing.files;
 	}
 
 	if (existing?.pending) {
+		existing.lastAccessedAt = now;
 		return existing.pending;
 	}
 
@@ -284,6 +303,7 @@ export async function getFileIndex(
 		CACHE.set(cwd, {
 			files,
 			lastBuiltAt: Date.now(),
+			lastAccessedAt: Date.now(),
 			pending: null,
 		});
 		return files;
@@ -292,6 +312,7 @@ export async function getFileIndex(
 	CACHE.set(cwd, {
 		files: existing?.files ?? new Set<string>(),
 		lastBuiltAt: existing?.lastBuiltAt ?? 0,
+		lastAccessedAt: now,
 		pending,
 	});
 

package/src/input/mention-enricher.test.ts

@@ -32,6 +32,7 @@ describe("enrichPromptWithMentions", () => {
 				cwd,
 			);
 
+			expect(result.mentions).toEqual(["src/index.ts"]);
 			expect(result.matchedFiles).toEqual(["src/index.ts"]);
 			expect(result.ignoredMentions).toEqual([]);
 			expect(result.prompt).toBe("Review @src/index.ts");
@@ -50,6 +51,7 @@ describe("enrichPromptWithMentions", () => {
 				cwd,
 			);
 
+			expect(result.mentions).toEqual(["missing/file.ts"]);
 			expect(result.matchedFiles).toEqual([]);
 			expect(result.ignoredMentions).toEqual(["missing/file.ts"]);
 			expect(result.prompt).toBe(
@@ -72,6 +74,7 @@ describe("enrichPromptWithMentions", () => {
 				{ maxTotalBytes: 5, maxFiles: 2, maxFileBytes: 5 },
 			);
 
+			expect(result.mentions).toEqual(["a.ts", "b.ts"]);
 			expect(result.matchedFiles).toEqual(["a.ts"]);
 			expect(result.ignoredMentions).toEqual(["b.ts"]);
 			expect(result.prompt).toBe("Use @a.ts and @b.ts");

package/src/input/mention-enricher.ts

@@ -13,6 +13,7 @@ export interface MentionEnricherOptions extends FastFileIndexOptions {
 
 export interface MentionEnrichmentResult {
 	prompt: string;
+	mentions: string[];
 	matchedFiles: string[];
 	ignoredMentions: string[];
 }
@@ -60,6 +61,7 @@ export async function enrichPromptWithMentions(
 	if (mentions.length === 0) {
 		return {
 			prompt: input,
+			mentions: [],
 			matchedFiles: [],
 			ignoredMentions: [],
 		};
@@ -113,6 +115,7 @@ export async function enrichPromptWithMentions(
 
 	return {
 		prompt: input,
+		mentions,
 		matchedFiles: matched,
 		ignoredMentions: ignored,
 	};

package/src/providers/local-provider-service.ts

@@ -1,7 +1,6 @@
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
-import type { providers as LlmsProviders } from "@clinebot/llms";
-import { models } from "@clinebot/llms";
+import { LlmsModels, type LlmsProviders } from "@clinebot/llms";
 import type {
 	RpcAddProviderActionRequest,
 	RpcOAuthProviderId,
@@ -215,7 +214,7 @@ function registerCustomProvider(
 		]),
 	);
 
-	models.registerProvider({
+	LlmsModels.registerProvider({
 		provider: {
 			id: providerId,
 			name: entry.provider.name.trim() || titleCaseFromId(providerId),
@@ -318,7 +317,7 @@ export async function addLocalProvider(
 }> {
 	const providerId = request.providerId.trim().toLowerCase();
 	if (!providerId) throw new Error("providerId is required");
-	if (models.hasProvider(providerId)) {
+	if (LlmsModels.hasProvider(providerId)) {
 		throw new Error(`provider "${providerId}" already exists`);
 	}
 	const providerName = request.name.trim();
@@ -411,10 +410,10 @@ export async function listLocalProviders(
 	settingsPath: string;
 }> {
 	const state = manager.read();
-	const ids = models.getProviderIds().sort((a, b) => a.localeCompare(b));
+	const ids = LlmsModels.getProviderIds().sort((a, b) => a.localeCompare(b));
 	const providerItems = await Promise.all(
 		ids.map(async (id): Promise<RpcProviderListItem> => {
-			const info = await models.getProvider(id);
+			const info = await LlmsModels.getProvider(id);
 			const providerModels = await getLocalProviderModels(id);
 			const persistedSettings = state.providers[id]?.settings;
 			const providerName = info?.name ?? titleCaseFromId(id);
@@ -450,7 +449,7 @@ export async function getLocalProviderModels(
 	providerId: string,
 ): Promise<{ providerId: string; models: RpcProviderModel[] }> {
 	const id = providerId.trim();
-	const modelMap = await models.getModelsForProvider(id);
+	const modelMap = await LlmsModels.getModelsForProvider(id);
 	const items = Object.entries(modelMap)
 		.sort(([a], [b]) => a.localeCompare(b))
 		.map(([modelId, info]) => toRpcProviderModel(modelId, info));

package/src/runtime/hook-file-hooks.test.ts

@@ -1,9 +1,30 @@
-import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
+import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { describe, expect, it } from "vitest";
 import { createHookConfigFileHooks } from "./hook-file-hooks";
 
+async function waitForFile(
+	filePath: string,
+	timeoutMs = 1500,
+): Promise<string> {
+	const started = Date.now();
+	for (;;) {
+		try {
+			return await readFile(filePath, "utf8");
+		} catch (error) {
+			const code =
+				error && typeof error === "object" && "code" in error
+					? String((error as { code?: unknown }).code)
+					: undefined;
+			if (code !== "ENOENT" || Date.now() - started >= timeoutMs) {
+				throw error;
+			}
+			await new Promise((resolve) => setTimeout(resolve, 25));
+		}
+	}
+}
+
 async function createWorkspaceWithHook(
 	fileName: string,
 	body: string,
@@ -150,4 +171,33 @@ describe("createHookConfigFileHooks", () => {
 			await rm(workspace, { recursive: true, force: true });
 		}
 	});
+
+	it("maps TaskError hook files to agent_error stop events", async () => {
+		const outputPath = join(tmpdir(), `hooks-task-error-${Date.now()}.json`);
+		const { workspace } = await createWorkspaceWithHook(
+			"TaskError.js",
+			`let data='';process.stdin.on('data',c=>data+=c);process.stdin.on('end',()=>{require('node:fs').writeFileSync(${JSON.stringify(outputPath)}, data);});\n`,
+		);
+		try {
+			const hooks = createHookConfigFileHooks({
+				cwd: workspace,
+				workspacePath: workspace,
+			});
+			await hooks?.onStopError?.({
+				agentId: "agent_1",
+				conversationId: "conv_1",
+				parentAgentId: null,
+				iteration: 3,
+				error: new Error("401 unauthorized"),
+			});
+			const payload = JSON.parse(await waitForFile(outputPath)) as {
+				hookName: string;
+				error?: { message?: string };
+			};
+			expect(payload.hookName).toBe("agent_error");
+			expect(payload.error?.message).toBe("401 unauthorized");
+		} finally {
+			await rm(workspace, { recursive: true, force: true });
+		}
+	});
 });