Skip to content

Fix issue with agent casing not being considered #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jhaynie merged 3 commits into from
Jun 1, 2025
Merged

Fix issue with agent casing not being considered #372

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b60eb49
Fix issue with agent casing not being considered
jhaynie Jun 1, 2025
ebdbdd0
make the filename matching a little more robust
jhaynie Jun 1, 2025
795fc67
dont need 2nd check
jhaynie Jun 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions cmd/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ func reconcileAgentList(logger logger.Logger, cmd *cobra.Command, apiUrl string,
fileAgents := make(map[string]project.AgentConfig)
fileAgentsByID := make(map[string]project.AgentConfig)
for _, agent := range theproject.Project.Agents {
key := normalAgentName(agent.Name, theproject.Project.IsPython())
key := normalAgentName(agent.Name, theproject.Project.IsPython()) + agent.Name
fileAgents[key] = agent
fileAgentsByID[agent.ID] = agent
}
Expand All @@ -406,12 +406,24 @@ func reconcileAgentList(logger logger.Logger, cmd *cobra.Command, apiUrl string,
// perform the reconcilation
state := make(map[string]agentListState)
for _, agent := range remoteAgents {
key := normalAgentName(agent.Name, theproject.Project.IsPython())
state[key] = agentListState{
Agent: &agent,
Filename: filepath.Join(agentSrcDir, key, agentFilename),
FoundLocal: util.Exists(filepath.Join(agentSrcDir, key, agentFilename)),
FoundRemote: true,
normalizedName := normalAgentName(agent.Name, theproject.Project.IsPython())
key := normalizedName + agent.Name
filename1 := filepath.Join(agentSrcDir, normalizedName, agentFilename)
filename2 := filepath.Join(agentSrcDir, agent.Name, agentFilename)
if util.Exists(filename1) {
state[key] = agentListState{
Agent: &agent,
Filename: filename1,
FoundLocal: true,
FoundRemote: true,
}
} else if util.Exists(filename2) {
state[key] = agentListState{
Agent: &agent,
Filename: filename2,
FoundLocal: true,
FoundRemote: true,
}
}
}
localAgents, err := util.ListDir(agentSrcDir)
Expand All @@ -420,7 +432,8 @@ func reconcileAgentList(logger logger.Logger, cmd *cobra.Command, apiUrl string,
}
for _, filename := range localAgents {
agentName := filepath.Base(filepath.Dir(filename))
key := normalAgentName(agentName, theproject.Project.IsPython())
normalizedName := normalAgentName(agentName, theproject.Project.IsPython())
key := normalizedName + agentName
// var found bool
// for _, agent := range remoteAgents {
// if localAgent, ok := fileAgentsByID[agent.ID]; ok {
Expand Down
Loading