cloving 0.3.18 → 0.3.19

package/.aider.input.history

@@ -0,0 +1,15 @@
+
+# 2024-08-11 14:44:54.497516
++move the logic for `src/commands/generate/commit.ts` into a CommitManager.ts similar to how `src/managers/CodeManager.ts`
+
+# 2024-08-11 14:47:53.307920
++can you make CommitM
+
+# 2024-08-12 07:34:19.616951
++what is 1+1?
+
+# 2024-08-13 16:41:12.331108
++fix `src/managers/ReviewManager.ts` to use the private chatHistory: ChatMessage[] like `src/managers/CodeManager.ts`
+
+# 2024-08-13 16:43:18.098654
++how do I modify `src/utils/command_utils.ts` generateCodegenPrompt to make sure that the CURRENT in a *CURRENT/NEW* Block is as small as possible and does not try to include large chunks of unneeded code to replace

package/.cursorrules

@@ -0,0 +1,77 @@
+# TypeScript-specific coding standards
+typescript:
+  style:
+    quotes: 'single'              # Use single quotes for strings
+    semi: false                   # No semicolons at end of statements
+    trailingComma: 'all'         # Add trailing commas wherever possible
+    printWidth: 100              # Maximum line length before wrapping
+    tabWidth: 2                  # Number of spaces for each indentation level
+    bracketSpacing: true         # Spaces between brackets in object literals
+    arrowParens: 'avoid'         # Omit parentheses for single arrow function parameters
+
+  imports:
+    preferNamed: true            # Prefer named imports over default imports
+    grouping:                    # Order of import groups
+      - '^@/'                    # Internal modules first
+      - '^[./]'                 # Relative imports second
+    maxLineLength: 100          # Maximum length for import statements
+    sortImports: true          # Sort imports alphabetically within groups
+    newlineAfterImports: true  # Add newline after import section
+
+  naming:
+    classes: 'PascalCase'        # Example: UserService, ConfigManager
+    interfaces: 'PascalCase'     # Example: UserInterface, ConfigOptions
+    types: 'PascalCase'          # Example: UserType, ConfigType
+    enums: 'PascalCase'          # Example: UserRole, LogLevel
+    variables: 'camelCase'       # Example: userData, configSettings
+    functions: 'camelCase'       # Example: getData(), processConfig()
+    constants: 'UPPER_CASE'      # Example: API_KEY, MAX_RETRIES
+    privateMembers: 'camelCase'  # Example: private myPrivateVar
+    typeParameters: 'PascalCase' # Example: <T>, <TKey>
+
+  organization:
+    preferConst: true           # Use const by default, let only when necessary
+    maxParametersPerFunction: 4 # Limit function parameters for better readability
+    maxFunctionLength: 50       # Keep functions concise and focused
+    memberOrdering:            # Class member ordering
+      - 'public-static-field'
+      - 'private-static-field'
+      - 'public-instance-field'
+      - 'private-instance-field'
+      - 'constructor'
+      - 'public-instance-method'
+      - 'private-instance-method'
+
+  documentation:
+    jsdocStyle: true           # Use JSDoc style comments for documentation
+    requireParamTypes: true    # Require type annotations in @param tags
+    requireReturnType: true    # Require return type annotations
+    requireExampleComments: true # Include examples in complex function docs
+    multilineCommentStyle:     # Style for multiline comments
+      startsWith: '/**'        # Start with /** for JSDoc comments
+      linePrefix: ' * '        # Each line starts with ' * '
+      endsWith: ' */'         # End with */
+
+# General project-wide settings
+general:
+  fileNaming: 'kebab-case'      # Example: user-service.ts, config-manager.ts
+  directoryNaming: 'kebab-case' # Example: user-services/, config-utils/
+  maxLineLength: 100           # Maximum characters per line
+  indentation: 'spaces'        # Use spaces instead of tabs
+  indentSize: 2               # Number of spaces per indentation level
+  newlineAtEndOfFile: true    # Ensure files end with a newline
+  
+  patterns:
+    utils:
+      location: 'src/utils'    # Utility functions go in src/utils
+      naming: '${name}_utils'  # Example: string_utils.ts, file_utils.ts
+    managers:
+      location: 'src/managers' # Manager classes go in src/managers
+      naming: '${Name}Manager' # Example: ChatManager.ts, StreamManager.ts
+    types:
+      location: 'src/utils/types.ts' # Central types file
+    constants:
+      location: 'src/utils/constants.ts' # Central constants file
+    tests:
+      location: 'tests'       # Test files in tests directory
+      naming: '${name}.test.ts' # Example: string_utils.test.ts

