@git.zone/tsdoc 1.12.0 → 2.0.1

package/ts/classes.aidoc.ts

@@ -5,10 +5,10 @@ import * as aiDocsClasses from './aidocs_classes/index.js';
 export class AiDoc {
   private openaiToken: string;
 
-  public npmextraKV: plugins.npmextra.KeyValueStore;
+  public smartconfigKV: plugins.npmextra.KeyValueStore;
   public qenvInstance: plugins.qenv.Qenv;
   public aidocInteract: plugins.smartinteract.SmartInteract;
-  public smartAiInstance: plugins.smartai.SmartAi;
+  public model: plugins.smartai.LanguageModelV3;
 
   argvArg: any;
 
@@ -38,8 +38,8 @@ export class AiDoc {
     if (!(await this.qenvInstance.getEnvVarOnDemand('OPENAI_TOKEN'))) {
       // Migrate old KV store path to new path if needed
       const homeDir = plugins.smartpath.get.home();
-      const oldKvPath = plugins.path.join(homeDir, '.npmextra/kv/tsdoc.json');
-      const newKvDir = plugins.path.join(homeDir, '.npmextra/kv/@git.zone');
+      const oldKvPath = plugins.path.join(homeDir, '.smartconfig/kv/tsdoc.json');
+      const newKvDir = plugins.path.join(homeDir, '.smartconfig/kv/@git.zone');
       const newKvPath = plugins.path.join(newKvDir, 'tsdoc.json');
       if (
         await plugins.fsInstance.file(oldKvPath).exists() &&
@@ -52,13 +52,13 @@ export class AiDoc {
         console.log('Migration complete: tsdoc.json -> @git.zone/tsdoc.json');
       }
 
-      this.npmextraKV = new plugins.npmextra.KeyValueStore({
+      this.smartconfigKV = new plugins.npmextra.KeyValueStore({
         typeArg: 'userHomeDir',
         identityArg: '@git.zone/tsdoc',
         mandatoryKeys: ['OPENAI_TOKEN'],
       });
 
-      const missingKeys = await this.npmextraKV.getMissingMandatoryKeys();
+      const missingKeys = await this.smartconfigKV.getMissingMandatoryKeys();
       if (missingKeys.length > 0) {
         // lets try argv
         if (this.argvArg?.OPENAI_TOKEN) {
@@ -77,34 +77,23 @@ export class AiDoc {
         }
 
         this.printSanitizedToken();
-        await this.npmextraKV.writeKey('OPENAI_TOKEN', this.openaiToken);
+        await this.smartconfigKV.writeKey('OPENAI_TOKEN', this.openaiToken);
       }
     }
-    if (!this.openaiToken && this.npmextraKV) {
-      this.openaiToken = await this.npmextraKV.readKey('OPENAI_TOKEN');
+    if (!this.openaiToken && this.smartconfigKV) {
+      this.openaiToken = await this.smartconfigKV.readKey('OPENAI_TOKEN');
     }
 
-    // lets assume we have an OPENAI_Token now
-    this.smartAiInstance = new plugins.smartai.SmartAi({
-      openaiToken: this.openaiToken,
+    // Create model using getModel()
+    this.model = plugins.smartai.getModel({
+      provider: 'openai',
+      model: 'gpt-5.4',
+      apiKey: this.openaiToken,
     });
-    await this.smartAiInstance.start();
   }
 
   public async 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;
+    // No lifecycle management needed with getModel() API
   }
 
   public getOpenaiToken(): string {
@@ -130,7 +119,7 @@ export class AiDoc {
     const projectContextInstance = new aiDocsClasses.ProjectContext(projectDirArg);
     return await projectContextInstance.gatherFiles();
   }
-  
+
   /**
    * Get the context with token count information
    * @param projectDirArg The path to the project directory
@@ -141,7 +130,7 @@ export class AiDoc {
     await projectContextInstance.update();
     return projectContextInstance.getContextWithTokenCount();
   }
-  
+
   /**
    * Get just the token count for a project's context
    * @param projectDirArg The path to the project directory
@@ -152,7 +141,7 @@ export class AiDoc {
     await projectContextInstance.update();
     return projectContextInstance.getTokenCount();
   }
-  
+
   /**
    * Estimate token count in a text string
    * @param text The text to estimate tokens for

package/ts/plugins.ts

@@ -4,9 +4,10 @@ import * as path from 'path';
 export { path };
 
 // pushrocks scope
-import * as npmextra from '@push.rocks/npmextra';
+import * as npmextra from '@push.rocks/smartconfig';
 import * as qenv from '@push.rocks/qenv';
 import * as smartagent from '@push.rocks/smartagent';
+import * as smartagentTools from '@push.rocks/smartagent/tools';
 import * as smartai from '@push.rocks/smartai';
 import * as smartcli from '@push.rocks/smartcli';
 import * as smartdelay from '@push.rocks/smartdelay';
@@ -24,6 +25,7 @@ export {
   npmextra,
   qenv,
   smartagent,
+  smartagentTools,
   smartai,
   smartcli,
   smartdelay,