Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/core/src/agents/a2aUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export function extractMessageText(message: Message | undefined): string {
/**
* Extracts text from a single Part.
*/
export function extractPartText(part: Part): string {
function extractPartText(part: Part): string {
if (isTextPart(part)) {
return part.text;
}
Expand Down
7 changes: 5 additions & 2 deletions packages/core/src/config/storage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,14 @@ import * as path from 'node:path';
import * as os from 'node:os';
import * as crypto from 'node:crypto';
import * as fs from 'node:fs';
import { GEMINI_DIR, homedir } from '../utils/paths.js';
import {
GEMINI_DIR,
homedir,
GOOGLE_ACCOUNTS_FILENAME,
} from '../utils/paths.js';
import { ProjectRegistry } from './projectRegistry.js';
import { StorageMigration } from './storageMigration.js';

export const GOOGLE_ACCOUNTS_FILENAME = 'google_accounts.json';
export const OAUTH_FILE = 'oauth_creds.json';
const TMP_DIR_NAME = 'tmp';
const BIN_DIR_NAME = 'bin';
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/ide/detect-ide.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export function isCloudShell(): boolean {
return !!(process.env['EDITOR_IN_CLOUD_SHELL'] || process.env['CLOUD_SHELL']);
}

export function isJetBrains(): boolean {
function isJetBrains(): boolean {
return !!process.env['TERMINAL_EMULATOR']
?.toLowerCase()
.includes('jetbrains');
Expand Down
2 changes: 0 additions & 2 deletions packages/core/src/mcp/oauth-provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ import { coreEvents } from '../utils/events.js';
import { debugLogger } from '../utils/debugLogger.js';
import { getConsentForOauth } from '../utils/authConsent.js';

export const OAUTH_DISPLAY_MESSAGE_EVENT = 'oauth-display-message' as const;

/**
* OAuth configuration for an MCP server.
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/scheduler/confirmation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export interface ResolutionResult {
* @param correlationId The correlationId to match.
* @param signal An AbortSignal to cancel the wait and cleanup listeners.
*/
export async function awaitConfirmation(
async function awaitConfirmation(
messageBus: MessageBus,
correlationId: string,
signal: AbortSignal,
Expand Down
6 changes: 3 additions & 3 deletions packages/core/src/services/chatCompressionService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,18 @@ import { LlmRole } from '../telemetry/types.js';
* Default threshold for compression token count as a fraction of the model's
* token limit. If the chat history exceeds this threshold, it will be compressed.
*/
export const DEFAULT_COMPRESSION_TOKEN_THRESHOLD = 0.5;
const DEFAULT_COMPRESSION_TOKEN_THRESHOLD = 0.5;

/**
* The fraction of the latest chat history to keep. A value of 0.3
* means that only the last 30% of the chat history will be kept after compression.
*/
export const COMPRESSION_PRESERVE_THRESHOLD = 0.3;
const COMPRESSION_PRESERVE_THRESHOLD = 0.3;

/**
* The budget for function response tokens in the preserved history.
*/
export const COMPRESSION_FUNCTION_RESPONSE_TOKEN_BUDGET = 50_000;
const COMPRESSION_FUNCTION_RESPONSE_TOKEN_BUDGET = 50_000;

/**
* Returns the index of the oldest item to keep when compressing. May return
Expand Down
18 changes: 0 additions & 18 deletions packages/core/src/telemetry/loggers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import type {
ConversationFinishedEvent,
ChatCompressionEvent,
MalformedJsonResponseEvent,
InvalidChunkEvent,
ContentRetryEvent,
ContentRetryFailureEvent,
RipgrepFallbackEvent,
Expand Down Expand Up @@ -65,7 +64,6 @@ import {
recordToolCallMetrics,
recordChatCompressionMetrics,
recordFileOperationMetric,
recordInvalidChunk,
recordContentRetry,
recordContentRetryFailure,
recordModelRoutingMetrics,
Expand Down Expand Up @@ -470,22 +468,6 @@ export function logMalformedJsonResponse(
});
}

export function logInvalidChunk(
config: Config,
event: InvalidChunkEvent,
): void {
ClearcutLogger.getInstance(config)?.logInvalidChunkEvent(event);
bufferTelemetryEvent(() => {
const logger = logs.getLogger(SERVICE_NAME);
const logRecord: LogRecord = {
body: event.toLogBody(),
attributes: event.toOpenTelemetryAttributes(config),
};
logger.emit(logRecord);
recordInvalidChunk(config);
});
}

export function logContentRetry(
config: Config,
event: ContentRetryEvent,
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/telemetry/metrics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ let baselineComparisonHistogram: Histogram | undefined;
let isMetricsInitialized = false;
let isPerformanceMonitoringEnabled = false;

export function getMeter(): Meter | undefined {
function getMeter(): Meter | undefined {
if (!cliMeter) {
cliMeter = metrics.getMeter(SERVICE_NAME);
}
Expand Down Expand Up @@ -1019,7 +1019,7 @@ function getGenAiOperationName(): GenAiOperationName {

// Performance Monitoring Functions

export function initializePerformanceMonitoring(config: Config): void {
function initializePerformanceMonitoring(config: Config): void {
const meter = getMeter();
if (!meter) return;

Expand Down
16 changes: 8 additions & 8 deletions packages/core/src/telemetry/semantic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ export function toChatMessage(content?: Content): ChatMessage {
return message;
}

export function toOTelPart(part: Part): AnyPart {
function toOTelPart(part: Part): AnyPart {
if (part.thought) {
if (part.text) {
return new ReasoningPart(part.text);
Expand Down Expand Up @@ -287,7 +287,7 @@ export enum OTelRole {
TOOL = 'tool',
}

export function toOTelRole(role?: string): OTelRole {
function toOTelRole(role?: string): OTelRole {
switch (role?.toLowerCase()) {
case 'system':
return OTelRole.SYSTEM;
Expand Down Expand Up @@ -322,7 +322,7 @@ export enum OTelFinishReason {
ERROR = 'error',
}

export function toOTelFinishReason(finishReason?: string): OTelFinishReason {
function toOTelFinishReason(finishReason?: string): OTelFinishReason {
switch (finishReason) {
// we have significantly more finish reasons than the spec
case FinishReason.FINISH_REASON_UNSPECIFIED:
Expand Down Expand Up @@ -376,7 +376,7 @@ export interface ChatMessage {
parts: AnyPart[];
}

export class TextPart {
class TextPart {
readonly type = 'text';
content: string;

Expand All @@ -385,7 +385,7 @@ export class TextPart {
}
}

export class ToolCallRequestPart {
class ToolCallRequestPart {
readonly type = 'tool_call';
name?: string;
id?: string;
Expand All @@ -398,7 +398,7 @@ export class ToolCallRequestPart {
}
}

export class ToolCallResponsePart {
class ToolCallResponsePart {
readonly type = 'tool_call_response';
response?: string;
id?: string;
Expand All @@ -409,7 +409,7 @@ export class ToolCallResponsePart {
}
}

export class ReasoningPart {
class ReasoningPart {
readonly type = 'reasoning';
content: string;

Expand All @@ -418,7 +418,7 @@ export class ReasoningPart {
}
}

export class GenericPart {
class GenericPart {
type: string;
[key: string]: unknown;

Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/utils/toolCallContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export interface ToolCallContext {
/**
* AsyncLocalStorage instance for tool call context.
*/
export const toolCallContext = new AsyncLocalStorage<ToolCallContext>();
const toolCallContext = new AsyncLocalStorage<ToolCallContext>();

/**
* Runs a function within a tool call context.
Expand Down
Loading