use new cf worker endpoint

Author: sawka

.gitignore

@@ -16,6 +16,7 @@ out/
 make/
 artifacts/
 mikework/
+.env
 
 # Yarn Modern
 .pnp.*

Taskfile.yml

@@ -26,8 +26,9 @@ tasks:
             - docsite:build:embedded
             - build:backend
         env:
-            WCLOUD_ENDPOINT: "https://api-dev.waveterm.dev/central"
-            WCLOUD_WS_ENDPOINT: "wss://wsapi-dev.waveterm.dev/"
+            WAVETERM_ENVFILE: "{{.ROOT_DIR}}/.env"
+            WCLOUD_ENDPOINT: "https://api-dev.waveterm.dev"
+            WCLOUD_WS_ENDPOINT: "wss://wsapi-dev.waveterm.dev"
 
     electron:start:
         desc: Run the Electron application directly.
@@ -39,6 +40,7 @@ tasks:
             - docsite:build:embedded
             - build:backend
         env:
+            WAVETERM_ENVFILE: "{{.ROOT_DIR}}/.env"
             WCLOUD_ENDPOINT: "https://api-dev.waveterm.dev"
             WCLOUD_WS_ENDPOINT: "wss://wsapi-dev.waveterm.dev"
 
@@ -49,6 +51,7 @@ tasks:
             - npm:install
             - build:backend:quickdev
         env:
+            WAVETERM_ENVFILE: "{{.ROOT_DIR}}/.env"
             WCLOUD_ENDPOINT: "https://api-dev.waveterm.dev/central"
             WCLOUD_WS_ENDPOINT: "wss://wsapi-dev.waveterm.dev/"
 

cmd/server/main-server.go

@@ -13,6 +13,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/joho/godotenv"
 	"github.com/wavetermdev/waveterm/pkg/authkey"
 	"github.com/wavetermdev/waveterm/pkg/blockcontroller"
 	"github.com/wavetermdev/waveterm/pkg/blocklogger"
@@ -53,6 +54,14 @@ const TelemetryCountsInterval = 1 * time.Hour
 
 var shutdownOnce sync.Once
 
