diff --git a/genkit-tools/cli/src/commands/init-ai-tools/ai-tools/claude.ts b/genkit-tools/cli/src/commands/init-ai-tools/ai-tools/claude.ts index fe8a594fa2..68796fd205 100644 --- a/genkit-tools/cli/src/commands/init-ai-tools/ai-tools/claude.ts +++ b/genkit-tools/cli/src/commands/init-ai-tools/ai-tools/claude.ts @@ -17,9 +17,9 @@ import { logger } from '@genkit-ai/tools-common/utils'; import { existsSync, readFileSync } from 'fs'; import { writeFile } from 'fs/promises'; -import { GENKIT_PROMPT_PATH } from '../constants'; import { AIToolConfigResult, AIToolModule, InitConfigOptions } from '../types'; import { + GENKIT_PROMPT_PATH, calculateHash, getGenkitContext, initOrReplaceFile, diff --git a/genkit-tools/cli/src/commands/init-ai-tools/ai-tools/gemini.ts b/genkit-tools/cli/src/commands/init-ai-tools/ai-tools/gemini.ts index 0731b0f4c7..d4de7efe22 100644 --- a/genkit-tools/cli/src/commands/init-ai-tools/ai-tools/gemini.ts +++ b/genkit-tools/cli/src/commands/init-ai-tools/ai-tools/gemini.ts @@ -17,9 +17,12 @@ import { logger } from '@genkit-ai/tools-common/utils'; import { mkdir } from 'fs/promises'; import path from 'path'; -import { GENKIT_PROMPT_PATH } from '../constants'; import { AIToolConfigResult, AIToolModule, InitConfigOptions } from '../types'; -import { getGenkitContext, initOrReplaceFile } from '../utils'; +import { + GENKIT_PROMPT_PATH, + getGenkitContext, + initOrReplaceFile, +} from '../utils'; // Define constants at the module level for clarity and reuse. const GENKIT_EXT_DIR = path.join('.gemini', 'extensions', 'genkit'); diff --git a/genkit-tools/cli/src/commands/init-ai-tools/ai-tools/generic.ts b/genkit-tools/cli/src/commands/init-ai-tools/ai-tools/generic.ts index 672b3d5ccf..9a72c14d28 100644 --- a/genkit-tools/cli/src/commands/init-ai-tools/ai-tools/generic.ts +++ b/genkit-tools/cli/src/commands/init-ai-tools/ai-tools/generic.ts @@ -15,9 +15,12 @@ */ import { logger } from '@genkit-ai/tools-common/utils'; -import { GENKIT_PROMPT_PATH } from '../constants'; import { AIToolConfigResult, AIToolModule, InitConfigOptions } from '../types'; -import { getGenkitContext, initOrReplaceFile } from '../utils'; +import { + GENKIT_PROMPT_PATH, + getGenkitContext, + initOrReplaceFile, +} from '../utils'; /** Configuration module for GENKIT.md context file for generic use */ export const generic: AIToolModule = { diff --git a/genkit-tools/cli/src/commands/init-ai-tools/command.ts b/genkit-tools/cli/src/commands/init-ai-tools/command.ts index 4fd80bc11c..43fd5257d0 100644 --- a/genkit-tools/cli/src/commands/init-ai-tools/command.ts +++ b/genkit-tools/cli/src/commands/init-ai-tools/command.ts @@ -18,8 +18,18 @@ import { logger } from '@genkit-ai/tools-common/utils'; import { checkbox } from '@inquirer/prompts'; import * as clc from 'colorette'; import { Command } from 'commander'; -import { AI_TOOLS } from './constants'; -import { AIToolChoice, InitConfigOptions } from './types'; +import { claude } from './ai-tools/claude'; +import { gemini } from './ai-tools/gemini'; +import { generic } from './ai-tools/generic'; +import { AIToolChoice, AIToolModule, InitConfigOptions } from './types'; + +/** Set of all supported AI tools that can be configured (incl. a generic + * configuration) */ +export const AI_TOOLS: Record = { + gemini, + claude, + generic, +}; const AGENT_CHOICES: AIToolChoice[] = Object.values(AI_TOOLS).map((tool) => ({ value: tool.name, diff --git a/genkit-tools/cli/src/commands/init-ai-tools/constants.ts b/genkit-tools/cli/src/commands/init-ai-tools/constants.ts deleted file mode 100644 index dc2a127d66..0000000000 --- a/genkit-tools/cli/src/commands/init-ai-tools/constants.ts +++ /dev/null @@ -1,31 +0,0 @@ -/** - * Copyright 2025 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { claude } from './ai-tools/claude'; -import { gemini } from './ai-tools/gemini'; -import { generic } from './ai-tools/generic'; -import { AIToolModule } from './types'; - -/** Shared location for the GENKIT.md context file */ -export const GENKIT_PROMPT_PATH = 'GENKIT.md'; - -/** Set of all supported AI tools that can be configured (incl. a generic - * configuration) */ -export const AI_TOOLS: Record = { - gemini, - claude, - generic, -}; diff --git a/genkit-tools/cli/src/commands/init-ai-tools/utils.ts b/genkit-tools/cli/src/commands/init-ai-tools/utils.ts index 95806d5e56..da9f1fa8f6 100644 --- a/genkit-tools/cli/src/commands/init-ai-tools/utils.ts +++ b/genkit-tools/cli/src/commands/init-ai-tools/utils.ts @@ -20,6 +20,9 @@ import * as crypto from 'crypto'; import { writeFile } from 'fs/promises'; import path from 'path'; +/** Shared location for the GENKIT.md context file */ +export const GENKIT_PROMPT_PATH = 'GENKIT.md'; + const CONTEXT_DIR = path.resolve(__dirname, '..', '..', 'context'); const GENKIT_TAG_REGEX = /([\s\S]*?)<\/genkit_prompts>/;