package/.github/workflows/auto-release.yml

@@ -0,0 +1,83 @@
+name: Auto Release
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: ['20.x', '22.x']
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Install dependencies
+        run: yarn install
+
+      - name: Run TypeScript checks
+        run: yarn run check
+
+      - name: Run tests
+        run: yarn run test
+
+  check-version-and-release:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Get current version
+        id: package-version
+        run: echo "::set-output name=version::$(node -p "require('./package.json').version")"
+
+      - name: Get latest release version
+        id: latest-release
+        run: |
+          latest_tag=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0")
+          echo "::set-output name=version::${latest_tag#v}"
+
+      - name: Compare versions
+        id: compare-versions
+        run: |
+          if [ "${{ steps.package-version.outputs.version }}" != "${{ steps.latest-release.outputs.version }}" ]; then
+            echo "::set-output name=changed::true"
+          else
+            echo "::set-output name=changed::false"
+          fi
+
+      - name: Generate changelog
+        if: steps.compare-versions.outputs.changed == 'true'
+        id: changelog
+        uses: metcalfc/changelog-generator@v4.3.1
+        with:
+          myToken: ${{ secrets.GITHUB_TOKEN }}
+          head-ref: v${{ steps.package-version.outputs.version }}
+          base-ref: v${{ steps.latest-release.outputs.version }}
+
+      - name: Create Release
+        if: steps.compare-versions.outputs.changed == 'true'
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: v${{ steps.package-version.outputs.version }}
+          release_name: Release v${{ steps.package-version.outputs.version }}
+          body: |
+            Changes in this Release:
+            ${{ steps.changelog.outputs.changelog }}
+          draft: false
+          prerelease: false

package/.github/workflows/ci.yml

@@ -0,0 +1,32 @@
+name: CI
+
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: ['20.x', '22.x']
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Install dependencies
+        run: yarn install
+
+      - name: Run TypeScript checks
+        run: yarn run check
+
+      - name: Run tests
+        run: yarn run test

package/.github/workflows/npm-publish.yml

@@ -0,0 +1,34 @@
+# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
+# For more information see: https://docs.github.com/en/actions/publishing-packages/publishing-nodejs-packages
+
+name: Node.js Package
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - run: yarn install
+      - run: yarn test
+
+  publish-npm:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          registry-url: https://registry.npmjs.org/
+      - run: yarn install
+      - run: yarn build
+      - run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

package/.gitignore

@@ -0,0 +1,67 @@
+# Dependencies
+node_modules/
+npm-debug.log
+yarn-error.log
+yarn-debug.log
+.pnp/
+.pnp.js
+
+# TypeScript
+*.tsbuildinfo
+
+# Compiled output
+dist/
+build/
+out/
+
+# IDEs and editors
+.vscode/
+.idea/
+*.swp
+*.swo
+*.sublime-workspace
+
+# Operating System Files
+.DS_Store
+Thumbs.db
+
+# Environment variables
+.env
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+# Debug logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Coverage directory used by tools like istanbul
+coverage/
+
+# Temporary folders
+tmp/
+temp/
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+.clovingprojects
+.yarn

package/.husky/_/.gitignore

@@ -0,0 +1 @@
+*

package/.husky/_/applypatch-msg

@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+. "$(dirname "$0")/h"

package/.husky/_/commit-msg

@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+. "$(dirname "$0")/h"

package/.husky/_/h

@@ -0,0 +1,22 @@
+#!/usr/bin/env sh
+[ "$HUSKY" = "2" ] && set -x
+n=$(basename "$0")
+s=$(dirname "$(dirname "$0")")/$n
+
+[ ! -f "$s" ] && exit 0
+
+if [ -f "$HOME/.huskyrc" ]; then
+	echo "husky - '~/.huskyrc' is DEPRECATED, please move your code to ~/.config/husky/init.sh"
+fi
+i="${XDG_CONFIG_HOME:-$HOME/.config}/husky/init.sh"
+[ -f "$i" ] && . "$i"
+
+[ "${HUSKY-}" = "0" ] && exit 0
+
+export PATH="node_modules/.bin:$PATH"
+sh -e "$s" "$@"
+c=$?
+
+[ $c != 0 ] && echo "husky - $n script failed (code $c)"
+[ $c = 127 ] && echo "husky - command not found in PATH=$PATH"
+exit $c

