2e2b743 · crush · git.iko.soy

git.iko.soy/crush

on main help sign in

chore: revert ctx change

2e2b743kujtimiihoxha1 year ago

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

compare with main

unifiedsplit

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

93}

95func NewAgent(

96+ ctx context.Context,

96 agentCfg config.Agent,

97 agentCfg config.Agent,

97 // These services are needed in the tools

98 // These services are needed in the tools

98 permissions permission.Service,

99 permissions permission.Service,

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

110 if taskAgentCfg.ID == "" {

111 if taskAgentCfg.ID == "" {

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

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

112 }

113 }

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

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

114 if err != nil {

115 if err != nil {

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

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

116 }

117 }

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

197 }

198 }

198

199

199 mcpToolsOnce.Do(func() {

200 mcpToolsOnce.Do(func() {

200− mcpTools = doGetMCPTools(permissions, cfg)

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

201 })

202 })

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

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

203

204

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

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

275 },

276}

277

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 {

279 var wg sync.WaitGroup

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

281

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

309 }

310 }()

311

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

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

313 defer cancel()

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

315 if err != nil {