Merge pull request #54 from LAA-Software-Engineering/issue/20-http-tool

leo-aa88 · web-flow · commit ea4fb6fb7118 · 2026-04-11T19:06:51.000-03:00
feat(tools): HTTP tool runtime (MVP, closes #20)
diff --git a/internal/tools/doc.go b/internal/tools/doc.go
@@ -1,5 +1,5 @@
 // Package tools defines tool registries and integrations (MCP, HTTP, native).
 //
-// [Registry] resolves tool.<name>.<operation> uses strings and dispatches MVP native, mock, and MCP stdio tools.
+// [Registry] resolves tool.<name>.<operation> uses strings and dispatches MVP native, mock, MCP stdio, and HTTP tools.
 // Responses use [ToolCallResponse] with output + meta per §13.2.
 package tools
diff --git a/internal/tools/http/client.go b/internal/tools/http/client.go
@@ -0,0 +1,256 @@
+package httptool
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"strings"
+	"time"
+
+	"github.com/LAA-Software-Engineering/agentic-control-plane/internal/models"
+	"github.com/LAA-Software-Engineering/agentic-control-plane/internal/spec"
+)
+
+// ExecMeta is timing/cost metadata for an HTTP tool call (§13.2 placeholders).
+type ExecMeta struct {
+	DurationMs int64
+	CostUSD    float64
+}
+
+// clientError is a 4xx response (not retried).
+type clientError struct {
+	code int
+	msg  string
+}
+
+func (e *clientError) Error() string {
+	return fmt.Sprintf("httptool: HTTP %d %s", e.code, e.msg)
+}
+
+// serverHTTPError is a 5xx response (retried when policy allows).
+type serverHTTPError struct {
+	code int
+	body string
+}
+
+func (e *serverHTTPError) Error() string {
+	return fmt.Sprintf("httptool: HTTP %d", e.code)
+}
+
+// Execute performs one logical HTTP tool call, including optional retries on transport/5xx errors.
+// client may be nil to use http.DefaultClient (tests should pass srv.Client()).
+func Execute(ctx context.Context, cfg *spec.ToolHTTP, retry *spec.ToolRetry, operation string, with map[string]any, client *http.Client) (map[string]any, ExecMeta, error) {
+	if cfg == nil {
+		return nil, ExecMeta{}, errors.New("httptool: nil http config")
+	}
+	base := strings.TrimSpace(cfg.BaseURL)
+	if base == "" {
+		return nil, ExecMeta{}, errors.New("httptool: empty baseUrl")
+	}
+	method, path, err := parseOperation(operation)
+	if err != nil {
+		return nil, ExecMeta{}, err
+	}
+	urlStr := joinURL(base, path)
+
+	attempts := 1
+	if retry != nil && retry.MaxAttempts > 0 {
+		attempts = retry.MaxAttempts
+	}
+	backoff := ""
+	if retry != nil {
+		backoff = retry.Backoff
+	}
+	if client == nil {
+		client = http.DefaultClient
+	}
+
+	start := time.Now()
+	var lastErr error
+	for attempt := 0; attempt < attempts; attempt++ {
+		if attempt > 0 {
+			sleepBackoff(ctx, attempt, backoff)
+		}
+		out, err := doRequest(ctx, client, method, urlStr, cfg.Headers, with)
+		if err == nil {
+			return out, ExecMeta{DurationMs: time.Since(start).Milliseconds(), CostUSD: 0}, nil
+		}
+		lastErr = err
+		if !retryableHTTP(err) {
+			break
+		}
+	}
+	return nil, ExecMeta{DurationMs: time.Since(start).Milliseconds(), CostUSD: 0}, lastErr
+}
+
+func parseOperation(operation string) (method, path string, err error) {
+	operation = strings.TrimSpace(operation)
+	if operation == "" {
+		return "", "", fmt.Errorf("httptool: empty operation")
+	}
+	parts := strings.Split(operation, ".")
+	verbs := map[string]string{
+		"get": "GET", "post": "POST", "put": "PUT", "delete": "DELETE", "patch": "PATCH",
+	}
+	if m, ok := verbs[strings.ToLower(parts[0])]; ok {
+		if len(parts) == 1 {
+			return m, "/", nil
+		}
+		return m, "/" + strings.Join(parts[1:], "/"), nil
+	}
+	return "GET", "/" + strings.Join(parts, "/"), nil
+}
+
+func joinURL(base, path string) string {
+	base = strings.TrimRight(strings.TrimSpace(base), "/")
+	if path == "" {
+		return base + "/"
+	}
+	if !strings.HasPrefix(path, "/") {
+		path = "/" + path
+	}
+	return base + path
+}
+
+func resolveHeaders(h map[string]string) (http.Header, error) {
+	hdr := make(http.Header)
+	if h == nil {
+		return hdr, nil
+	}
+	for k, v := range h {
+		resolved, err := resolveHeaderValue(v)
+		if err != nil {
+			return nil, fmt.Errorf("httptool: header %q: %w", k, err)
+		}
+		hdr.Set(k, resolved)
+	}
+	return hdr, nil
+}
+
+func resolveHeaderValue(v string) (string, error) {
+	v = strings.TrimSpace(v)
+	if strings.HasPrefix(v, "env:") {
+		return models.ResolveAPIKeyFrom(v)
+	}
+	return v, nil
+}
+
+func doRequest(ctx context.Context, cli *http.Client, method, urlStr string, headers map[string]string, with map[string]any) (map[string]any, error) {
+	hdr, err := resolveHeaders(headers)
+	if err != nil {
+		return nil, err
+	}
+
+	var body io.Reader
+	switch method {
+	case "POST", "PUT", "PATCH":
+		if with == nil {
+			with = map[string]any{}
+		}
+		b, err := json.Marshal(with)
+		if err != nil {
+			return nil, err
+		}
+		body = bytes.NewReader(b)
+		if hdr.Get("Content-Type") == "" {
+			hdr.Set("Content-Type", "application/json")
+		}
+	}
+
+	req, err := http.NewRequestWithContext(ctx, method, urlStr, body)
+	if err != nil {
+		return nil, err
+	}
+	req.Header = hdr
+
+	resp, err := cli.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+
+	b, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, err
+	}
+
+	if resp.StatusCode >= 500 {
+		return nil, &serverHTTPError{code: resp.StatusCode, body: string(b)}
+	}
+	if resp.StatusCode >= 400 {
+		return nil, &clientError{code: resp.StatusCode, msg: truncateBody(b, 512)}
+	}
+
+	return decodeResponseBody(b, resp.Header.Get("Content-Type"))
+}
+
+func decodeResponseBody(b []byte, contentType string) (map[string]any, error) {
+	ct := strings.ToLower(contentType)
+	if len(b) == 0 {
+		return map[string]any{}, nil
+	}
+	if strings.Contains(ct, "application/json") || b[0] == '{' || b[0] == '[' {
+		var obj map[string]any
+		if json.Unmarshal(b, &obj) == nil {
+			return obj, nil
+		}
+		var arr []any
+		if json.Unmarshal(b, &arr) == nil {
+			return map[string]any{"items": arr}, nil
+		}
+	}
+	return map[string]any{"body": string(b)}, nil
+}
+
+func truncateBody(b []byte, n int) string {
+	s := string(b)
+	if len(s) <= n {
+		return s
+	}
+	return s[:n] + "..."
+}
+
+func retryableHTTP(err error) bool {
+	if err == nil {
+		return false
+	}
+	if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
+		return false
+	}
+	var ce *clientError
+	if errors.As(err, &ce) {
+		return false
+	}
+	var se *serverHTTPError
+	if errors.As(err, &se) {
+		return true
+	}
+	return true
+}
+
+func sleepBackoff(ctx context.Context, attempt int, kind string) {
+	if attempt <= 0 {
+		return
+	}
+	var d time.Duration
+	switch strings.ToLower(strings.TrimSpace(kind)) {
+	case "exponential":
+		shift := attempt
+		if shift > 8 {
+			shift = 8
+		}
+		d = time.Millisecond * time.Duration(50*(1<<shift))
+	case "fixed":
+		d = 100 * time.Millisecond
+	default:
+		d = 50 * time.Millisecond
+	}
+	select {
+	case <-ctx.Done():
+	case <-time.After(d):
+	}
+}
diff --git a/internal/tools/http/client_test.go b/internal/tools/http/client_test.go
@@ -0,0 +1,117 @@
+package httptool
+
+import (
+	"context"
+	"net/http"
+	"net/http/httptest"
+	"sync/atomic"
+	"testing"
+
+	"github.com/LAA-Software-Engineering/agentic-control-plane/internal/spec"
+)
+
+func TestExecute_httptest_GET_success(t *testing.T) {
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != "GET" || r.URL.Path != "/ping" {
+			t.Errorf("got %s %s", r.Method, r.URL.Path)
+			http.NotFound(w, r)
+			return
+		}
+		w.Header().Set("Content-Type", "application/json")
+		_, _ = w.Write([]byte(`{"ok":true,"n":1}`))
+	}))
+	defer srv.Close()
+
+	out, meta, err := Execute(context.Background(), &spec.ToolHTTP{BaseURL: srv.URL}, nil, "get.ping", nil, srv.Client())
+	if err != nil {
+		t.Fatal(err)
+	}
+	if meta.DurationMs < 0 {
+		t.Fatalf("meta %+v", meta)
+	}
+	if out["ok"] != true || out["n"] != float64(1) {
+		t.Fatalf("output %+v", out)
+	}
+}
+
+func TestExecute_header_envResolution(t *testing.T) {
+	t.Setenv("HTTPTOOL_TEST_SECRET", "s3cr3t")
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.Header.Get("X-Auth") != "s3cr3t" {
+			http.Error(w, "auth", http.StatusUnauthorized)
+			return
+		}
+		w.Header().Set("Content-Type", "application/json")
+		_, _ = w.Write([]byte(`{"auth":"ok"}`))
+	}))
+	defer srv.Close()
+
+	out, _, err := Execute(context.Background(), &spec.ToolHTTP{
+		BaseURL: srv.URL,
+		Headers: map[string]string{"X-Auth": "env:HTTPTOOL_TEST_SECRET"},
+	}, nil, "get.data", nil, srv.Client())
+	if err != nil {
+		t.Fatal(err)
+	}
+	if out["auth"] != "ok" {
+		t.Fatalf("%+v", out)
+	}
+}
+
+func TestExecute_4xx_notRetried(t *testing.T) {
+	var calls atomic.Int32
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		calls.Add(1)
+		http.Error(w, "missing", http.StatusNotFound)
+	}))
+	defer srv.Close()
+
+	_, _, err := Execute(context.Background(), &spec.ToolHTTP{BaseURL: srv.URL}, &spec.ToolRetry{
+		MaxAttempts: 3,
+		Backoff:     "fixed",
+	}, "get.missing", nil, srv.Client())
+	if err == nil {
+		t.Fatal("expected error")
+	}
+	if calls.Load() != 1 {
+		t.Fatalf("want 1 HTTP request on 404, got %d", calls.Load())
+	}
+}
+
+func TestExecute_5xx_retried(t *testing.T) {
+	var calls atomic.Int32
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		n := calls.Add(1)
+		if n == 1 {
+			w.WriteHeader(http.StatusServiceUnavailable)
+			return
+		}
+		w.Header().Set("Content-Type", "application/json")
+		_, _ = w.Write([]byte(`{"recovered":true}`))
+	}))
+	defer srv.Close()
+
+	out, _, err := Execute(context.Background(), &spec.ToolHTTP{BaseURL: srv.URL}, &spec.ToolRetry{
+		MaxAttempts: 2,
+		Backoff:     "fixed",
+	}, "get.stable", nil, srv.Client())
+	if err != nil {
+		t.Fatal(err)
+	}
+	if calls.Load() != 2 {
+		t.Fatalf("want 2 attempts, got %d", calls.Load())
+	}
+	if out["recovered"] != true {
+		t.Fatalf("%+v", out)
+	}
+}
+
+func TestParseOperation_postPath(t *testing.T) {
+	m, p, err := parseOperation("post.api.v1.items")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if m != "POST" || p != "/api/v1/items" {
+		t.Fatalf("%s %s", m, p)
+	}
+}
diff --git a/internal/tools/http/doc.go b/internal/tools/http/doc.go
@@ -0,0 +1,16 @@
+// Package httptool runs Tool specs with type http (design doc §7.3, issue #20).
+package httptool
+
+//
+// # Operation → HTTP mapping (MVP)
+//
+// The workflow "operation" string (after tool.<name>.) is split on ".":
+//
+//   - If the first segment is get, post, put, delete, or patch (case-insensitive),
+//     that becomes the HTTP method and the remaining segments form the path joined with "/"
+//     (with a leading slash). Example: post.api.v1.items → POST /api/v1/items
+//
+//   - Otherwise the method is GET and all segments form the path.
+//     Example: health.live → GET /health/live
+//
+// baseUrl and path are concatenated (trailing slash on baseUrl is stripped).
diff --git a/internal/tools/registry.go b/internal/tools/registry.go
diff --git a/internal/tools/tools_test.go b/internal/tools/tools_test.go
