Merge remote-tracking branch 'origin/master' into feat/import-native-inline

Author: LinuxSuRen

cmd/extension.go

@@ -79,7 +79,7 @@ func (o *extensionOption) runE(cmd *cobra.Command, args []string) (err error) {
 			err = fmt.Errorf("cannot find %s", arg)
 			return
 		}
-		extFile := o.ociDownloader.GetTargetFile()
+		extFile := o.ociDownloader.GetTargetFile(arg)
 		cmd.Println("found target file", extFile)
 
 		targetFile := filepath.Base(extFile)

cmd/run.go

@@ -402,7 +402,8 @@ func (o *runOption) runSuite(loader testing.Loader, dataContext map[string]inter
 		default:
 			o.limiter.Accept()
 
-			ctxWithTimeout, _ := context.WithTimeout(ctx, o.requestTimeout)
+			ctxWithTimeout, cancel := context.WithTimeout(ctx, o.requestTimeout)
+			defer cancel() // Ensure context is always cancelled when leaving this scope
 			ctxWithTimeout = context.WithValue(ctxWithTimeout, runner.ContextKey("").ParentDir(), loader.GetContext())
 
 			output, err = suiteRunner.RunTestCase(&testCase, dataContext, ctxWithTimeout)

cmd/testdata/stores.yaml

@@ -6,7 +6,30 @@ stores:
       url: xxx
       readonly: false
       disabled: false
+    - name: ai
+      kind:
+        name: atest-ext-ai
+        enabled: true
+      url: ""
+      readonly: false
+      disabled: false
+      properties:
+        - key: "provider"
+          description: "AI provider (local, openai, claude)"
+          defaultValue: "local"
+        - key: "model"
+          description: "AI model name"
+          defaultValue: "codellama"
+        - key: "endpoint"
+          description: "AI service endpoint"
+          defaultValue: "http://localhost:11434"
 plugins:
     - name: atest-store-git
       url: unix:///tmp/atest-store-git.sock
       enabled: true
+    - name: atest-ext-ai
+      url: unix:///tmp/atest-ext-ai.sock
+      enabled: true
+      description: "AI Extension Plugin for intelligent SQL generation and execution"
+      version: "latest"
+      registry: "ghcr.io/linuxsuren/atest-ext-ai"

console/atest-desktop/forge.config.js

@@ -51,6 +51,33 @@ module.exports = {
         ui: {
           "enabled": true,
           "chooseDirectory": true
+        },
+        beforeCreate: (msiCreator) => {
+          // Add installation directory to system PATH
+          msiCreator.wixTemplate = msiCreator.wixTemplate.replace(
+            '</Product>',
+            `    <Property Id="ARPINSTALLLOCATION" Value="[INSTALLDIR]" />
+    <CustomAction Id="AddToPath" Property="PATH" Value="[INSTALLDIR]" Execute="immediate" />
+    <CustomAction Id="RemoveFromPath" Property="PATH" Value="[INSTALLDIR]" Execute="immediate" />
+
+    <InstallExecuteSequence>
+      <Custom Action="AddToPath" After="InstallFiles">NOT Installed</Custom>
+      <Custom Action="RemoveFromPath" Before="RemoveFiles">REMOVE="ALL"</Custom>
+    </InstallExecuteSequence>
+
+    <Component Id="PathComponent" Guid="*" Directory="INSTALLDIR">
+      <Environment Id="PATH" Name="PATH" Value="[INSTALLDIR]" Permanent="no" Part="last" Action="set" System="yes" />
+    </Component>
+
+    </Product>`
+          );
+
+          // Ensure INSTALLDIR is properly defined in the existing ProgramFilesFolder
+          msiCreator.wixTemplate = msiCreator.wixTemplate.replace(
+            '<Directory Id="ProgramFilesFolder">',
+            `<Directory Id="ProgramFilesFolder">
+        <Directory Id="INSTALLDIR" Name="API Testing" />`
+          );
         }
       }
     }