+func init() {
+	envFilePath := os.Getenv("WAVETERM_ENVFILE")
+	if envFilePath != "" {
+		log.Printf("applying env file: %s\n", envFilePath)
+		_ = godotenv.Load(envFilePath)
+	}
+}
+
 func doShutdown(reason string) {
 	shutdownOnce.Do(func() {
 		log.Printf("shutting down: %s\n", reason)

frontend/app/view/tsunami/tsunami.tsx

@@ -96,25 +96,23 @@ class TsunamiViewModel extends WebViewModel {
 
     setAppMeta(meta: TsunamiAppMeta) {
         console.log("tsunami app meta:", meta);
-        
+
         const rtInfo: ObjRTInfo = {};
         if (meta.title) {
             rtInfo["tsunami:title"] = meta.title;
         }
         if (meta.shortdesc) {
             rtInfo["tsunami:shortdesc"] = meta.shortdesc;
         }
-        
+
         if (Object.keys(rtInfo).length > 0) {
             const oref = WOS.makeORef("block", this.blockId);
             const data: CommandSetRTInfoData = {
                 oref: oref,
-                data: rtInfo
+                data: rtInfo,
             };
-            
-            RpcApi.SetRTInfoCommand(TabRpcClient, data).catch((e) =>
-                console.log("error setting RT info", e)
-            );
+
+            RpcApi.SetRTInfoCommand(TabRpcClient, data).catch((e) => console.log("error setting RT info", e));
         }
     }
 
@@ -157,28 +155,29 @@ const TsunamiView = memo((props: ViewComponentProps<TsunamiViewModel>) => {
 
         const handleConsoleMessage = (e: any) => {
             const message = e.message;
-            if (typeof message === 'string' && message.startsWith('TSUNAMI_META ')) {
+            if (typeof message === "string" && message.startsWith("TSUNAMI_META ")) {
                 try {
-                    const jsonStr = message.substring('TSUNAMI_META '.length);
+                    const jsonStr = message.substring("TSUNAMI_META ".length);
                     const meta = JSON.parse(jsonStr);
                     if (meta.title || meta.shortdesc) {
                         model.setAppMeta(meta);
-                        
+
                         if (meta.title) {
-                            const truncatedTitle = meta.title.length > 77 ? meta.title.substring(0, 77) + "..." : meta.title;
+                            const truncatedTitle =
+                                meta.title.length > 77 ? meta.title.substring(0, 77) + "..." : meta.title;
                             globalStore.set(model.viewName, truncatedTitle);
                         }
                     }
                 } catch (error) {
-                    console.error('Failed to parse TSUNAMI_META message:', error);
+                    console.error("Failed to parse TSUNAMI_META message:", error);
                 }
             }
         };
 
-        webviewElement.addEventListener('console-message', handleConsoleMessage);
+        webviewElement.addEventListener("console-message", handleConsoleMessage);
 
         return () => {
-            webviewElement.removeEventListener('console-message', handleConsoleMessage);
+            webviewElement.removeEventListener("console-message", handleConsoleMessage);
         };
     }, [domReady, model]);
 

go.mod

@@ -19,6 +19,7 @@ require (
 	github.com/gorilla/websocket v1.5.3
 	github.com/invopop/jsonschema v0.13.0
 	github.com/jmoiron/sqlx v1.4.0
+	github.com/joho/godotenv v1.5.1
 	github.com/junegunn/fzf v0.65.2
 	github.com/kevinburke/ssh_config v1.2.0
 	github.com/launchdarkly/eventsource v1.10.0

go.sum

@@ -111,6 +111,8 @@ github.com/invopop/jsonschema v0.13.0 h1:KvpoAJWEjR3uD9Kbm2HWJmqsEaHt8lBUpd0qHcI
 github.com/invopop/jsonschema v0.13.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0=
 github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
 github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
+github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
+github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/junegunn/fzf v0.65.2 h1:Uz6Qey1K4JoGNMskYlwRDnGuCEu/sAh+NxQ4YdX3yn0=
 github.com/junegunn/fzf v0.65.2/go.mod h1:0PctWYfS0aCfyLFEIUjtE+PIXD2UFKaHgbIHiECG7Bo=

pkg/aiusechat/anthropic/anthropic-backend.go

@@ -24,7 +24,7 @@ import (
 )
 
 const (
-	AnthropicDefaultBaseURL              = "https://api.anthropic.com"
+	AnthropicDefaultBaseURL              = "https://api.anthropic.com/v1/messages"
 	AnthropicDefaultAPIVersion           = "2023-06-01"
 	AnthropicDefaultMaxTokens            = 4096
 	AnthropicThinkingBudget              = 1024

pkg/aiusechat/anthropic/anthropic-convertmessage.go

@@ -18,6 +18,8 @@ import (
 	"github.com/google/uuid"
 	"github.com/wavetermdev/waveterm/pkg/aiusechat/uctypes"
 	"github.com/wavetermdev/waveterm/pkg/util/utilfn"
+	"github.com/wavetermdev/waveterm/pkg/waveobj"
+	"github.com/wavetermdev/waveterm/pkg/wstore"
 )
 
 // these conversions are based off the anthropic spec
@@ -26,19 +28,15 @@ import (
 // buildAnthropicHTTPRequest creates a complete HTTP request for the Anthropic API
 func buildAnthropicHTTPRequest(ctx context.Context, msgs []anthropicInputMessage, chatOpts uctypes.WaveChatOpts) (*http.Request, error) {
 	opts := chatOpts.Config
-	if opts.APIToken == "" {
-		return nil, errors.New("Anthropic API token missing")
-	}
 	if opts.Model == "" {
 		return nil, errors.New("opts.model is required")
 	}
 
 	// Set defaults
-	baseURL := opts.BaseURL
-	if baseURL == "" {
-		baseURL = AnthropicDefaultBaseURL
+	endpoint := opts.BaseURL
+	if endpoint == "" {
+		endpoint = AnthropicDefaultBaseURL
 	}
-	endpoint := strings.TrimRight(baseURL, "/") + "/v1/messages"
 
 	apiVersion := opts.APIVersion
 	if apiVersion == "" {
@@ -120,6 +118,10 @@ func buildAnthropicHTTPRequest(ctx context.Context, msgs []anthropicInputMessage
 		}
 		log.Printf("tools: %s\n", strings.Join(toolNames, ", "))
 		log.Printf("anthropicMsgs JSON:\n%s", jsonStr)
+		log.Printf("has-api-key: %v\n", opts.APIToken != "")
+		if endpoint != AnthropicDefaultBaseURL {
+			log.Printf("baseurl: %s\n", endpoint)
+		}
 	}
 
 	var buf bytes.Buffer
@@ -133,11 +135,19 @@ func buildAnthropicHTTPRequest(ctx context.Context, msgs []anthropicInputMessage
 	if err != nil {
 		return nil, err
 	}
+	client, err := wstore.DBGetSingleton[*waveobj.Client](ctx)
+	if err != nil {
+		return nil, fmt.Errorf("error getting client for Wave AI request: %w", err)
+	}
 
 	req.Header.Set("content-type", "application/json")
-	req.Header.Set("x-api-key", opts.APIToken)
+	if opts.APIToken != "" {
+		req.Header.Set("x-api-key", opts.APIToken)
+	}
 	req.Header.Set("anthropic-version", apiVersion)
 	req.Header.Set("accept", "text/event-stream")
+	req.Header.Set("X-Wave-ClientId", client.OID)
+	req.Header.Set("X-Wave-APIType", "anthropic")
 
 	return req, nil
 }

pkg/aiusechat/tools.go

@@ -376,6 +376,7 @@ func GetTsunamiSetConfigToolDefinition(block *waveobj.Block, rtInfo *waveobj.Obj
 	}
 }
 
+// for testing
 func GetAdderToolDefinition() uctypes.ToolDefinition {
 	return uctypes.ToolDefinition{
 		Name:        "adder",

pkg/aiusechat/usechat.go

@@ -26,18 +26,19 @@ const (
 )
 
 const DefaultClaudeModel = "claude-sonnet-4-20250514"
+const DefaultAIEndpoint = "https://cfapi.waveterm.dev/api/waveai"
 
 func getWaveAISettings() (*uctypes.AIOptsType, error) {
-	anthropicSecret := os.Getenv("WAVETERM_ANTHROPIC_SECRET")
-	if anthropicSecret == "" {
-		return nil, fmt.Errorf("no anthropic secret found")
+	baseUrl := DefaultAIEndpoint
+	if os.Getenv("WAVETERM_WAVEAI_ENDPOINT") != "" {
+		baseUrl = os.Getenv("WAVETERM_WAVEAI_ENDPOINT")
 	}
 	return &uctypes.AIOptsType{
-		APIToken:      anthropicSecret,
 		Model:         DefaultClaudeModel,
 		APIType:       APIType_Anthropic,
 		MaxTokens:     4 * 1024,
 		ThinkingLevel: uctypes.ThinkingLevelMedium,
+		BaseURL:       baseUrl,
 	}, nil
 }
 
@@ -291,8 +292,6 @@ func WaveAIPostMessageHandler(w http.ResponseWriter, r *http.Request) {
 		},
 	}
 
-	// Create tools array with adder tool
-	chatOpts.Tools = append(chatOpts.Tools, GetAdderToolDefinition())
 	chatOpts.TabStateGenerator = func() (string, []uctypes.ToolDefinition, error) {
 		return GenerateTabStateAndTools(r.Context(), req.TabId, req.WidgetAccess)
 	}