Merge pull request #444 from phantom5099/main

pref:清洗phantom5099以及xgo的问题代码

Author: phantom5099

internal/config/atomic_write.go

@@ -1,7 +1,6 @@
 package config
 
 import (
-	"bytes"
 	"errors"
 	"fmt"
 	"os"
@@ -12,12 +11,11 @@ import (
 
 var (
 	atomicCreateTemp = os.CreateTemp
-	atomicReadFile   = os.ReadFile
 	atomicRename     = os.Rename
 	atomicGOOS       = runtime.GOOS
 )
 
-// writeFileAtomically 通过同目录临时文件与原子替换写入目标文件，并在写后做回读校验。
+// writeFileAtomically 通过同目录临时文件与原子替换写入目标文件。
 func writeFileAtomically(path string, data []byte, perm os.FileMode) error {
 	dir := filepath.Dir(path)
 	pattern := "." + filepath.Base(path) + ".tmp-*"
@@ -53,13 +51,6 @@ func writeFileAtomically(path string, data []byte, perm os.FileMode) error {
 	}
 	cleanupTemp = false
 
-	written, err := atomicReadFile(path)
-	if err != nil {
-		return fmt.Errorf("read back written file: %w", err)
-	}
-	if !bytes.Equal(written, data) {
-		return errors.New("read back mismatch")
-	}
 	if err := fsyncDirectory(dir); err != nil {
 		return fmt.Errorf("sync target directory: %w", err)
 	}

internal/config/context_budget_migration_test.go

@@ -260,50 +260,12 @@ context:
 	}
 }
 
-func TestMigrateContextBudgetConfigFileKeepsOriginalWhenBackupVerificationFails(t *testing.T) {
-	dir := t.TempDir()
-	target := filepath.Join(dir, configName)
-	original := strings.TrimSpace(`
-context:
-  auto_compact:
-    input_token_threshold: 120000
-`) + "\n"
-	if err := os.WriteFile(target, []byte(original), 0o644); err != nil {
-		t.Fatalf("write target: %v", err)
-	}
-
-	restore := stubAtomicWriteOps(t)
-	defer restore()
-	readCount := 0
-	atomicReadFile = func(path string) ([]byte, error) {
-		readCount++
-		if readCount == 1 {
-			return []byte("corrupted"), nil
-		}
-		return os.ReadFile(path)
-	}
-
-	_, err := MigrateContextBudgetConfigFile(target, false)
-	if err == nil || !strings.Contains(err.Error(), "read back mismatch") {
-		t.Fatalf("expected read back mismatch error, got %v", err)
-	}
-	raw, readErr := os.ReadFile(target)
-	if readErr != nil {
-		t.Fatalf("read target: %v", readErr)
-	}
-	if string(raw) != original {
-		t.Fatalf("expected original config to stay unchanged, got:\n%s", raw)
-	}
-}
-
 func stubAtomicWriteOps(t *testing.T) func() {
 	t.Helper()
 	prevCreateTemp := atomicCreateTemp
-	prevReadFile := atomicReadFile
 	prevRename := atomicRename
 	return func() {
 		atomicCreateTemp = prevCreateTemp
-		atomicReadFile = prevReadFile
 		atomicRename = prevRename
 	}
 }

internal/config/manager.go

@@ -92,12 +92,8 @@ func (m *Manager) ConfigPath() string {
 	return m.loader.ConfigPath()
 }
 
-// LockProviderCreate 锁定自定义 Provider 创建事务，确保同一 Manager 维度串行执行。
-func (m *Manager) LockProviderCreate() {
+// AcquireProviderCreateLock 锁定自定义 Provider 创建事务，返回释放函数。
+func (m *Manager) AcquireProviderCreateLock() func() {
 	m.providerCreateMu.Lock()
-}
-
-// UnlockProviderCreate 释放自定义 Provider 创建事务锁。
-func (m *Manager) UnlockProviderCreate() {
-	m.providerCreateMu.Unlock()
+	return m.providerCreateMu.Unlock
 }

internal/config/provider.go

@@ -261,7 +261,6 @@ func resolveRuntimeAPIKey(envName string) (string, error) {
 	if exists {
 		trimmedUserValue := strings.TrimSpace(userValue)
 		if trimmedUserValue != "" {
-			_ = os.Setenv(envName, trimmedUserValue)
 			return trimmedUserValue, nil
 		}
 	}
@@ -369,14 +368,13 @@ const (
 	ModelScopeDefaultAPIKeyEnv = "MODELSCOPE_API_KEY"
 )
 
-// OpenAIProvider returns the builtin OpenAI provider definition.
-func OpenAIProvider() ProviderConfig {
+func newBuiltinOpenAICompatProvider(name, baseURL, model, apiKeyEnv string) ProviderConfig {
 	return ProviderConfig{
-		Name:                  OpenAIName,
+		Name:                  name,
 		Driver:                provider.DriverOpenAICompat,
-		BaseURL:               OpenAIDefaultBaseURL,
-		Model:                 OpenAIDefaultModel,
-		APIKeyEnv:             OpenAIDefaultAPIKeyEnv,
+		BaseURL:               baseURL,
+		Model:                 model,
+		APIKeyEnv:             apiKeyEnv,
 		ModelSource:           ModelSourceDiscover,
 		ChatAPIMode:           provider.ChatAPIModeChatCompletions,
 		ChatEndpointPath:      "/chat/completions",
@@ -385,6 +383,11 @@ func OpenAIProvider() ProviderConfig {
 	}
 }
 
+// OpenAIProvider returns the builtin OpenAI provider definition.
+func OpenAIProvider() ProviderConfig {
+	return newBuiltinOpenAICompatProvider(OpenAIName, OpenAIDefaultBaseURL, OpenAIDefaultModel, OpenAIDefaultAPIKeyEnv)
+}
+
 // GeminiProvider returns the builtin Gemini provider definition.
 func GeminiProvider() ProviderConfig {
 	return ProviderConfig{
@@ -402,50 +405,17 @@ func GeminiProvider() ProviderConfig {
 
 // OpenLLProvider returns the builtin OpenLL provider definition.
 func OpenLLProvider() ProviderConfig {
-	return ProviderConfig{
-		Name:                  OpenLLName,
-		Driver:                provider.DriverOpenAICompat,
-		BaseURL:               OpenLLDefaultBaseURL,
-		Model:                 OpenLLDefaultModel,
-		APIKeyEnv:             OpenLLDefaultAPIKeyEnv,
-		ModelSource:           ModelSourceDiscover,
-		ChatAPIMode:           provider.ChatAPIModeChatCompletions,
-		ChatEndpointPath:      "/chat/completions",
-		DiscoveryEndpointPath: provider.DiscoveryEndpointPathModels,
-		Source:                ProviderSourceBuiltin,
-	}
+	return newBuiltinOpenAICompatProvider(OpenLLName, OpenLLDefaultBaseURL, OpenLLDefaultModel, OpenLLDefaultAPIKeyEnv)
 }
 
 // QiniuProvider returns the builtin Qiniu provider definition.
 func QiniuProvider() ProviderConfig {
-	return ProviderConfig{
-		Name:                  QiniuName,
-		Driver:                provider.DriverOpenAICompat,
-		BaseURL:               QiniuDefaultBaseURL,
-		Model:                 QiniuDefaultModel,
-		APIKeyEnv:             QiniuDefaultAPIKeyEnv,
-		ModelSource:           ModelSourceDiscover,
-		ChatAPIMode:           provider.ChatAPIModeChatCompletions,
-		ChatEndpointPath:      "/chat/completions",
-		DiscoveryEndpointPath: provider.DiscoveryEndpointPathModels,
-		Source:                ProviderSourceBuiltin,
-	}
+	return newBuiltinOpenAICompatProvider(QiniuName, QiniuDefaultBaseURL, QiniuDefaultModel, QiniuDefaultAPIKeyEnv)
 }
 
 // ModelScopeProvider 返回内置的 ModelScope provider 配置。
 func ModelScopeProvider() ProviderConfig {
-	return ProviderConfig{
-		Name:                  ModelScopeName,
-		Driver:                provider.DriverOpenAICompat,
-		BaseURL:               ModelScopeDefaultBaseURL,
-		Model:                 ModelScopeDefaultModel,
-		APIKeyEnv:             ModelScopeDefaultAPIKeyEnv,
-		ModelSource:           ModelSourceDiscover,
-		ChatAPIMode:           provider.ChatAPIModeChatCompletions,
-		ChatEndpointPath:      "/chat/completions",
-		DiscoveryEndpointPath: provider.DiscoveryEndpointPathModels,
-		Source:                ProviderSourceBuiltin,
-	}
+	return newBuiltinOpenAICompatProvider(ModelScopeName, ModelScopeDefaultBaseURL, ModelScopeDefaultModel, ModelScopeDefaultAPIKeyEnv)
 }
 
 // DefaultProviders returns all builtin provider definitions.

internal/config/provider_custom_normalize.go

@@ -99,13 +99,6 @@ func NormalizeCustomProviderInput(input SaveCustomProviderInput) (SaveCustomProv
 		return normalized, nil
 	}
 
-	if requiresDiscoveryEndpointPath(normalized.Driver) && strings.TrimSpace(discoveryEndpointPath) == "" {
-		return SaveCustomProviderInput{}, fmt.Errorf(
-			"config: provider %q model_source discover requires discovery_endpoint_path; "+
-				"if provider does not expose discover endpoint, set model_source to manual",
-			normalized.Name,
-		)
-	}
 	normalized.DiscoveryEndpointPath = discoveryEndpointPath
 	return normalized, nil
 }

internal/config/provider_windows_test.go

@@ -53,9 +53,6 @@ func TestProviderConfigResolveAPIKeyFallsBackToUserEnv(t *testing.T) {
 	if got != envValue {
 		t.Fatalf("ResolveAPIKey() = %q, want %q", got, envValue)
 	}
-	if processGot := os.Getenv(envName); processGot != envValue {
-		t.Fatalf("expected process env synchronized to %q, got %q", envValue, processGot)
-	}
 }
 
 func containsPermissionDenied(err error) bool {

internal/config/state/service_provider_create.go

@@ -75,8 +75,8 @@ func (s *Service) CreateCustomProvider(ctx context.Context, input CreateCustomPr
 		return Selection{}, err
 	}
 
-	s.manager.LockProviderCreate()
-	defer s.manager.UnlockProviderCreate()
+	releaseProviderLock := s.manager.AcquireProviderCreateLock()
+	defer releaseProviderLock()
 
 	releaseCrossProcessLock, err := lockProviderCreateCrossProcess(ctx, s.manager.BaseDir())
 	if err != nil {

internal/runtime/errors_test.go

@@ -2,7 +2,6 @@ package runtime
 
 import (
 	"bytes"
-	"context"
 	"errors"
 	"log"
 	"testing"
@@ -32,7 +31,7 @@ func TestHandleRunErrorProviderErrorDoesNotWriteStdLog(t *testing.T) {
 		log.SetPrefix(oldPrefix)
 	})
 
-	err := service.handleRunError(context.Background(), "run-1", "session-1", providerErr)
+	err := service.handleRunError(providerErr)
 	if !errors.Is(err, providerErr) {
 		t.Fatalf("expected provider error passthrough, got %v", err)
 	}

internal/runtime/event_emitter.go

@@ -22,16 +22,17 @@ func (s *Service) emit(ctx context.Context, kind EventType, runID string, sessio
 	})
 }
 
-// emitRunScoped 携带当前 run 的 turn/phase 元数据发出事件。
-func (s *Service) emitRunScoped(ctx context.Context, kind EventType, state *runState, payload any) error {
+// emitRunScoped 携带当前 run 的 turn/phase 元数据发出事件。事件投递为 best-effort，不返回错误。
+func (s *Service) emitRunScoped(ctx context.Context, kind EventType, state *runState, payload any) {
 	if state == nil {
-		return s.emit(ctx, kind, "", "", payload)
+		_ = s.emit(ctx, kind, "", "", payload)
+		return
 	}
 	phase := ""
 	if state.lifecycle != "" {
 		phase = string(state.lifecycle)
 	}
-	return s.emitWithEnvelope(ctx, RuntimeEvent{
+	_ = s.emitWithEnvelope(ctx, RuntimeEvent{
 		Type:           kind,
 		RunID:          state.runID,
 		SessionID:      state.session.ID,

internal/runtime/repository_context.go

@@ -163,7 +163,7 @@ func (s *Service) emitRepositoryContextUnavailable(
 	if s == nil || s.events == nil || err == nil {
 		return
 	}
-	_ = s.emitRunScoped(ctx, EventRepositoryContextUnavailable, state, RepositoryContextUnavailablePayload{
+	s.emitRunScoped(ctx, EventRepositoryContextUnavailable, state, RepositoryContextUnavailablePayload{
 		Stage:  strings.TrimSpace(stage),
 		Mode:   strings.TrimSpace(mode),
 		Reason: strings.TrimSpace(err.Error()),