gaunt-sloth-assistant 0.4.2 → 0.5.1

package/src/commands/prCommand.ts

@@ -0,0 +1,93 @@
+import { Command, Option } from 'commander';
+import {
+  readBackstory,
+  readGuidelines,
+  readReviewInstructions,
+  readSystemPrompt,
+} from '#src/prompt.js';
+import { readMultipleFilesFromCurrentDir } from '#src/utils.js';
+import {
+  REQUIREMENTS_PROVIDERS,
+  CONTENT_PROVIDERS,
+  type RequirementsProviderType,
+  getRequirementsFromProvider,
+  type ContentProviderType,
+} from './commandUtils.js';
+
+interface PrCommandOptions {
+  file?: string[];
+  requirementsProvider?: RequirementsProviderType;
+}
+
+export function prCommand(program: Command): void {
+  program
+    .command('pr')
+    .description(
+      'Review provided Pull Request in current directory. ' +
+        'This command is similar to `review`, but default content provider is `github`. ' +
+        '(assuming that GitHub CLI is installed and authenticated for current project'
+    )
+    .argument('<prId>', 'Pull request ID to review.')
+    .argument(
+      '[requirementsId]',
+      'Optional requirements ID argument to retrieve requirements with requirements provider'
+    )
+    .addOption(
+      new Option(
+        '-p, --requirements-provider <requirementsProvider>',
+        'Requirements provider for this review.'
+      ).choices(Object.keys(REQUIREMENTS_PROVIDERS))
+    )
+    .option(
+      '-f, --file [files...]',
+      'Input files. Content of these files will be added BEFORE the diff, but after requirements'
+    )
+    .action(async (prId: string, requirementsId: string | undefined, options: PrCommandOptions) => {
+      const { initConfig } = await import('#src/config.js');
+      const config = await initConfig(); // Initialize and get config
+
+      const systemPrompt = readSystemPrompt();
+      const systemMessage = [
+        readBackstory(),
+        readGuidelines(config.projectGuidelines),
+        readReviewInstructions(config.projectReviewInstructions),
+      ];
+      if (systemPrompt) {
+        systemMessage.push(systemPrompt);
+      }
+      const content: string[] = [];
+      const requirementsProvider =
+        options.requirementsProvider ??
+        (config?.commands?.pr?.requirementsProvider as RequirementsProviderType | undefined) ??
+        (config?.requirementsProvider as RequirementsProviderType | undefined);
+
+      const contentProvider =
+        (config?.commands?.pr?.contentProvider as ContentProviderType | undefined) ??
+        (config?.contentProvider as ContentProviderType | undefined) ??
+        'github';
+
+      // Handle requirements
+      const requirements = await getRequirementsFromProvider(
+        requirementsProvider,
+        requirementsId,
+        config
+      );
+      if (requirements) {
+        content.push(requirements);
+      }
+
+      if (options.file) {
+        content.push(readMultipleFilesFromCurrentDir(options.file));
+      }
+
+      // Get PR diff using the provider
+      const providerPath = `#src/providers/${CONTENT_PROVIDERS[contentProvider]}`;
+      const { get } = await import(providerPath);
+      content.push(await get(null, prId));
+
+      const { review } = await import('#src/modules/reviewModule.js');
+      // TODO consider including requirements id
+      // TODO sanitize prId
+      await review(`PR-${prId}`, systemMessage.join('\n'), content.join('\n'), config, 'pr');
+    });
+}

package/src/commands/reviewCommand.ts

@@ -1,36 +1,20 @@
 import { Command, Option } from 'commander';
-import type { SlothContext } from '#src/config.js';
-import { slothContext } from '#src/config.js';
-import { readBackstory, readGuidelines, readReviewInstructions } from '#src/prompt.js';
+import {
+  readBackstory,
+  readGuidelines,
+  readReviewInstructions,
+  readSystemPrompt,
+} from '#src/prompt.js';
 import { readMultipleFilesFromCurrentDir } from '#src/utils.js';
-import { displayError } from '#src/consoleUtils.js';
 import { getStringFromStdin } from '#src/systemUtils.js';
