Merge pull request #50 from Approaching-AI/feat/external-service-import

Discover and import external inference services

Author: skyguan92

cmd/aima/main.go

@@ -17,6 +17,7 @@ import (
 	"github.com/jguan/aima/internal/agent"
 	"github.com/jguan/aima/internal/cli"
 	"github.com/jguan/aima/internal/engine"
+	extsvc "github.com/jguan/aima/internal/external"
 	"github.com/jguan/aima/internal/fleet"
 	"github.com/jguan/aima/internal/hal"
 	"github.com/jguan/aima/internal/knowledge"
@@ -1539,6 +1540,28 @@ func buildToolDeps(ac *appContext) *mcp.ToolDeps {
 	buildDeployDeps(ac, deps, pullModelCore, deployRunCore)
 	buildKnowledgeDeps(ac, deps)
 	buildBenchmarkDeps(ac, deps, resolveEndpoint)
+	externalReconciler := extsvc.NewReconciler(db, proxyServer)
+	deps.ScanExternalServices = func(ctx context.Context) (json.RawMessage, error) {
+		services, err := externalReconciler.Scan(ctx)
+		if err != nil {
+			return nil, err
+		}
+		return json.Marshal(services)
+	}
+	deps.ListExternalServices = func(ctx context.Context) (json.RawMessage, error) {
+		services, err := externalReconciler.List(ctx)
+		if err != nil {
+			return nil, err
+		}
+		return json.Marshal(services)
+	}
+	deps.ImportExternalService = func(ctx context.Context, idOrBaseURL string, models []string) (json.RawMessage, error) {
+		result, err := externalReconciler.Import(ctx, idOrBaseURL, models)
+		if err != nil {
+			return nil, err
+		}
+		return json.Marshal(result)
+	}
 
 	// Onboarding (multi-action MCP tool). The closures below wrap the
 	// internal/onboarding package entry points; scan/init/deploy collect

internal/cli/serve.go

@@ -102,17 +102,14 @@ func newServeCmd(app *App) *cobra.Command {
 				go openclaw.StartSyncLoop(ctx, app.OpenClaw, 10*time.Second)
 			}
 
-			// Auto-scan engines on startup so Explorer and other tools see
-			// locally available engines even before a manual engine.scan call.
-			if app.ToolDeps != nil && app.ToolDeps.ScanEngines != nil {
+			// Auto-reconcile local assets on startup so Explorer, onboarding, and
+			// UI views see locally available engines and models even after an
+			// upgrade that skips the first-run onboarding scan.
+			if app.ToolDeps != nil && (app.ToolDeps.ScanEngines != nil || app.ToolDeps.ScanModels != nil || app.ToolDeps.ScanExternalServices != nil) {
 				go func() {
 					scanCtx, scanCancel := context.WithTimeout(ctx, 30*time.Second)
 					defer scanCancel()
-					if _, err := app.ToolDeps.ScanEngines(scanCtx, "auto", false); err != nil {
-						slog.Warn("startup engine scan failed (non-fatal)", "error", err)
-					} else {
-						slog.Info("startup engine scan completed")
-					}
+					runStartupAssetReconcile(scanCtx, app.ToolDeps)
 				}()
 			}
 
@@ -228,6 +225,33 @@ func newServeCmd(app *App) *cobra.Command {
 	return cmd
 }
 
+func runStartupAssetReconcile(ctx context.Context, deps *mcp.ToolDeps) {
+	if deps == nil {
+		return
+	}
+	if deps.ScanEngines != nil {
+		if _, err := deps.ScanEngines(ctx, "auto", false); err != nil {
+			slog.Warn("startup engine scan failed (non-fatal)", "error", err)
+		} else {
+			slog.Info("startup engine scan completed")
+		}
+	}
+	if deps.ScanModels != nil {
+		if _, err := deps.ScanModels(ctx); err != nil {
+			slog.Warn("startup model scan failed (non-fatal)", "error", err)
+		} else {
+			slog.Info("startup model scan completed")
+		}
+	}
+	if deps.ScanExternalServices != nil {
+		if _, err := deps.ScanExternalServices(ctx); err != nil {
+			slog.Warn("startup external service scan failed (non-fatal)", "error", err)
+		} else {
+			slog.Info("startup external service scan completed")
+		}
+	}
+}
+
 func resolveMCPProfile(mcpEnabled bool, profile string) (mcp.Profile, error) {
 	if profile == "" {
 		return mcp.ProfileFull, nil

internal/cli/serve_test.go

@@ -1,6 +1,9 @@
 package cli
 
 import (
+	"context"
+	"encoding/json"
+	"errors"
 	"testing"
 
 	"github.com/jguan/aima/internal/mcp"
@@ -123,3 +126,74 @@ func TestResolveMCPProfile(t *testing.T) {
 		})
 	}
 }
+
+func TestRunStartupAssetReconcileScansEnginesAndModels(t *testing.T) {
+	t.Parallel()
+
+	var engineCalls int
+	var modelCalls int
+	var externalCalls int
+	var gotRuntime string
+	var gotAutoImport bool
+
+	deps := &mcp.ToolDeps{
+		ScanEngines: func(ctx context.Context, runtime string, autoImport bool) (json.RawMessage, error) {
+			engineCalls++
+			gotRuntime = runtime
+			gotAutoImport = autoImport
+			return json.RawMessage(`[]`), nil
+		},
+		ScanModels: func(ctx context.Context) (json.RawMessage, error) {
+			modelCalls++
+			return json.RawMessage(`[]`), nil
+		},
+		ScanExternalServices: func(ctx context.Context) (json.RawMessage, error) {
+			externalCalls++
+			return json.RawMessage(`[]`), nil
+		},
+	}
+
+	runStartupAssetReconcile(context.Background(), deps)
+
+	if engineCalls != 1 {
+		t.Fatalf("ScanEngines call count = %d, want 1", engineCalls)
+	}
+	if gotRuntime != "auto" || gotAutoImport {
+		t.Fatalf("ScanEngines(%q, %v), want (auto, false)", gotRuntime, gotAutoImport)
+	}
+	if modelCalls != 1 {
+		t.Fatalf("ScanModels call count = %d, want 1", modelCalls)
+	}
+	if externalCalls != 1 {
+		t.Fatalf("ScanExternalServices call count = %d, want 1", externalCalls)
+	}
+}
+
+func TestRunStartupAssetReconcileContinuesWhenEngineScanFails(t *testing.T) {
+	t.Parallel()
+
+	var modelCalls int
+	var externalCalls int
+	deps := &mcp.ToolDeps{
+		ScanEngines: func(ctx context.Context, runtime string, autoImport bool) (json.RawMessage, error) {
+			return nil, errors.New("engine scanner unavailable")
+		},
+		ScanModels: func(ctx context.Context) (json.RawMessage, error) {
+			modelCalls++
+			return json.RawMessage(`[]`), nil
+		},
+		ScanExternalServices: func(ctx context.Context) (json.RawMessage, error) {
+			externalCalls++
+			return json.RawMessage(`[]`), nil
+		},
+	}
+
+	runStartupAssetReconcile(context.Background(), deps)
+
+	if modelCalls != 1 {
+		t.Fatalf("ScanModels call count = %d, want 1", modelCalls)
+	}
+	if externalCalls != 1 {
+		t.Fatalf("ScanExternalServices call count = %d, want 1", externalCalls)
+	}
+}