@git.zone/tsdoc 1.11.1 → 1.11.3

package/ts/classes.aidoc.ts

@@ -8,7 +8,7 @@ export class AiDoc {
   public npmextraKV: plugins.npmextra.KeyValueStore;
   public qenvInstance: plugins.qenv.Qenv;
   public aidocInteract: plugins.smartinteract.SmartInteract;
-  public openaiInstance: plugins.smartai.OpenAiProvider;
+  public smartAiInstance: plugins.smartai.SmartAi;
 
   argvArg: any;
 
@@ -85,20 +85,28 @@ export class AiDoc {
     }
 
     // lets assume we have an OPENAI_Token now
-    this.openaiInstance = new plugins.smartai.OpenAiProvider({
+    this.smartAiInstance = new plugins.smartai.SmartAi({
       openaiToken: this.openaiToken,
     });
-    await this.openaiInstance.start();
+    await this.smartAiInstance.start();
   }
 
   public async stop() {
-    if (this.openaiInstance) {
-      await this.openaiInstance.stop();
+    if (this.smartAiInstance) {
+      await this.smartAiInstance.stop();
     }
     // No explicit cleanup needed for npmextraKV or aidocInteract
     // They don't keep event loop alive
   }
 
+  /**
+   * Get the OpenAI provider for direct chat calls
+   * This is a convenience getter to access the provider from SmartAi
+   */
+  public get openaiProvider(): plugins.smartai.OpenAiProvider {
+    return this.smartAiInstance.openaiProvider;
+  }
+
   public getOpenaiToken(): string {
     return this.openaiToken;
   }
@@ -146,13 +154,12 @@ export class AiDoc {
   }
   
   /**
-   * Count tokens in a text string using GPT tokenizer
-   * @param text The text to count tokens for
-   * @param model The model to use for tokenization (default: gpt-3.5-turbo)
-   * @returns The number of tokens in the text
+   * Estimate token count in a text string
+   * @param text The text to estimate tokens for
+   * @returns Estimated number of tokens
    */
-  public countTokens(text: string, model: string = 'gpt-3.5-turbo'): number {
+  public countTokens(text: string): number {
     const projectContextInstance = new aiDocsClasses.ProjectContext('');
-    return projectContextInstance.countTokens(text, model);
+    return projectContextInstance.countTokens(text);
   }
 }

package/ts/cli.ts

@@ -4,7 +4,6 @@ import { logger } from './logging.js';
 
 import { TypeDoc } from './classes.typedoc.js';
 import { AiDoc } from './classes.aidoc.js';
-import * as context from './context/index.js';
 
 export const run = async () => {
   const tsdocCli = new plugins.smartcli.Smartcli();
@@ -32,17 +31,6 @@ export const run = async () => {
     const aidocInstance = new AiDoc();
     await aidocInstance.start();
 
-    // Get context token count if requested
-    if (argvArg.tokens || argvArg.showTokens) {
-      logger.log('info', `Calculating context token count...`);
-      const tokenCount = await aidocInstance.getProjectContextTokenCount(paths.cwd);
-      logger.log('ok', `Total context token count: ${tokenCount}`);
-
-      if (argvArg.tokensOnly) {
-        return; // Exit early if we only want token count
-      }
-    }
-
     logger.log('info', `Generating new readme...`);
     logger.log('info', `This may take some time...`);
     await aidocInstance.buildReadme(paths.cwd);
@@ -51,102 +39,34 @@ export const run = async () => {
     await aidocInstance.buildDescription(paths.cwd);
   });
 
-  tsdocCli.addCommand('tokens').subscribe(async (argvArg) => {
+  tsdocCli.addCommand('readme').subscribe(async (argvArg) => {
     const aidocInstance = new AiDoc();
     await aidocInstance.start();
 
-    logger.log('info', `Calculating context token count...`);
-
-    // Get task type if specified
-    let taskType: context.TaskType | undefined = undefined;
-    if (argvArg.task) {
-      if (['readme', 'commit', 'description'].includes(argvArg.task)) {
-        taskType = argvArg.task as context.TaskType;
-      } else {
-        logger.log('warn', `Unknown task type: ${argvArg.task}. Using default (readme).`);
-        taskType = 'readme';
-      }
-    } else {
-      // Default to readme if no task specified
-      taskType = 'readme';
-    }
-
-    // Use iterative context building
-    const taskFactory = new context.TaskContextFactory(paths.cwd);
-    await taskFactory.initialize();
-
-    let contextResult: context.IIterativeContextResult;
+    logger.log('info', `Generating new readme...`);
+    logger.log('info', `This may take some time...`);
+    await aidocInstance.buildReadme(paths.cwd);
+  });
 
-    if (argvArg.all) {
-      // Show stats for all task types
-      const stats = await taskFactory.getTokenStats();
+  tsdocCli.addCommand('description').subscribe(async (argvArg) => {
+    const aidocInstance = new AiDoc();
+    await aidocInstance.start();
 
-      logger.log('ok', 'Token statistics by task:');
-      for (const [task, data] of Object.entries(stats)) {
-        logger.log('info', `\n${task.toUpperCase()}:`);
-        logger.log('info', `  Tokens: ${data.tokenCount}`);
-        logger.log('info', `  Token savings: ${data.savings}`);
-        logger.log('info', `  Files: ${data.includedFiles} included, ${data.trimmedFiles} trimmed, ${data.excludedFiles} excluded`);
+    logger.log('info', `Generating new description and keywords...`);
+    logger.log('info', `This may take some time...`);
+    await aidocInstance.buildDescription(paths.cwd);
+  });
 
-        // Calculate percentage of model context
-        const o4MiniPercentage = (data.tokenCount / 200000 * 100).toFixed(2);
-        logger.log('info', `  Context usage: ${o4MiniPercentage}% of o4-mini (200K tokens)`);
-      }
+  tsdocCli.addCommand('commit').subscribe(async (argvArg) => {
+    const aidocInstance = new AiDoc();
+    await aidocInstance.start();
 
-      return;
-    }
+    logger.log('info', `Generating commit message...`);
+    logger.log('info', `This may take some time...`);
+    const commitObject = await aidocInstance.buildNextCommitObject(paths.cwd);
 
-    // Get context for specific task
-    contextResult = await taskFactory.createContextForTask(taskType);
-    
-    // Display results
-    logger.log('ok', `Total context token count: ${contextResult.tokenCount}`);
-    logger.log('info', `Files included: ${contextResult.includedFiles.length}`);
-    logger.log('info', `Files trimmed: ${contextResult.trimmedFiles.length}`);
-    logger.log('info', `Files excluded: ${contextResult.excludedFiles.length}`);
-    logger.log('info', `Token savings: ${contextResult.tokenSavings}`);
-    
-    if (argvArg.detailed) {
-      // Show more detailed info about the context and token usage
-      const o4MiniPercentage = (contextResult.tokenCount / 200000 * 100).toFixed(2);
-      logger.log('info', `Token usage: ${o4MiniPercentage}% of o4-mini 200K token context window`);
-      
-      if (argvArg.model) {
-        // Show percentages for different models
-        if (argvArg.model === 'gpt4') {
-          const gpt4Percentage = (contextResult.tokenCount / 8192 * 100).toFixed(2);
-          logger.log('info', `Token usage (GPT-4): ${gpt4Percentage}% of 8192 token context window`);
-        } else if (argvArg.model === 'gpt35') {
-          const gpt35Percentage = (contextResult.tokenCount / 4096 * 100).toFixed(2);
-          logger.log('info', `Token usage (GPT-3.5): ${gpt35Percentage}% of 4096 token context window`);
-        }
-      }
-      
-      // Estimate cost (approximate values)
-      const o4MiniInputCost = 0.00005; // per 1K tokens for o4-mini
-      const estimatedCost = (contextResult.tokenCount / 1000 * o4MiniInputCost).toFixed(6);
-      logger.log('info', `Estimated input cost: $${estimatedCost} (o4-mini)`);
-      
-      if (argvArg.listFiles) {
-        // List files included in context
-        logger.log('info', '\nIncluded files:');
-        contextResult.includedFiles.forEach(file => {
-          logger.log('info', `  ${file.relativePath} (${file.tokenCount} tokens)`);
-        });
-        
-        logger.log('info', '\nTrimmed files:');
-        contextResult.trimmedFiles.forEach(file => {
-          logger.log('info', `  ${file.relativePath} (${file.tokenCount} tokens)`);
-        });
-        
-        if (contextResult.excludedFiles.length > 0) {
-          logger.log('info', '\nExcluded files:');
-          contextResult.excludedFiles.forEach(file => {
-            logger.log('info', `  ${file.relativePath} (${file.tokenCount} tokens)`);
-          });
-        }
-      }
-    }
+    logger.log('ok', `Commit message generated:`);
+    console.log(JSON.stringify(commitObject, null, 2));
   });
 
   tsdocCli.addCommand('test').subscribe((argvArg) => {

package/ts/plugins.ts

@@ -52,6 +52,5 @@ export { tspublish };
 
 // third party scope
 import * as typedoc from 'typedoc';
-import * as gptTokenizer from 'gpt-tokenizer';
 
-export { typedoc, gptTokenizer };
+export { typedoc };

package/dist_ts/context/config-manager.d.ts

@@ -1,83 +0,0 @@
-import type { IContextConfig, ITrimConfig, ITaskConfig, TaskType, ICacheConfig, IAnalyzerConfig, IPrioritizationWeights, ITierConfig, IIterativeConfig } from './types.js';
-/**
- * Manages configuration for context building
- */
-export declare class ConfigManager {
-    private static instance;
-    private config;
-    private projectDir;
-    private configCache;
-    /**
-     * Get the singleton instance of ConfigManager
-     */
-    static getInstance(): ConfigManager;
-    /**
-     * Private constructor for singleton pattern
-     */
-    private constructor();
-    /**
-     * Initialize the config manager with a project directory
-     * @param projectDir The project directory
-     */
-    initialize(projectDir: string): Promise<void>;
-    /**
-     * Get the default configuration
-     */
-    private getDefaultConfig;
-    /**
-     * Load configuration from npmextra.json
-     */
-    private loadConfig;
-    /**
-     * Merge configurations, with userConfig taking precedence
-     * @param defaultConfig The default configuration
-     * @param userConfig The user configuration
-     */
-    private mergeConfigs;
-    /**
-     * Get the complete configuration
-     */
-    getConfig(): IContextConfig;
-    /**
-     * Get the trimming configuration
-     */
-    getTrimConfig(): ITrimConfig;
-    /**
-     * Get configuration for a specific task
-     * @param taskType The type of task
-     */
-    getTaskConfig(taskType: TaskType): ITaskConfig;
-    /**
-     * Get the maximum tokens allowed for context
-     */
-    getMaxTokens(): number;
-    /**
-     * Update the configuration
-     * @param config The new configuration
-     */
-    updateConfig(config: Partial<IContextConfig>): Promise<void>;
-    /**
-     * Get cache configuration
-     */
-    getCacheConfig(): ICacheConfig;
-    /**
-     * Get analyzer configuration
-     */
-    getAnalyzerConfig(): IAnalyzerConfig;
-    /**
-     * Get prioritization weights
-     */
-    getPrioritizationWeights(): IPrioritizationWeights;
-    /**
-     * Get tier configuration
-     */
-    getTierConfig(): ITierConfig;
-    /**
-     * Get iterative configuration
-     */
-    getIterativeConfig(): IIterativeConfig;
-    /**
-     * Clear the config cache (force reload on next access)
-     */
-    clearCache(): void;
-}

package/dist_ts/context/config-manager.js

@@ -1,318 +0,0 @@
-import * as plugins from '../plugins.js';
-import * as fs from 'fs';
-/**
- * Manages configuration for context building
- */
-export class ConfigManager {
-    /**
-     * Get the singleton instance of ConfigManager
-     */
-    static getInstance() {
-        if (!ConfigManager.instance) {
-            ConfigManager.instance = new ConfigManager();
-        }
-        return ConfigManager.instance;
-    }
-    /**
-     * Private constructor for singleton pattern
-     */
-    constructor() {
-        this.projectDir = '';
-        this.configCache = null;
-        this.config = this.getDefaultConfig();
-    }
-    /**
-     * Initialize the config manager with a project directory
-     * @param projectDir The project directory
-     */
-    async initialize(projectDir) {
-        this.projectDir = projectDir;
-        await this.loadConfig();
-    }
-    /**
-     * Get the default configuration
-     */
-    getDefaultConfig() {
-        return {
-            maxTokens: 190000, // Default for o4-mini with some buffer
-            defaultMode: 'trimmed',
-            taskSpecificSettings: {
-                readme: {
-                    mode: 'trimmed',
-                    includePaths: ['ts/', 'src/'],
-                    excludePaths: ['test/', 'node_modules/']
-                },
-                commit: {
-                    mode: 'trimmed',
-                    focusOnChangedFiles: true
-                },
-                description: {
-                    mode: 'trimmed',
-                    includePackageInfo: true
-                }
-            },
-            trimming: {
-                removeImplementations: true,
-                preserveInterfaces: true,
-                preserveTypeDefs: true,
-                preserveJSDoc: true,
-                maxFunctionLines: 5,
-                removeComments: true,
-                removeBlankLines: true
-            },
-            cache: {
-                enabled: true,
-                ttl: 3600, // 1 hour
-                maxSize: 100, // 100MB
-                directory: undefined // Will be set to .nogit/context-cache by ContextCache
-            },
-            analyzer: {
-                useAIRefinement: false, // Disabled by default for now
-                aiModel: 'haiku'
-            },
-            prioritization: {
-                dependencyWeight: 0.3,
-                relevanceWeight: 0.4,
-                efficiencyWeight: 0.2,
-                recencyWeight: 0.1
-            },
-            tiers: {
-                essential: { minScore: 0.8, trimLevel: 'none' },
-                important: { minScore: 0.5, trimLevel: 'light' },
-                optional: { minScore: 0.2, trimLevel: 'aggressive' }
-            },
-            iterative: {
-                maxIterations: 5,
-                firstPassFileLimit: 10,
-                subsequentPassFileLimit: 5,
-                temperature: 0.3,
-                model: 'gpt-4-turbo-preview'
-            }
-        };
-    }
-    /**
-     * Load configuration from npmextra.json
-     */
-    async loadConfig() {
-        try {
-            if (!this.projectDir) {
-                return;
-            }
-            const npmextraJsonPath = plugins.path.join(this.projectDir, 'npmextra.json');
-            // Check if file exists
-            const fileExists = await plugins.fsInstance.file(npmextraJsonPath).exists();
-            if (!fileExists) {
-                return;
-            }
-            // Check cache
-            const stats = await fs.promises.stat(npmextraJsonPath);
-            const currentMtime = Math.floor(stats.mtimeMs);
-            if (this.configCache && this.configCache.mtime === currentMtime) {
-                // Use cached config
-                this.config = this.configCache.config;
-                return;
-            }
-            // Read the npmextra.json file
-            const npmextraJsonFile = await plugins.smartfileFactory.fromFilePath(npmextraJsonPath);
-            const npmextraContent = JSON.parse(npmextraJsonFile.contents.toString());
-            // Check for tsdoc context configuration
-            if (npmextraContent?.['@git.zone/tsdoc']?.context) {
-                // Merge with default config
-                this.config = this.mergeConfigs(this.config, npmextraContent['@git.zone/tsdoc'].context);
-            }
-            // Cache the config
-            this.configCache = {
-                mtime: currentMtime,
-                config: { ...this.config }
-            };
-        }
-        catch (error) {
-            console.error('Error loading context configuration:', error);
-        }
-    }
-    /**
-     * Merge configurations, with userConfig taking precedence
-     * @param defaultConfig The default configuration
-     * @param userConfig The user configuration
-     */
-    mergeConfigs(defaultConfig, userConfig) {
-        const result = { ...defaultConfig };
-        // Merge top-level properties
-        if (userConfig.maxTokens !== undefined)
-            result.maxTokens = userConfig.maxTokens;
-        if (userConfig.defaultMode !== undefined)
-            result.defaultMode = userConfig.defaultMode;
-        // Merge task-specific settings
-        if (userConfig.taskSpecificSettings) {
-            result.taskSpecificSettings = result.taskSpecificSettings || {};
-            // For each task type, merge settings
-            ['readme', 'commit', 'description'].forEach(taskType => {
-                if (userConfig.taskSpecificSettings?.[taskType]) {
-                    result.taskSpecificSettings[taskType] = {
-                        ...result.taskSpecificSettings[taskType],
-                        ...userConfig.taskSpecificSettings[taskType]
-                    };
-                }
-            });
-        }
-        // Merge trimming configuration
-        if (userConfig.trimming) {
-            result.trimming = {
-                ...result.trimming,
-                ...userConfig.trimming
-            };
-        }
-        // Merge cache configuration
-        if (userConfig.cache) {
-            result.cache = {
-                ...result.cache,
-                ...userConfig.cache
-            };
-        }
-        // Merge analyzer configuration
-        if (userConfig.analyzer) {
-            result.analyzer = {
-                ...result.analyzer,
-                ...userConfig.analyzer
-            };
-        }
-        // Merge prioritization weights
-        if (userConfig.prioritization) {
-            result.prioritization = {
-                ...result.prioritization,
-                ...userConfig.prioritization
-            };
-        }
-        // Merge tier configuration
-        if (userConfig.tiers) {
-            result.tiers = {
-                ...result.tiers,
-                ...userConfig.tiers
-            };
-        }
-        // Merge iterative configuration
-        if (userConfig.iterative) {
-            result.iterative = {
-                ...result.iterative,
-                ...userConfig.iterative
-            };
-        }
-        return result;
-    }
-    /**
-     * Get the complete configuration
-     */
-    getConfig() {
-        return this.config;
-    }
-    /**
-     * Get the trimming configuration
-     */
-    getTrimConfig() {
-        return this.config.trimming || {};
-    }
-    /**
-     * Get configuration for a specific task
-     * @param taskType The type of task
-     */
-    getTaskConfig(taskType) {
-        // Get task-specific config or empty object
-        const taskConfig = this.config.taskSpecificSettings?.[taskType] || {};
-        // If mode is not specified, use default mode
-        if (!taskConfig.mode) {
-            taskConfig.mode = this.config.defaultMode;
-        }
-        return taskConfig;
-    }
-    /**
-     * Get the maximum tokens allowed for context
-     */
-    getMaxTokens() {
-        return this.config.maxTokens || 190000;
-    }
-    /**
-     * Update the configuration
-     * @param config The new configuration
-     */
-    async updateConfig(config) {
-        // Merge with existing config
-        this.config = this.mergeConfigs(this.config, config);
-        // Invalidate cache
-        this.configCache = null;
-        try {
-            if (!this.projectDir) {
-                return;
-            }
-            // Read the existing npmextra.json file
-            const npmextraJsonPath = plugins.path.join(this.projectDir, 'npmextra.json');
-            let npmextraContent = {};
-            if (await plugins.fsInstance.file(npmextraJsonPath).exists()) {
-                const npmextraJsonFile = await plugins.smartfileFactory.fromFilePath(npmextraJsonPath);
-                npmextraContent = JSON.parse(npmextraJsonFile.contents.toString()) || {};
-            }
-            // Update the tsdoc context configuration
-            const typedContent = npmextraContent;
-            if (!typedContent.tsdoc)
-                typedContent.tsdoc = {};
-            typedContent.tsdoc.context = this.config;
-            // Write back to npmextra.json
-            const updatedContent = JSON.stringify(npmextraContent, null, 2);
-            await plugins.fsInstance.file(npmextraJsonPath).encoding('utf8').write(updatedContent);
-        }
-        catch (error) {
-            console.error('Error updating context configuration:', error);
-        }
-    }
-    /**
-     * Get cache configuration
-     */
-    getCacheConfig() {
-        return this.config.cache || { enabled: true, ttl: 3600, maxSize: 100 };
-    }
-    /**
-     * Get analyzer configuration
-     */
-    getAnalyzerConfig() {
-        return this.config.analyzer || { useAIRefinement: false, aiModel: 'haiku' };
-    }
-    /**
-     * Get prioritization weights
-     */
-    getPrioritizationWeights() {
-        return this.config.prioritization || {
-            dependencyWeight: 0.3,
-            relevanceWeight: 0.4,
-            efficiencyWeight: 0.2,
-            recencyWeight: 0.1
-        };
-    }
-    /**
-     * Get tier configuration
-     */
-    getTierConfig() {
-        return this.config.tiers || {
-            essential: { minScore: 0.8, trimLevel: 'none' },
-            important: { minScore: 0.5, trimLevel: 'light' },
-            optional: { minScore: 0.2, trimLevel: 'aggressive' }
-        };
-    }
-    /**
-     * Get iterative configuration
-     */
-    getIterativeConfig() {
-        return this.config.iterative || {
-            maxIterations: 5,
-            firstPassFileLimit: 10,
-            subsequentPassFileLimit: 5,
-            temperature: 0.3,
-            model: 'gpt-4-turbo-preview'
-        };
-    }
-    /**
-     * Clear the config cache (force reload on next access)
-     */
-    clearCache() {
-        this.configCache = null;
-    }
-}
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"config-manager.js","sourceRoot":"","sources":["../../ts/context/config-manager.ts"],"names":[],"mappings":"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"}