-
-/**
- * Requirements providers. Expected to be in `.providers/` dir.
- * Aliases are mapped to actual providers in this file
- */
-const REQUIREMENTS_PROVIDERS = {
-  'jira-legacy': 'jiraIssueLegacyProvider.js',
-  jira: 'jiraIssueProvider.js',
-  github: 'ghIssueProvider.js',
-  text: 'text.js',
-  file: 'file.js',
-} as const;
-
-type RequirementsProviderType = keyof typeof REQUIREMENTS_PROVIDERS;
-
-/**
- * Content providers. Expected to be in `.providers/` dir.
- * Aliases are mapped to actual providers in this file
- */
-const CONTENT_PROVIDERS = {
-  github: 'ghPrDiffProvider.js',
-  text: 'text.js',
-  file: 'file.js',
-} as const;
-
-type ContentProviderType = keyof typeof CONTENT_PROVIDERS;
+import {
+  REQUIREMENTS_PROVIDERS,
+  CONTENT_PROVIDERS,
+  type RequirementsProviderType,
+  type ContentProviderType,
+  getRequirementsFromProvider,
+  getContentFromProvider,
+} from './commandUtils.js';
 
 interface ReviewCommandOptions {
   file?: string[];
@@ -40,12 +24,7 @@ interface ReviewCommandOptions {
   message?: string;
 }
 
-interface PrCommandOptions {
-  file?: string[];
-  requirementsProvider?: RequirementsProviderType;
-}
-
-export function reviewCommand(program: Command, context: SlothContext): void {
+export function reviewCommand(program: Command): void {
   program
     .command('review')
     .description('Review provided diff or other content')
@@ -75,32 +54,38 @@ export function reviewCommand(program: Command, context: SlothContext): void {
     .option('-m, --message <message>', 'Extra message to provide just before the content')
     .action(async (contentId: string | undefined, options: ReviewCommandOptions) => {
       const { initConfig } = await import('#src/config.js');
-      await initConfig();
+      const config = await initConfig(); // Initialize and get config
+      const systemPrompt = readSystemPrompt();
       const systemMessage = [
         readBackstory(),
-        readGuidelines(slothContext.config.projectGuidelines),
-        readReviewInstructions(slothContext.config.projectReviewInstructions),
+        readGuidelines(config.projectGuidelines),
+        readReviewInstructions(config.projectReviewInstructions),
       ];
+      if (systemPrompt) {
+        systemMessage.push(systemPrompt);
+      }
       const content: string[] = [];
       const requirementsId = options.requirements;
       const requirementsProvider =
         options.requirementsProvider ??
-        (context.config?.commands?.review?.requirementsProvider as
-          | RequirementsProviderType
-          | undefined) ??
-        (context.config?.requirementsProvider as RequirementsProviderType | undefined);
+        (config?.commands?.review?.requirementsProvider as RequirementsProviderType | undefined) ??
+        (config?.requirementsProvider as RequirementsProviderType | undefined);
       const contentProvider =
         options.contentProvider ??
-        (context.config?.commands?.review?.contentProvider as ContentProviderType | undefined) ??
-        (context.config?.contentProvider as ContentProviderType | undefined);
+        (config?.commands?.review?.contentProvider as ContentProviderType | undefined) ??
+        (config?.contentProvider as ContentProviderType | undefined);
 
       // TODO consider calling these in parallel
-      const requirements = await getRequirementsFromProvider(requirementsProvider, requirementsId);
+      const requirements = await getRequirementsFromProvider(
+        requirementsProvider,
+        requirementsId,
+        config
+      );
       if (requirements) {
         content.push(requirements);
       }
 
-      const providedContent = await getContentFromProvider(contentProvider, contentId);
+      const providedContent = await getContentFromProvider(contentProvider, contentId, config);
       if (providedContent) {
         content.push(providedContent);
       }
@@ -116,113 +101,6 @@ export function reviewCommand(program: Command, context: SlothContext): void {
         content.push(options.message);
       }
       const { review } = await import('#src/modules/reviewModule.js');
-      await review('REVIEW', systemMessage.join('\n'), content.join('\n'));
-    });
-
-  program
-    .command('pr')
-    .description(
-      'Review provided Pull Request in current directory. ' +
-        'This command is similar to `review`, but default content provider is `github`. ' +
-        '(assuming that GitHub CLI is installed and authenticated for current project'
-    )
-    .argument('<prId>', 'Pull request ID to review.')
-    .argument(
-      '[requirementsId]',
-      'Optional requirements ID argument to retrieve requirements with requirements provider'
-    )
-    .addOption(
-      new Option(
-        '-p, --requirements-provider <requirementsProvider>',
-        'Requirements provider for this review.'
-      ).choices(Object.keys(REQUIREMENTS_PROVIDERS))
-    )
-    .option(
-      '-f, --file [files...]',
-      'Input files. Content of these files will be added BEFORE the diff, but after requirements'
-    )
-    .action(async (prId: string, requirementsId: string | undefined, options: PrCommandOptions) => {
-      const { initConfig } = await import('#src/config.js');
-      await initConfig();
-
-      const systemMessage = [
-        readBackstory(),
-        readGuidelines(slothContext.config.projectGuidelines),
-        readReviewInstructions(slothContext.config.projectReviewInstructions),
-      ];
-      const content: string[] = [];
-      const requirementsProvider =
-        options.requirementsProvider ??
-        (context.config?.commands?.pr?.requirementsProvider as
-          | RequirementsProviderType
-          | undefined) ??
-        (context.config?.requirementsProvider as RequirementsProviderType | undefined);
-
-      // Handle requirements
-      const requirements = await getRequirementsFromProvider(requirementsProvider, requirementsId);
-      if (requirements) {
-        content.push(requirements);
-      }
-
-      if (options.file) {
-        content.push(readMultipleFilesFromCurrentDir(options.file));
-      }
-
-      // Get PR diff using the 'github' provider
-      const providerPath = `#src/providers/${CONTENT_PROVIDERS['github']}`;
-      const { get } = await import(providerPath);
-      content.push(await get(null, prId));
-
-      const { review } = await import('#src/modules/reviewModule.js');
-      // TODO consider including requirements id
-      // TODO sanitize prId
-      await review(`PR-${prId}`, systemMessage.join('\n'), content.join('\n'));
+      await review('REVIEW', systemMessage.join('\n'), content.join('\n'), config);
     });
-
-  async function getRequirementsFromProvider(
-    requirementsProvider: RequirementsProviderType | undefined,
-    requirementsId: string | undefined
-  ): Promise<string> {
-    return getFromProvider(
-      requirementsProvider,
-      requirementsId,
-      (context.config?.requirementsProviderConfig ?? {})[requirementsProvider as string],
-      REQUIREMENTS_PROVIDERS
-    );
-  }
-
-  async function getContentFromProvider(
-    contentProvider: ContentProviderType | undefined,
-    contentId: string | undefined
-  ): Promise<string> {
-    return getFromProvider(
-      contentProvider,
-      contentId,
-      (context.config?.contentProviderConfig ?? {})[contentProvider as string],
-      CONTENT_PROVIDERS
-    );
-  }
-
-  async function getFromProvider(
-    provider: RequirementsProviderType | ContentProviderType | undefined,
-    id: string | undefined,
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    config: any,
-    legitPredefinedProviders: typeof REQUIREMENTS_PROVIDERS | typeof CONTENT_PROVIDERS
-  ): Promise<string> {
-    if (typeof provider === 'string') {
-      // Use one of the predefined providers
-      if (legitPredefinedProviders[provider as keyof typeof legitPredefinedProviders]) {
-        const providerPath = `#src/providers/${legitPredefinedProviders[provider as keyof typeof legitPredefinedProviders]}`;
-        const { get } = await import(providerPath);
-        return await get(config, id);
-      } else {
-        displayError(`Unknown provider: ${provider}. Continuing without it.`);
-      }
-    } else if (typeof provider === 'function') {
-      // Type assertion to handle function call
-      return await (provider as (id: string | undefined) => Promise<string>)(id);
-    }
-    return '';
-  }
 }