2e2b743 · crush · git.iko.soy

git.iko.soy/crush

chore: revert ctx change

commit2e2b743eefb61ed0011d8a747d2388fc6aab7b29 authorkujtimiihoxha <kujtimii.h@gmail.com> dateFri 12 Sep 2025, 15:49 (1 year ago) parent8e0d9b5

2 files changed+5−4

compare with main

unifiedsplit

internal/llm/agent/agent.go+3−2 internal/llm/agent/mcp-tools.go+2−2

internal/llm/agent/agent.go+3−2

@@ -93,6 +93,7 @@ var agentPromptMap = map[string]prompt.PromptID{

9393}

9494

9595func NewAgent(

96+ ctx context.Context,

9697 agentCfg config.Agent,

9798 // These services are needed in the tools

9899 permissions permission.Service,

@@ -110,7 +111,7 @@ func NewAgent(

110111 if taskAgentCfg.ID == "" {

111112 return nil, fmt.Errorf("task agent not found in config")

112113 }

113− taskAgent, err := NewAgent(taskAgentCfg, permissions, sessions, messages, history, lspClients)

114+ taskAgent, err := NewAgent(ctx, taskAgentCfg, permissions, sessions, messages, history, lspClients)

114115 if err != nil {

115116 return nil, fmt.Errorf("failed to create task agent: %w", err)

116117 }

@@ -197,7 +198,7 @@ func NewAgent(

197198 }

198199

199200 mcpToolsOnce.Do(func() {

200− mcpTools = doGetMCPTools(permissions, cfg)

201+ mcpTools = doGetMCPTools(ctx, permissions, cfg)

201202 })

202203 allTools = append(allTools, mcpTools...)

203204

internal/llm/agent/mcp-tools.go+2−2

@@ -275,7 +275,7 @@ var mcpInitRequest = mcp.InitializeRequest{

275275 },

276276}

277277

278−func doGetMCPTools(permissions permission.Service, cfg *config.Config) []tools.BaseTool {

278+func doGetMCPTools(ctx context.Context, permissions permission.Service, cfg *config.Config) []tools.BaseTool {

279279 var wg sync.WaitGroup

280280 result := csync.NewSlice[tools.BaseTool]()

281281

@@ -309,7 +309,7 @@ func doGetMCPTools(permissions permission.Service, cfg *config.Config) []tools.B

309309 }

310310 }()

311311

312− ctx, cancel := context.WithTimeout(context.Background(), mcpTimeout(m))

312+ ctx, cancel := context.WithTimeout(ctx, mcpTimeout(m))

313313 defer cancel()

314314 c, err := createAndInitializeClient(ctx, name, m)

315315 if err != nil {