package/.husky/_/husky.sh

@@ -0,0 +1,9 @@
+echo "husky - DEPRECATED
+
+Please remove the following two lines from $0:
+
+#!/usr/bin/env sh
+. \"\$(dirname -- \"\$0\")/_/husky.sh\"
+
+They WILL FAIL in v10.0.0
+"

package/.husky/_/post-applypatch

@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+. "$(dirname "$0")/h"

package/.husky/_/post-checkout

@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+. "$(dirname "$0")/h"

package/.husky/_/post-commit

@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+. "$(dirname "$0")/h"

package/.husky/_/post-merge

@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+. "$(dirname "$0")/h"

package/.husky/_/post-rewrite

@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+. "$(dirname "$0")/h"

package/.husky/_/pre-applypatch

@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+. "$(dirname "$0")/h"

package/.husky/_/pre-auto-gc

@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+. "$(dirname "$0")/h"

package/.husky/_/pre-commit

@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+. "$(dirname "$0")/h"

package/.husky/_/pre-merge-commit

@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+. "$(dirname "$0")/h"

package/.husky/_/pre-push

@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+. "$(dirname "$0")/h"

package/.husky/_/pre-rebase

@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+. "$(dirname "$0")/h"

package/.husky/_/prepare-commit-msg

@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+. "$(dirname "$0")/h"

package/.husky/pre-commit

@@ -0,0 +1 @@
+npx lint-staged

package/.husky/pre-push

@@ -0,0 +1 @@
+npx lint-prepush

package/.prettierrc.json

@@ -0,0 +1,7 @@
+{
+  "semi": false,
+  "trailingComma": "all",
+  "singleQuote": true,
+  "printWidth": 100,
+  "tabWidth": 2
+}

package/.tool-versions

@@ -0,0 +1,2 @@
+yarn 1.22.22
+nodejs 20.16.0

package/SECURITY.md

@@ -0,0 +1,15 @@
+# Security Policy
+
+## Data sensitivity
+
+The sensitive data that is currently handled by the Cloving CLI is:
+
+- Various AI API keys, which are stored in the cloving configuration within the **user home directory** (`~/.clovingconfig`).
+
+## Reporting a Vulnerability
+
+Report vulnerabilities to security [at] cloving.ai
+
+They will be handled ASAP.
+If the vulnerability is accepted, a mitigation will be implemented and a proper disclosure will be released.
+The triage and mitigation process will depend on the potential severity and impact of the vulnerability.

package/cloving.json

@@ -0,0 +1,67 @@
+{
+  "languages": [
+    {
+      "name": "TypeScript",
+      "version": "^5.5.4",
+      "primary": true,
+      "directory": "src",
+      "extension": ".ts"
+    },
+    {
+      "name": "JavaScript",
+      "version": "ES2020",
+      "directory": "src",
+      "extension": ".js"
+    }
+  ],
+  "frameworks": [
+    {
+      "name": "Node.js",
+      "type": "Runtime environment",
+      "primary": true,
+      "directory": "src",
+      "extension": ".ts"
+    },
+    {
+      "name": "Express",
+      "type": "Web framework",
+      "version": "^4.19.2",
+      "directory": "src",
+      "extension": ".ts"
+    }
+  ],
+  "testingFrameworks": [
+    {
+      "name": "Jest",
+      "type": "Testing framework",
+      "version": "^29.7.0",
+      "directory": "tests"
+    }
+  ],
+  "buildTools": [
+    {
+      "name": "TypeScript Compiler (tsc)",
+      "type": "Transpiler",
+      "version": "^5.5.4"
+    },
+    {
+      "name": "Vite",
+      "type": "Build tool",
+      "version": "^5.4.0"
+    }
+  ],
+  "packageManager": "Yarn",
+  "linters": [
+    {
+      "name": "ESLint",
+      "version": "^8.57.0",
+      "type": "Linter"
+    },
+    {
+      "name": "Prettier",
+      "version": "^3.2.5",
+      "type": "Code formatter"
+    }
+  ],
+  "projectType": "Command-line tool"
+}

package/dist/managers/CommitManager.js

