feat(jmanus): inhouse tool call v4

pom.xml

@@ -275,10 +275,8 @@
         <poi.version>5.4.0</poi.version>
 
         <mcp.version>0.10.0</mcp.version>
-
-        <a2a-sdk.version>0.2.5</a2a-sdk.version>
-
         <opentelemetry.version>1.38.0</opentelemetry.version>
+        <a2a-sdk.version>0.2.5.Beta2</a2a-sdk.version>
 
         <!-- CheckStyle Plugin -->
         <disable.checks>false</disable.checks>
@@ -355,6 +353,23 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+
+            <!-- A2A SDK Dependencies -->
+            <dependency>
+                <groupId>io.github.a2asdk</groupId>
+                <artifactId>a2a-java-reference-server</artifactId>
+                <version>${a2a-sdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.github.a2asdk</groupId>
+                <artifactId>a2a-java-sdk-server-common</artifactId>
+                <version>${a2a-sdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.github.a2asdk</groupId>
+                <artifactId>a2a-java-sdk-client</artifactId>
+                <version>${a2a-sdk.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

spring-ai-alibaba-jmanus/build-ui.sh

@@ -137,49 +137,22 @@ build_frontend() {
     log_success "Frontend project build completed"
 }
 
-# Clear static resources directory using git
+# Clear static resources directory
 clean_static_directory() {
-    log_info "Clearing static resources directory using git..."
+    log_info "Clearing static resources directory..."
 
     STATIC_DIR="$PROJECT_ROOT/src/main/resources/static"
 
     # Create directory (if it doesn't exist)
     mkdir -p "$STATIC_DIR"
 
-    # Check if we're in a git repository
-    if [ -d "$PROJECT_ROOT/.git" ]; then
-        log_info "Git repository detected, using git to manage static files..."
-
-        # Check if there are files in static directory
-        if [ "$(ls -A $STATIC_DIR)" ]; then
-            # Add all files to git staging area first
-            log_info "Adding existing static files to git staging area..."
-            cd "$PROJECT_ROOT"
-            git add "$STATIC_DIR"/* 2>/dev/null || true
-
-            # Remove all files from static directory
-            log_warning "Removing all files from $STATIC_DIR..."
-            rm -rf "$STATIC_DIR"/*
-
-            # Remove from git tracking (but keep local changes)
-            log_info "Removing static files from git tracking..."
-            git rm --cached "$STATIC_DIR"/* 2>/dev/null || true
-
-            log_success "Static resources directory cleared using git"
-        else
-            log_info "Static resources directory is already empty"
-        fi
+    # Simply remove all files from static directory
+    if [ "$(ls -A $STATIC_DIR)" ]; then
+        log_info "Removing existing files from $STATIC_DIR..."
+        rm -rf "$STATIC_DIR"/*
+        log_success "Static resources directory cleared"
     else
-        log_warning "Not in a git repository, using regular file removal..."
-
-        # Clear directory contents without git
-        if [ "$(ls -A $STATIC_DIR)" ]; then
-            log_warning "Deleting existing files in $STATIC_DIR..."
-            rm -rf "$STATIC_DIR"/*
-            log_success "Static resources directory cleared"
-        else
-            log_info "Static resources directory is already empty"
-        fi
+        log_info "Static resources directory is already empty"
     fi
 }
 
@@ -209,6 +182,90 @@ copy_build_files() {
     fi
 }
 
+# Auto-resolve git conflicts and stage changes
+auto_resolve_git_conflicts() {
+    log_info "Auto-resolving git conflicts and staging changes..."
+
+    cd "$PROJECT_ROOT"
+
+    # Check if we're in a git repository
+    if [ ! -d ".git" ]; then
+        log_info "Not in a git repository, skipping git operations"
+        return
+    fi
+
+    # Check for merge conflicts
+    local conflicted_files=$(git diff --name-only --diff-filter=U 2>/dev/null || true)
+    if [ -n "$conflicted_files" ]; then
+        log_warning "Found conflicted files, resolving automatically..."
+
+        # For UI files, we want to keep the new version (ours)
+        echo "$conflicted_files" | while read -r file; do
+            if [[ "$file" == src/main/resources/static/ui/* ]]; then
+                log_info "Resolving conflict for UI file: $file"
+                # Try to resolve by keeping our version
+                git checkout --ours "$file" 2>/dev/null || true
+                git add "$file" 2>/dev/null || true
+            fi
+        done
+
+        # Try to complete the merge if we're in merge state
+        if [ -f ".git/MERGE_HEAD" ]; then
+            if git commit --no-edit 2>/dev/null; then
+                log_success "Successfully resolved and committed merge conflicts"
+            else
+                log_warning "Could not auto-commit merge resolution"
+            fi
+        fi
+    fi
+
+    # Add all new UI files
+    log_info "Adding new UI files to git..."
+    git add "src/main/resources/static/ui/" 2>/dev/null || true
+
+    # Remove deleted UI files from git tracking
+    local deleted_files=$(git ls-files --deleted 2>/dev/null | grep "src/main/resources/static/ui/" || true)
+    if [ -n "$deleted_files" ]; then
+        log_info "Removing deleted UI files from git tracking..."
+        echo "$deleted_files" | while read -r file; do
+            git rm "$file" 2>/dev/null || true
+        done
+    fi
+
+    # Check if there are staged changes
+    if [ -n "$(git diff --cached --name-only 2>/dev/null || true)" ]; then
+        log_info "Changes staged successfully"
+    else
+        log_info "No changes to stage"
+    fi
+}
+
+# Commit UI changes to git
+commit_ui_changes() {
+    log_info "Committing UI changes to git..."
+
+    cd "$PROJECT_ROOT"
+
+    # Check if we're in a git repository
+    if [ ! -d ".git" ]; then
+        log_info "Not in a git repository, skipping git commit"
+        return
+    fi
+
+    # Check if there are staged changes
+    if [ -n "$(git diff --cached --name-only 2>/dev/null || true)" ]; then
+        # Commit with a descriptive message
+        local commit_message="Update UI build files - $(date '+%Y-%m-%d %H:%M:%S')"
+        if git commit -m "$commit_message" 2>/dev/null; then
+            log_success "Successfully committed UI changes: $commit_message"
+        else
+            log_warning "Could not commit UI changes"
+        fi
+    else
+        log_info "No staged changes to commit"
+    fi
+}
+
 # Show build summary
 show_summary() {
     log_success "=== Build Completed ==="
@@ -232,6 +289,8 @@ main() {
     build_frontend
     clean_static_directory
     copy_build_files
+    auto_resolve_git_conflicts
+    commit_ui_changes
     show_summary
 
     log_success "All steps completed!"