Merge branch 'master' into feature/frontend-dashboard-fix

# Conflicts:
#	frontend/package-lock.json

Author: sirozha

.env.example

@@ -20,11 +20,33 @@ GEMINI_SERVER_URL=https://generativelanguage.googleapis.com
 
 ## AWS Bedrock LLM provider
 BEDROCK_REGION=us-east-1
+BEDROCK_DEFAULT_AUTH=
+BEDROCK_BEARER_TOKEN=
 BEDROCK_ACCESS_KEY_ID=
 BEDROCK_SECRET_ACCESS_KEY=
 BEDROCK_SESSION_TOKEN=
 BEDROCK_SERVER_URL=
 
+## DeepSeek LLM provider
+DEEPSEEK_API_KEY=
+DEEPSEEK_SERVER_URL=https://api.deepseek.com
+DEEPSEEK_PROVIDER=
+
+## GLM (Zhipu AI) LLM provider
+GLM_API_KEY=
+GLM_SERVER_URL=https://api.z.ai/api/paas/v4
+GLM_PROVIDER=
+
+## Kimi (Moonshot) LLM provider
+KIMI_API_KEY=
+KIMI_SERVER_URL=https://api.moonshot.ai/v1
+KIMI_PROVIDER=
+
+## Qwen (Alibaba Cloud DashScope) LLM provider
+QWEN_API_KEY=
+QWEN_SERVER_URL=https://dashscope-us.aliyuncs.com/compatible-mode/v1
+QWEN_PROVIDER=
+
 ## Custom LLM provider
 LLM_SERVER_URL=
 LLM_SERVER_KEY=
@@ -34,8 +56,11 @@ LLM_SERVER_CONFIG_PATH=
 LLM_SERVER_LEGACY_REASONING=
 LLM_SERVER_PRESERVE_REASONING=
 
-## Ollama LLM provider
+## Ollama LLM provider (Local Server or Cloud)
+# Local: http://ollama-server:11434, Cloud: https://ollama.com
 OLLAMA_SERVER_URL=
+# Required for Ollama Cloud (https://ollama.com/settings/keys), leave empty for local
+OLLAMA_SERVER_API_KEY=
 OLLAMA_SERVER_MODEL=
 OLLAMA_SERVER_CONFIG_PATH=
 OLLAMA_SERVER_PULL_MODELS_TIMEOUT=
@@ -69,6 +94,18 @@ ASSISTANT_SUMMARIZER_MAX_QA_SECTIONS=
 ASSISTANT_SUMMARIZER_MAX_QA_BYTES=
 ASSISTANT_SUMMARIZER_KEEP_QA_SECTIONS=
 
+## Execution Monitor Detector
+EXECUTION_MONITOR_ENABLED=
+EXECUTION_MONITOR_SAME_TOOL_LIMIT=
+EXECUTION_MONITOR_TOTAL_TOOL_LIMIT=
+
+## Agent execution tool calls limit
+MAX_GENERAL_AGENT_TOOL_CALLS=
+MAX_LIMITED_AGENT_TOOL_CALLS=
+
+## Agent planning step for pentester, coder, installer
+AGENT_PLANNING_STEP_ENABLED=
+
 ## HTTP proxy to use it in isolation environment
 PROXY_URL=
 
@@ -91,6 +128,7 @@ PENTAGI_LISTEN_IP=
 PENTAGI_LISTEN_PORT=
 PENTAGI_DATA_DIR=
 PENTAGI_SSL_DIR=
+PENTAGI_OLLAMA_DIR=
 PENTAGI_DOCKER_SOCKET=
 PENTAGI_DOCKER_CERT_PATH=
 PENTAGI_LLM_SERVER_CONFIG_PATH=
@@ -118,8 +156,11 @@ OAUTH_GOOGLE_CLIENT_SECRET=
 OAUTH_GITHUB_CLIENT_ID=
 OAUTH_GITHUB_CLIENT_SECRET=
 
-## DuckDuckGo search engine API
+## DuckDuckGo search engine
 DUCKDUCKGO_ENABLED=
+DUCKDUCKGO_REGION=
+DUCKDUCKGO_SAFESEARCH=
+DUCKDUCKGO_TIME_RANGE=
 
 ## Sploitus search engine API
 SPLOITUS_ENABLED=
@@ -146,6 +187,7 @@ SEARXNG_CATEGORIES=general
 SEARXNG_LANGUAGE=
 SEARXNG_SAFESEARCH=0
 SEARXNG_TIME_RANGE=
+SEARXNG_TIMEOUT=
 
 ## Langfuse observability settings
 LANGFUSE_BASE_URL=

.github/workflows/ci.yml

@@ -84,7 +84,6 @@ jobs:
 
       # Backend lint and test
       - name: Backend - Download dependencies