@@ -15,6 +15,12 @@ class CommitManager {
         options.silent = (0, config_utils_1.getConfig)(options).globalSilent || false;
         this.gpt = new cloving_gpt_1.default(options);
     }
+    cleanCommitMessage(message) {
+        // Remove markdown code block formatting if present, including any text before and after
+        const codeBlockRegex = /.*?```.*\n(.*?)\n```.*/m;
+        const match = message.match(codeBlockRegex);
+        return match ? match[1].trim() : message.trim();
+    }
     async generateCommit() {
         try {
             // Get the git diff
@@ -28,8 +34,8 @@ class CommitManager {
             const prompt = (0, git_utils_1.generateCommitMessagePrompt)(diff);
             // Instantiate ClovingGPT and get the commit message
             const rawCommitMessage = await this.gpt.generateText({ prompt });
-            // Clean the commit message using extractMarkdown
-            const commitMessage = (0, string_utils_1.extractMarkdown)(rawCommitMessage);
+            // Clean the commit message using extractMarkdown and remove code blocks
+            const commitMessage = this.cleanCommitMessage((0, string_utils_1.extractMarkdown)(rawCommitMessage));
             // Write the commit message to a temporary file
             const tempCommitFilePath = path_1.default.join('.git', 'SUGGESTED_COMMIT_EDITMSG');
             fs_1.default.writeFileSync(tempCommitFilePath, commitMessage);

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloving",
-  "version": "0.3.18",
+  "version": "0.3.19",
   "packageManager": "yarn@1.22.22",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/jest.config.js

@@ -0,0 +1,11 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  testMatch: ['**/tests/**/*.test.ts'],
+  moduleFileExtensions: ['ts', 'js'],
+  transform: {
+    '^.+\\.ts$': 'ts-jest',
+  },
+}
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloving",
-  "version": "0.3.18",
+  "version": "0.3.19",
   "packageManager": "yarn@1.22.22",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/cloving_gpt/adapters/azureopenai.ts

@@ -0,0 +1,83 @@
+import { Adapter } from '.'
+import type { GPTRequest, OpenAIStreamChunk } from '../../utils/types'
+
+export class AzureOpenAIAdapter implements Adapter {
+  private model: string
+  private endpoint: string
+
+  static supportedModels: string[] = [
+    'azureopenai:gpt:4o-2024-08-06',
+    'azureopenai:gpt:4o',
+    'azureopenai:gpt:4o-mini',
+    'azureopenai:gpt:4-turbo',
+    'azureopenai:gpt:3.5-turbo',
+    // Add more supported models as needed
+  ]
+
+  static listSupportedModels(): void {
+    AzureOpenAIAdapter.supportedModels.forEach((model) => {
+      console.log(model)
+    })
+  }
+
+  constructor(model: string, endpoint: string) {
+    this.model = model
+    this.endpoint = endpoint
+  }
+
+  getEndpoint(): string {
+    return this.endpoint
+  }
+
+  getHeaders(apiKey: string): Record<string, string> {
+    return {
+      Authorization: `Bearer ${apiKey}`,
+      'Content-Type': 'application/json',
+    }
+  }
+
+  getPayload(request: GPTRequest, stream: boolean = false): Record<string, any> {
+    return {
+      model: this.model.replace('azureopenai:', '').replace(':', '-'),
+      messages:
+        request.messages && request.messages.length > 0
+          ? request.messages
+          : [{ role: 'user', content: request.prompt }],
+      max_tokens: request.maxTokens,
+      temperature: request.temperature || 0.2,
+      stream,
+    }
+  }
+
+  extractResponse(data: any): string {
+    return data.choices[0].message.content
+  }
+
+  convertStream(data: string): OpenAIStreamChunk | null {
+    let beginningChar = 0
+    let lastChar = 0
+
+    while (lastChar < data.length) {
+      try {
+        let remainingString = data.slice(beginningChar, lastChar)
+
+        const firstBraceIndex = remainingString.indexOf('{')
+        if (firstBraceIndex > -1) {
+          remainingString = remainingString.slice(firstBraceIndex)
+        }
+
+        const parsedObject = JSON.parse(remainingString)
+        const output = parsedObject?.choices[0]?.delta?.content || ''
+
+        return {
+          output,
+          lastChar,
+        }
+      } catch (error) {
+        lastChar += 1
+      }
+    }
+
+    return null
+  }
+}