-        if: steps.go-cache.outputs.cache-hit != 'true'
         working-directory: backend
         run: go mod download
         continue-on-error: true
@@ -95,9 +94,6 @@ jobs:
           version: latest
           working-directory: backend
           args: --timeout=5m --issues-exit-code=0
-          skip-cache: false
-          skip-pkg-cache: false
-          skip-build-cache: false
         continue-on-error: true
 
       - name: Backend - Test
@@ -111,12 +107,28 @@ jobs:
           CGO_ENABLED: 0
           GO111MODULE: on
         run: |
+          # Get version information
+          LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0")
+          PACKAGE_VER=${LATEST_TAG#v}
+          CURRENT_COMMIT=$(git rev-parse HEAD)
+          TAG_COMMIT=$(git rev-list -n 1 "$LATEST_TAG" 2>/dev/null || echo "")
+          
+          if [ "$CURRENT_COMMIT" != "$TAG_COMMIT" ]; then
+            PACKAGE_REV=$(git rev-parse --short HEAD)
+          else
+            PACKAGE_REV=""
+          fi
+          
+          LDFLAGS="-X pentagi/pkg/version.PackageName=pentagi -X pentagi/pkg/version.PackageVer=${PACKAGE_VER} -X pentagi/pkg/version.PackageRev=${PACKAGE_REV}"
+          
+          echo "Building with version: ${PACKAGE_VER}${PACKAGE_REV:+-$PACKAGE_REV}"
+          
           # Build for AMD64
-          GOOS=linux GOARCH=amd64 go build -trimpath -o /tmp/pentagi-amd64 ./cmd/pentagi
+          GOOS=linux GOARCH=amd64 go build -trimpath -ldflags "$LDFLAGS" -o /tmp/pentagi-amd64 ./cmd/pentagi
           echo "✓ Successfully built for linux/amd64"
 
           # Build for ARM64
-          GOOS=linux GOARCH=arm64 go build -trimpath -o /tmp/pentagi-arm64 ./cmd/pentagi
+          GOOS=linux GOARCH=arm64 go build -trimpath -ldflags "$LDFLAGS" -o /tmp/pentagi-arm64 ./cmd/pentagi
           echo "✓ Successfully built for linux/arm64"
         continue-on-error: true
 
@@ -140,18 +152,40 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       # Extract version from tag (without 'v' prefix) and split into parts
-      - name: Extract version
+      - name: Extract version and revision
         id: version
         run: |
-          if [[ $GITHUB_REF == refs/tags/* ]]; then
-            VERSION=${GITHUB_REF#refs/tags/v}
-            echo "version=${VERSION}" >> $GITHUB_OUTPUT
-            # Split version into major.minor.patch
+          # Get latest tag version (without 'v' prefix)
+          LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0")
+          VERSION=${LATEST_TAG#v}
+          
+          # Get current commit hash
+          CURRENT_COMMIT=$(git rev-parse HEAD)
+          
+          # Get commit hash of the latest tag
+          TAG_COMMIT=$(git rev-list -n 1 "$LATEST_TAG" 2>/dev/null || echo "")
+          
+          # Set revision only if current commit differs from tag commit
+          if [ "$CURRENT_COMMIT" != "$TAG_COMMIT" ]; then
+            PACKAGE_REV=$(git rev-parse --short HEAD)
+            echo "revision=${PACKAGE_REV}" >> $GITHUB_OUTPUT
+            echo "is_release=false" >> $GITHUB_OUTPUT
+            echo "Building development version: ${VERSION}-${PACKAGE_REV}"
+            echo " Docker tags: latest only"
+          else
+            echo "revision=" >> $GITHUB_OUTPUT
+            echo "is_release=true" >> $GITHUB_OUTPUT
+            echo "Building release version: ${VERSION}"
+            
+            # Split version into major.minor.patch for Docker tags (only for releases)
             IFS='.' read -r major minor patch <<< "$VERSION"
             echo "major=${major}" >> $GITHUB_OUTPUT
             echo "minor=${major}.${minor}" >> $GITHUB_OUTPUT
-            echo "patch=${major}.${minor}.${patch}" >> $GITHUB_OUTPUT
+            echo "patch=${VERSION}" >> $GITHUB_OUTPUT
+            echo "  Docker tags: latest, ${major}, ${major}.${minor}, ${VERSION}"
           fi
+          
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
 
       - name: Generate Docker metadata
         id: meta
@@ -161,10 +195,10 @@ jobs:
           tags: |
             # For master branch - latest tag
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
-            # For version tags - major, minor and patch versions
-            type=raw,value=${{ steps.version.outputs.major }},enable=${{ startsWith(github.ref, 'refs/tags/v') }}
-            type=raw,value=${{ steps.version.outputs.minor }},enable=${{ startsWith(github.ref, 'refs/tags/v') }}
-            type=raw,value=${{ steps.version.outputs.patch }},enable=${{ startsWith(github.ref, 'refs/tags/v') }}
+            # For release builds only - tag with major, minor and patch versions
+            type=raw,value=${{ steps.version.outputs.major }},enable=${{ steps.version.outputs.is_release == 'true' }}
+            type=raw,value=${{ steps.version.outputs.minor }},enable=${{ steps.version.outputs.is_release == 'true' }}
+            type=raw,value=${{ steps.version.outputs.patch }},enable=${{ steps.version.outputs.is_release == 'true' }}
 
       - name: Build and push
         uses: docker/build-push-action@v6
@@ -178,3 +212,6 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
+          build-args: |
+            PACKAGE_VER=${{ steps.version.outputs.version }}
+            PACKAGE_REV=${{ steps.version.outputs.revision }}

.gitignore

@@ -24,3 +24,12 @@ data/*
 !.gitkeep
 .claude/
 
+# IDE
+.idea/
+*.swp
+*.swo
+*~
+
+# OS
+Thumbs.db
+

.vscode/launch.json

@@ -61,30 +61,42 @@
                 // "-type", "gemini",
                 // "-type", "bedrock",
                 // "-type", "ollama",
+                // "-type", "deepseek",
+                // "-type", "glm",
+                // "-type", "kimi",
+                // "-type", "qwen",
                 "-config", "${workspaceFolder}/examples/configs/moonshot.provider.yml",
                 // "-config", "${workspaceFolder}/examples/configs/deepseek.provider.yml",
                 // "-config", "${workspaceFolder}/examples/configs/ollama-llama318b.provider.yml",
                 // "-config", "${workspaceFolder}/examples/configs/ollama-llama318b-instruct.provider.yml",
                 // "-config", "${workspaceFolder}/examples/configs/ollama-qwq32b-fp16-tc.provider.yml",
                 // "-config", "${workspaceFolder}/examples/configs/ollama-qwen332b-fp16-tc.provider.yml",
+                // "-config", "${workspaceFolder}/examples/configs/vllm-qwen3.5-27b-fp8.provider.yml",
                 // "-config", "${workspaceFolder}/examples/configs/vllm-qwen332b-fp16.provider.yml",
                 // "-config", "${workspaceFolder}/examples/configs/custom-openai.provider.yml",
                 // "-config", "${workspaceFolder}/examples/configs/openrouter.provider.yml",
                 // "-config", "${workspaceFolder}/examples/configs/deepinfra.provider.yml",
+                // "-config", "${workspaceFolder}/examples/configs/novita.provider.yml",
                 // "-report", "${workspaceFolder}/examples/tests/openai-report.md",
                 // "-report", "${workspaceFolder}/examples/tests/anthropic-report.md",
                 // "-report", "${workspaceFolder}/examples/tests/gemini-report.md",
                 // "-report", "${workspaceFolder}/examples/tests/bedrock-report.md",
+                // "-report", "${workspaceFolder}/examples/tests/ollama-cloud-report.md",
                 // "-report", "${workspaceFolder}/examples/tests/ollama-llama318b-report.md",
                 // "-report", "${workspaceFolder}/examples/tests/ollama-llama318b-instruct-report.md",
                 // "-report", "${workspaceFolder}/examples/tests/ollama-qwq-32b-fp16-tc-report.md",
                 // "-report", "${workspaceFolder}/examples/tests/ollama-qwen332b-fp16-tc-report.md",
+                // "-report", "${workspaceFolder}/examples/tests/vllm-qwen3.5-27b-fp8.report.md",
                 // "-report", "${workspaceFolder}/examples/tests/vllm-qwen332b-fp16-report.md",
                 "-report", "${workspaceFolder}/examples/tests/moonshot-report.md",
                 // "-report", "${workspaceFolder}/examples/tests/deepseek-report.md",
+                // "-report", "${workspaceFolder}/examples/tests/glm-report.md",
+                // "-report", "${workspaceFolder}/examples/tests/kimi-report.md",
+                // "-report", "${workspaceFolder}/examples/tests/qwen-report.md",
                 // "-report", "${workspaceFolder}/examples/tests/custom-openai-report.md",
                 // "-report", "${workspaceFolder}/examples/tests/openrouter-report.md",
                 // "-report", "${workspaceFolder}/examples/tests/deepinfra-report.md",
+                // "-report", "${workspaceFolder}/examples/tests/novita-report.md",
                 "-agents", "all",
                 "-groups", "all",
                 "-workers", "8",

.vscode/settings.json

@@ -2,6 +2,7 @@
     "go.lintFlags": [
         "-checks=\"all,-ST1005\""
     ],
+    "go.testTimeout": "300s",
     "go.testEnvVars": {
       "INSTALLER_LOG_FILE": "${workspaceFolder}/build/log.json"
     },