Open source AI coding agent. Designed for large projects and real world tasks.
Go aiai-agentsai-developer-toolsai-toolsclicommand-linedeveloper-toolsgitgolanggpt-4llmopenaipolyglot-programmingterminalterminal-basedterminal-ui
basic version of loading maps into context, remove 'apply' confirmation, api host fix/updates
Dane Schneider73220734a0cf
diff --git a/app/cli/api/methods.go b/app/cli/api/methods.goindex 7917aaeb..ac4ac6b3 100644--- a/app/cli/api/methods.go+++ b/app/cli/api/methods.go@@ -70,7 +70,7 @@ func (a *Api) GetCliTrialSession(token string) (*shared.SessionResponse, *shared}func (a *Api) CreateProject(req shared.CreateProjectRequest) (*shared.CreateProjectResponse, *shared.ApiError) {- serverUrl := GetAuthenticatedApiHost() + "/projects"+ serverUrl := GetApiHost() + "/projects"reqBytes, err := json.Marshal(req)if err != nil {@@ -103,7 +103,7 @@ func (a *Api) CreateProject(req shared.CreateProjectRequest) (*shared.CreateProj}func (a *Api) ListProjects() ([]*shared.Project, *shared.ApiError) {- serverUrl := GetAuthenticatedApiHost() + "/projects"+ serverUrl := GetApiHost() + "/projects"resp, err := authenticatedFastClient.Get(serverUrl)if err != nil {return nil, &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error sending request: %v", err)}@@ -130,7 +130,7 @@ func (a *Api) ListProjects() ([]*shared.Project, *shared.ApiError) {}func (a *Api) SetProjectPlan(projectId string, req shared.SetProjectPlanRequest) *shared.ApiError {- serverUrl := fmt.Sprintf("%s/projects/%s/set_plan", GetAuthenticatedApiHost(), projectId)+ serverUrl := fmt.Sprintf("%s/projects/%s/set_plan", GetApiHost(), projectId)reqBytes, err := json.Marshal(req)if err != nil {return &shared.ApiError{Msg: fmt.Sprintf("error marshalling request: %v", err)}@@ -162,7 +162,7 @@ func (a *Api) SetProjectPlan(projectId string, req shared.SetProjectPlanRequest)}func (a *Api) RenameProject(projectId string, req shared.RenameProjectRequest) *shared.ApiError {- serverUrl := fmt.Sprintf("%s/projects/%s/rename", GetAuthenticatedApiHost(), projectId)+ serverUrl := fmt.Sprintf("%s/projects/%s/rename", GetApiHost(), projectId)reqBytes, err := json.Marshal(req)if err != nil {return &shared.ApiError{Msg: fmt.Sprintf("error marshalling request: %v", err)}@@ -194,7 +194,7 @@ func (a *Api) RenameProject(projectId string, req shared.RenameProjectRequest) *return nil}func (a *Api) ListPlans(projectIds []string) ([]*shared.Plan, *shared.ApiError) {- serverUrl := fmt.Sprintf("%s/plans?", GetAuthenticatedApiHost())+ serverUrl := fmt.Sprintf("%s/plans?", GetApiHost())parts := []string{}for _, projectId := range projectIds {parts = append(parts, fmt.Sprintf("projectId=%s", projectId))@@ -229,7 +229,7 @@ func (a *Api) ListPlans(projectIds []string) ([]*shared.Plan, *shared.ApiError)}func (a *Api) ListArchivedPlans(projectIds []string) ([]*shared.Plan, *shared.ApiError) {- serverUrl := fmt.Sprintf("%s/plans/archive?", GetAuthenticatedApiHost())+ serverUrl := fmt.Sprintf("%s/plans/archive?", GetApiHost())parts := []string{}for _, projectId := range projectIds {parts = append(parts, fmt.Sprintf("projectId=%s", projectId))@@ -262,7 +262,7 @@ func (a *Api) ListArchivedPlans(projectIds []string) ([]*shared.Plan, *shared.Ap}func (a *Api) ListPlansRunning(projectIds []string, includeRecent bool) (*shared.ListPlansRunningResponse, *shared.ApiError) {- serverUrl := fmt.Sprintf("%s/plans/ps?", GetAuthenticatedApiHost())+ serverUrl := fmt.Sprintf("%s/plans/ps?", GetApiHost())parts := []string{}for _, projectId := range projectIds {parts = append(parts, fmt.Sprintf("projectId=%s", projectId))@@ -298,7 +298,7 @@ func (a *Api) ListPlansRunning(projectIds []string, includeRecent bool) (*shared}func (a *Api) GetCurrentBranchByPlanId(projectId string, req shared.GetCurrentBranchByPlanIdRequest) (map[string]*shared.Branch, *shared.ApiError) {- serverUrl := fmt.Sprintf("%s/projects/%s/plans/current_branches", GetAuthenticatedApiHost(), projectId)+ serverUrl := fmt.Sprintf("%s/projects/%s/plans/current_branches", GetApiHost(), projectId)reqBytes, err := json.Marshal(req)if err != nil {@@ -342,7 +342,7 @@ func (a *Api) GetCurrentBranchByPlanId(projectId string, req shared.GetCurrentBr}func (a *Api) CreatePlan(projectId string, req shared.CreatePlanRequest) (*shared.CreatePlanResponse, *shared.ApiError) {- serverUrl := fmt.Sprintf("%s/projects/%s/plans", GetAuthenticatedApiHost(), projectId)+ serverUrl := fmt.Sprintf("%s/projects/%s/plans", GetApiHost(), projectId)reqBytes, err := json.Marshal(req)if err != nil {return nil, &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error marshalling request: %v", err)}@@ -374,7 +374,7 @@ func (a *Api) CreatePlan(projectId string, req shared.CreatePlanRequest) (*share}func (a *Api) GetPlan(planId string) (*shared.Plan, *shared.ApiError) {- serverUrl := fmt.Sprintf("%s/plans/%s", GetAuthenticatedApiHost(), planId)+ serverUrl := fmt.Sprintf("%s/plans/%s", GetApiHost(), planId)resp, err := authenticatedFastClient.Get(serverUrl)if err != nil {@@ -403,7 +403,7 @@ func (a *Api) GetPlan(planId string) (*shared.Plan, *shared.ApiError) {}func (a *Api) DeletePlan(planId string) *shared.ApiError {- serverUrl := fmt.Sprintf("%s/plans/%s", GetAuthenticatedApiHost(), planId)+ serverUrl := fmt.Sprintf("%s/plans/%s", GetApiHost(), planId)req, err := http.NewRequest(http.MethodDelete, serverUrl, nil)if err != nil {@@ -431,7 +431,7 @@ func (a *Api) DeletePlan(planId string) *shared.ApiError {}func (a *Api) DeleteAllPlans(projectId string) *shared.ApiError {- serverUrl := fmt.Sprintf("%s/projects/%s/plans", GetAuthenticatedApiHost(), projectId)+ serverUrl := fmt.Sprintf("%s/projects/%s/plans", GetApiHost(), projectId)req, err := http.NewRequest(http.MethodDelete, serverUrl, nil)if err != nil {@@ -461,7 +461,7 @@ func (a *Api) DeleteAllPlans(projectId string) *shared.ApiError {func (a *Api) TellPlan(planId, branch string, req shared.TellPlanRequest, onStream types.OnStreamPlan) *shared.ApiError {- serverUrl := fmt.Sprintf("%s/plans/%s/%s/tell", GetAuthenticatedApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/tell", GetApiHost(), planId, branch)reqBytes, err := json.Marshal(req)if err != nil {return &shared.ApiError{Msg: fmt.Sprintf("error marshalling request: %v", err)}@@ -512,7 +512,7 @@ func (a *Api) BuildPlan(planId, branch string, req shared.BuildPlanRequest, onStlog.Println("Calling BuildPlan")- serverUrl := fmt.Sprintf("%s/plans/%s/%s/build", GetAuthenticatedApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/build", GetApiHost(), planId, branch)reqBytes, err := json.Marshal(req)if err != nil {return &shared.ApiError{Msg: fmt.Sprintf("error marshalling request: %v", err)}@@ -562,7 +562,7 @@ func (a *Api) BuildPlan(planId, branch string, req shared.BuildPlanRequest, onSt}func (a *Api) RespondMissingFile(planId, branch string, req shared.RespondMissingFileRequest) *shared.ApiError {- serverUrl := fmt.Sprintf("%s/plans/%s/%s/respond_missing_file", GetAuthenticatedApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/respond_missing_file", GetApiHost(), planId, branch)reqBytes, err := json.Marshal(req)if err != nil {@@ -597,7 +597,7 @@ func (a *Api) RespondMissingFile(planId, branch string, req shared.RespondMissin}func (a *Api) ConnectPlan(planId, branch string, onStream types.OnStreamPlan) *shared.ApiError {- serverUrl := fmt.Sprintf("%s/plans/%s/%s/connect", GetAuthenticatedApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/connect", GetApiHost(), planId, branch)req, err := http.NewRequest(http.MethodPatch, serverUrl, nil)if err != nil {@@ -628,7 +628,7 @@ func (a *Api) ConnectPlan(planId, branch string, onStream types.OnStreamPlan) *s}func (a *Api) StopPlan(planId, branch string) *shared.ApiError {- serverUrl := fmt.Sprintf("%s/plans/%s/%s/stop", GetAuthenticatedApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/stop", GetApiHost(), planId, branch)req, err := http.NewRequest(http.MethodDelete, serverUrl, nil)if err != nil {@@ -655,7 +655,7 @@ func (a *Api) StopPlan(planId, branch string) *shared.ApiError {}func (a *Api) GetCurrentPlanState(planId, branch string) (*shared.CurrentPlanState, *shared.ApiError) {- serverUrl := fmt.Sprintf("%s/plans/%s/%s/current_plan", GetAuthenticatedApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/current_plan", GetApiHost(), planId, branch)resp, err := authenticatedFastClient.Get(serverUrl)if err != nil {@@ -683,7 +683,7 @@ func (a *Api) GetCurrentPlanState(planId, branch string) (*shared.CurrentPlanSta}func (a *Api) ApplyPlan(planId, branch string, req shared.ApplyPlanRequest) (string, *shared.ApiError) {- serverUrl := fmt.Sprintf("%s/plans/%s/%s/apply", GetAuthenticatedApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/apply", GetApiHost(), planId, branch)reqBytes, err := json.Marshal(req)if err != nil {@@ -723,7 +723,7 @@ func (a *Api) ApplyPlan(planId, branch string, req shared.ApplyPlanRequest) (str}func (a *Api) ArchivePlan(planId string) *shared.ApiError {- serverUrl := fmt.Sprintf("%s/plans/%s/archive", GetAuthenticatedApiHost(), planId)+ serverUrl := fmt.Sprintf("%s/plans/%s/archive", GetApiHost(), planId)req, err := http.NewRequest(http.MethodPatch, serverUrl, nil)if err != nil {@@ -751,7 +751,7 @@ func (a *Api) ArchivePlan(planId string) *shared.ApiError {}func (a *Api) UnarchivePlan(planId string) *shared.ApiError {- serverUrl := fmt.Sprintf("%s/plans/%s/unarchive", GetAuthenticatedApiHost(), planId)+ serverUrl := fmt.Sprintf("%s/plans/%s/unarchive", GetApiHost(), planId)req, err := http.NewRequest(http.MethodPatch, serverUrl, nil)if err != nil {@@ -779,7 +779,7 @@ func (a *Api) UnarchivePlan(planId string) *shared.ApiError {}func (a *Api) RenamePlan(planId string, name string) *shared.ApiError {- serverUrl := fmt.Sprintf("%s/plans/%s/rename", GetAuthenticatedApiHost(), planId)+ serverUrl := fmt.Sprintf("%s/plans/%s/rename", GetApiHost(), planId)reqBytes, err := json.Marshal(shared.RenamePlanRequest{Name: name})if err != nil {@@ -818,7 +818,7 @@ func (a *Api) RenamePlan(planId string, name string) *shared.ApiError {}func (a *Api) RejectAllChanges(planId, branch string) *shared.ApiError {- serverUrl := fmt.Sprintf("%s/plans/%s/%s/reject_all", GetAuthenticatedApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/reject_all", GetApiHost(), planId, branch)req, err := http.NewRequest(http.MethodPatch, serverUrl, nil)if err != nil {@@ -846,7 +846,7 @@ func (a *Api) RejectAllChanges(planId, branch string) *shared.ApiError {}func (a *Api) RejectFile(planId, branch, filePath string) *shared.ApiError {- serverUrl := fmt.Sprintf("%s/plans/%s/%s/reject_file", GetAuthenticatedApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/reject_file", GetApiHost(), planId, branch)reqBytes, err := json.Marshal(shared.RejectFileRequest{FilePath: filePath})@@ -880,7 +880,7 @@ func (a *Api) RejectFile(planId, branch, filePath string) *shared.ApiError {}func (a *Api) RejectFiles(planId, branch string, paths []string) *shared.ApiError {- serverUrl := fmt.Sprintf("%s/plans/%s/%s/reject_files", GetAuthenticatedApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/reject_files", GetApiHost(), planId, branch)reqBytes, err := json.Marshal(shared.RejectFilesRequest{Paths: paths})@@ -914,7 +914,7 @@ func (a *Api) RejectFiles(planId, branch string, paths []string) *shared.ApiErro}func (a *Api) LoadContext(planId, branch string, req shared.LoadContextRequest) (*shared.LoadContextResponse, *shared.ApiError) {- serverUrl := fmt.Sprintf("%s/plans/%s/%s/context", GetAuthenticatedApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/context", GetApiHost(), planId, branch)reqBytes, err := json.Marshal(req)if err != nil {return nil, &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error marshalling request: %v", err)}@@ -947,7 +947,7 @@ func (a *Api) LoadContext(planId, branch string, req shared.LoadContextRequest)}func (a *Api) UpdateContext(planId, branch string, req shared.UpdateContextRequest) (*shared.UpdateContextResponse, *shared.ApiError) {- serverUrl := fmt.Sprintf("%s/plans/%s/%s/context", GetAuthenticatedApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/context", GetApiHost(), planId, branch)reqBytes, err := json.Marshal(req)if err != nil {@@ -989,7 +989,7 @@ func (a *Api) UpdateContext(planId, branch string, req shared.UpdateContextReque}func (a *Api) DeleteContext(planId, branch string, req shared.DeleteContextRequest) (*shared.DeleteContextResponse, *shared.ApiError) {- serverUrl := fmt.Sprintf("%s/plans/%s/%s/context", GetAuthenticatedApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/context", GetApiHost(), planId, branch)reqBytes, err := json.Marshal(req)if err != nil {return nil, &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error marshalling request: %v", err)}@@ -1027,7 +1027,7 @@ func (a *Api) DeleteContext(planId, branch string, req shared.DeleteContextReque}func (a *Api) ListContext(planId, branch string) ([]*shared.Context, *shared.ApiError) {- serverUrl := fmt.Sprintf("%s/plans/%s/%s/context", GetAuthenticatedApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/context", GetApiHost(), planId, branch)resp, err := authenticatedFastClient.Get(serverUrl)if err != nil {@@ -1055,7 +1055,7 @@ func (a *Api) ListContext(planId, branch string) ([]*shared.Context, *shared.Api}func (a *Api) ListConvo(planId, branch string) ([]*shared.ConvoMessage, *shared.ApiError) {- serverUrl := fmt.Sprintf("%s/plans/%s/%s/convo", GetAuthenticatedApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/convo", GetApiHost(), planId, branch)resp, err := authenticatedFastClient.Get(serverUrl)if err != nil {@@ -1083,7 +1083,7 @@ func (a *Api) ListConvo(planId, branch string) ([]*shared.ConvoMessage, *shared.}func (a *Api) GetPlanStatus(planId, branch string) (string, *shared.ApiError) {- serverUrl := fmt.Sprintf("%s/plans/%s/%s/status", GetAuthenticatedApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/status", GetApiHost(), planId, branch)resp, err := authenticatedFastClient.Get(serverUrl)if err != nil {@@ -1111,7 +1111,7 @@ func (a *Api) GetPlanStatus(planId, branch string) (string, *shared.ApiError) {}func (a *Api) GetPlanDiffs(planId, branch string, plain bool) (string, *shared.ApiError) {- serverUrl := fmt.Sprintf("%s/plans/%s/%s/diffs", GetAuthenticatedApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/diffs", GetApiHost(), planId, branch)if plain {serverUrl += "?plain=true"@@ -1143,7 +1143,7 @@ func (a *Api) GetPlanDiffs(planId, branch string, plain bool) (string, *shared.A}func (a *Api) ListLogs(planId, branch string) (*shared.LogResponse, *shared.ApiError) {- serverUrl := fmt.Sprintf("%s/plans/%s/%s/logs", GetAuthenticatedApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/logs", GetApiHost(), planId, branch)resp, err := authenticatedFastClient.Get(serverUrl)if err != nil {@@ -1172,7 +1172,7 @@ func (a *Api) ListLogs(planId, branch string) (*shared.LogResponse, *shared.ApiE}func (a *Api) RewindPlan(planId, branch string, req shared.RewindPlanRequest) (*shared.RewindPlanResponse, *shared.ApiError) {- serverUrl := fmt.Sprintf("%s/plans/%s/%s/rewind", GetAuthenticatedApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/rewind", GetApiHost(), planId, branch)reqBytes, err := json.Marshal(req)if err != nil {return nil, &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error marshalling request: %v", err)}@@ -1275,7 +1275,7 @@ func (a *Api) CreateAccount(req shared.CreateAccountRequest, customHost string)}func (a *Api) CreateOrg(req shared.CreateOrgRequest) (*shared.CreateOrgResponse, *shared.ApiError) {- serverUrl := GetAuthenticatedApiHost() + "/orgs"+ serverUrl := GetApiHost() + "/orgs"reqBytes, err := json.Marshal(req)if err != nil {return nil, &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error marshalling request: %v", err)}@@ -1307,7 +1307,7 @@ func (a *Api) CreateOrg(req shared.CreateOrgRequest) (*shared.CreateOrgResponse,}func (a *Api) GetOrgSession() (*shared.Org, *shared.ApiError) {- serverUrl := GetAuthenticatedApiHost() + "/orgs/session"+ serverUrl := GetApiHost() + "/orgs/session"resp, err := authenticatedFastClient.Get(serverUrl)if err != nil {return nil, &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error sending request: %v", err)}@@ -1336,7 +1336,7 @@ func (a *Api) GetOrgSession() (*shared.Org, *shared.ApiError) {}func (a *Api) ListOrgs() ([]*shared.Org, *shared.ApiError) {- serverUrl := GetAuthenticatedApiHost() + "/orgs"+ serverUrl := GetApiHost() + "/orgs"resp, err := authenticatedFastClient.Get(serverUrl)if err != nil {return nil, &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error sending request: %v", err)}@@ -1363,7 +1363,7 @@ func (a *Api) ListOrgs() ([]*shared.Org, *shared.ApiError) {}func (a *Api) DeleteUser(userId string) *shared.ApiError {- serverUrl := fmt.Sprintf("%s/orgs/users/%s", GetAuthenticatedApiHost(), userId)+ serverUrl := fmt.Sprintf("%s/orgs/users/%s", GetApiHost(), userId)req, err := http.NewRequest(http.MethodDelete, serverUrl, nil)if err != nil {return &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error creating request: %v", err)}@@ -1389,7 +1389,7 @@ func (a *Api) DeleteUser(userId string) *shared.ApiError {}func (a *Api) ListOrgRoles() ([]*shared.OrgRole, *shared.ApiError) {- serverUrl := GetAuthenticatedApiHost() + "/orgs/roles"+ serverUrl := GetApiHost() + "/orgs/roles"resp, err := authenticatedFastClient.Get(serverUrl)if err != nil {return nil, &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error sending request: %s", err)}@@ -1417,7 +1417,7 @@ func (a *Api) ListOrgRoles() ([]*shared.OrgRole, *shared.ApiError) {}func (a *Api) InviteUser(req shared.InviteRequest) *shared.ApiError {- serverUrl := GetAuthenticatedApiHost() + "/invites"+ serverUrl := GetApiHost() + "/invites"reqBytes, err := json.Marshal(req)if err != nil {return &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error marshalling request: %v", err)}@@ -1444,7 +1444,7 @@ func (a *Api) InviteUser(req shared.InviteRequest) *shared.ApiError {}func (a *Api) ListPendingInvites() ([]*shared.Invite, *shared.ApiError) {- serverUrl := GetAuthenticatedApiHost() + "/invites/pending"+ serverUrl := GetApiHost() + "/invites/pending"resp, err := authenticatedFastClient.Get(serverUrl)if err != nil {return nil, &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error sending request: %v", err)}@@ -1471,7 +1471,7 @@ func (a *Api) ListPendingInvites() ([]*shared.Invite, *shared.ApiError) {}func (a *Api) ListAcceptedInvites() ([]*shared.Invite, *shared.ApiError) {- serverUrl := GetAuthenticatedApiHost() + "/invites/accepted"+ serverUrl := GetApiHost() + "/invites/accepted"resp, err := authenticatedFastClient.Get(serverUrl)if err != nil {return nil, &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error sending request: %v", err)}@@ -1498,7 +1498,7 @@ func (a *Api) ListAcceptedInvites() ([]*shared.Invite, *shared.ApiError) {}func (a *Api) ListAllInvites() ([]*shared.Invite, *shared.ApiError) {- serverUrl := GetAuthenticatedApiHost() + "/invites/all"+ serverUrl := GetApiHost() + "/invites/all"resp, err := authenticatedFastClient.Get(serverUrl)if err != nil {return nil, &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error sending request: %v", err)}@@ -1525,7 +1525,7 @@ func (a *Api) ListAllInvites() ([]*shared.Invite, *shared.ApiError) {}func (a *Api) DeleteInvite(inviteId string) *shared.ApiError {- serverUrl := fmt.Sprintf("%s/invites/%s", GetAuthenticatedApiHost(), inviteId)+ serverUrl := fmt.Sprintf("%s/invites/%s", GetApiHost(), inviteId)req, err := http.NewRequest(http.MethodDelete, serverUrl, nil)if err != nil {return &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error creating request: %v", err)}@@ -1584,7 +1584,7 @@ func (a *Api) CreateEmailVerification(email, customHost, userId string) (*shared}func (a *Api) CreateSignInCode() (string, *shared.ApiError) {- serverUrl := GetAuthenticatedApiHost() + "/accounts/sign_in_codes"+ serverUrl := GetApiHost() + "/accounts/sign_in_codes"resp, err := authenticatedFastClient.Post(serverUrl, "application/json", nil)if err != nil {return "", &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error sending request: %v", err)}@@ -1612,7 +1612,7 @@ func (a *Api) CreateSignInCode() (string, *shared.ApiError) {}func (a *Api) SignOut() *shared.ApiError {- serverUrl := GetAuthenticatedApiHost() + "/accounts/sign_out"+ serverUrl := GetApiHost() + "/accounts/sign_out"req, err := http.NewRequest(http.MethodPost, serverUrl, nil)if err != nil {@@ -1634,7 +1634,7 @@ func (a *Api) SignOut() *shared.ApiError {}func (a *Api) ListUsers() (*shared.ListUsersResponse, *shared.ApiError) {- serverUrl := GetAuthenticatedApiHost() + "/users"+ serverUrl := GetApiHost() + "/users"resp, err := authenticatedFastClient.Get(serverUrl)if err != nil {return nil, &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error sending request: %v", err)}@@ -1661,7 +1661,7 @@ func (a *Api) ListUsers() (*shared.ListUsersResponse, *shared.ApiError) {}func (a *Api) ListBranches(planId string) ([]*shared.Branch, *shared.ApiError) {- serverUrl := fmt.Sprintf("%s/plans/%s/branches", GetAuthenticatedApiHost(), planId)+ serverUrl := fmt.Sprintf("%s/plans/%s/branches", GetApiHost(), planId)resp, err := authenticatedFastClient.Get(serverUrl)if err != nil {@@ -1690,7 +1690,7 @@ func (a *Api) ListBranches(planId string) ([]*shared.Branch, *shared.ApiError) {}func (a *Api) CreateBranch(planId, branch string, req shared.CreateBranchRequest) *shared.ApiError {- serverUrl := fmt.Sprintf("%s/plans/%s/%s/branches", GetAuthenticatedApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/branches", GetApiHost(), planId, branch)reqBytes, err := json.Marshal(req)if err != nil {@@ -1718,7 +1718,7 @@ func (a *Api) CreateBranch(planId, branch string, req shared.CreateBranchRequest}func (a *Api) DeleteBranch(planId, branch string) *shared.ApiError {- serverUrl := fmt.Sprintf("%s/plans/%s/branches/%s", GetAuthenticatedApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/branches/%s", GetApiHost(), planId, branch)req, err := http.NewRequest(http.MethodDelete, serverUrl, nil)if err != nil {@@ -1746,7 +1746,7 @@ func (a *Api) DeleteBranch(planId, branch string) *shared.ApiError {}func (a *Api) GetSettings(planId, branch string) (*shared.PlanSettings, *shared.ApiError) {- serverUrl := fmt.Sprintf("%s/plans/%s/%s/settings", GetAuthenticatedApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/settings", GetApiHost(), planId, branch)resp, err := authenticatedFastClient.Get(serverUrl)@@ -1775,7 +1775,7 @@ func (a *Api) GetSettings(planId, branch string) (*shared.PlanSettings, *shared.}func (a *Api) UpdateSettings(planId, branch string, req shared.UpdateSettingsRequest) (*shared.UpdateSettingsResponse, *shared.ApiError) {- serverUrl := fmt.Sprintf("%s/plans/%s/%s/settings", GetAuthenticatedApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/settings", GetApiHost(), planId, branch)reqBytes, err := json.Marshal(req)if err != nil {@@ -1818,7 +1818,7 @@ func (a *Api) UpdateSettings(planId, branch string, req shared.UpdateSettingsReq}func (a *Api) GetOrgDefaultSettings() (*shared.PlanSettings, *shared.ApiError) {- serverUrl := fmt.Sprintf("%s/default_settings", GetAuthenticatedApiHost())+ serverUrl := fmt.Sprintf("%s/default_settings", GetApiHost())resp, err := authenticatedFastClient.Get(serverUrl)@@ -1847,7 +1847,7 @@ func (a *Api) GetOrgDefaultSettings() (*shared.PlanSettings, *shared.ApiError) {}func (a *Api) UpdateOrgDefaultSettings(req shared.UpdateSettingsRequest) (*shared.UpdateSettingsResponse, *shared.ApiError) {- serverUrl := fmt.Sprintf("%s/default_settings", GetAuthenticatedApiHost())+ serverUrl := fmt.Sprintf("%s/default_settings", GetApiHost())reqBytes, err := json.Marshal(req)if err != nil {@@ -1890,7 +1890,7 @@ func (a *Api) UpdateOrgDefaultSettings(req shared.UpdateSettingsRequest) (*share}func (a *Api) CreateCustomModel(model *shared.AvailableModel) *shared.ApiError {- serverUrl := fmt.Sprintf("%s/custom_models", GetAuthenticatedApiHost())+ serverUrl := fmt.Sprintf("%s/custom_models", GetApiHost())body, err := json.Marshal(model)if err != nil {return &shared.ApiError{Msg: "Failed to marshal model"}@@ -1917,7 +1917,7 @@ func (a *Api) CreateCustomModel(model *shared.AvailableModel) *shared.ApiError {}func (a *Api) ListCustomModels() ([]*shared.AvailableModel, *shared.ApiError) {- serverUrl := fmt.Sprintf("%s/custom_models", GetAuthenticatedApiHost())+ serverUrl := fmt.Sprintf("%s/custom_models", GetApiHost())resp, err := authenticatedFastClient.Get(serverUrl)if err != nil {return nil, &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error sending request: %v", err)}@@ -1945,7 +1945,7 @@ func (a *Api) ListCustomModels() ([]*shared.AvailableModel, *shared.ApiError) {}func (a *Api) DeleteAvailableModel(modelId string) *shared.ApiError {- serverUrl := fmt.Sprintf("%s/custom_models/%s", GetAuthenticatedApiHost(), modelId)+ serverUrl := fmt.Sprintf("%s/custom_models/%s", GetApiHost(), modelId)req, err := http.NewRequest(http.MethodDelete, serverUrl, nil)if err != nil {return &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error creating request: %v", err)}@@ -1972,7 +1972,7 @@ func (a *Api) DeleteAvailableModel(modelId string) *shared.ApiError {}func (a *Api) CreateModelPack(set *shared.ModelPack) *shared.ApiError {- serverUrl := fmt.Sprintf("%s/model_sets", GetAuthenticatedApiHost())+ serverUrl := fmt.Sprintf("%s/model_sets", GetApiHost())body, err := json.Marshal(set)if err != nil {return &shared.ApiError{Msg: "Failed to marshal model pack"}@@ -2000,7 +2000,7 @@ func (a *Api) CreateModelPack(set *shared.ModelPack) *shared.ApiError {}func (a *Api) ListModelPacks() ([]*shared.ModelPack, *shared.ApiError) {- serverUrl := fmt.Sprintf("%s/model_sets", GetAuthenticatedApiHost())+ serverUrl := fmt.Sprintf("%s/model_sets", GetApiHost())resp, err := authenticatedFastClient.Get(serverUrl)if err != nil {@@ -2030,7 +2030,7 @@ func (a *Api) ListModelPacks() ([]*shared.ModelPack, *shared.ApiError) {}func (a *Api) DeleteModelPack(setId string) *shared.ApiError {- serverUrl := fmt.Sprintf("%s/model_sets/%s", GetAuthenticatedApiHost(), setId)+ serverUrl := fmt.Sprintf("%s/model_sets/%s", GetApiHost(), setId)req, err := http.NewRequest(http.MethodDelete, serverUrl, nil)if err != nil {@@ -2058,7 +2058,7 @@ func (a *Api) DeleteModelPack(setId string) *shared.ApiError {}func (a *Api) GetCreditsTransactions(pageSize, pageNum int) (*shared.CreditsLogResponse, *shared.ApiError) {- serverUrl := fmt.Sprintf("%s/billing/credits_transactions?size=%d&page=%d", GetAuthenticatedApiHost(), pageSize, pageNum)+ serverUrl := fmt.Sprintf("%s/billing/credits_transactions?size=%d&page=%d", GetApiHost(), pageSize, pageNum)resp, err := authenticatedFastClient.Get(serverUrl)if err != nil {@@ -2087,7 +2087,7 @@ func (a *Api) GetCreditsTransactions(pageSize, pageNum int) (*shared.CreditsLogR}func (a *Api) GetFileMap(req shared.GetFileMapRequest) (*shared.GetFileMapResponse, *shared.ApiError) {- serverUrl := fmt.Sprintf("%s/file_map", GetAuthenticatedApiHost())+ serverUrl := fmt.Sprintf("%s/file_map", GetApiHost())reqBytes, err := json.Marshal(req)if err != nil {return nil, &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error marshalling request: %v", err)}diff --git a/app/cli/changes_tui/run.go b/app/cli/changes_tui/run.goindex 7e77c806..337f20e4 100644--- a/app/cli/changes_tui/run.go+++ b/app/cli/changes_tui/run.go@@ -38,7 +38,7 @@ func StartChangesUI(currentPlan *shared.CurrentPlanState) error {}if mod.shouldApplyAll {- lib.MustApplyPlan(lib.CurrentPlanId, lib.CurrentBranch, false, false, false)+ lib.MustApplyPlan(lib.CurrentPlanId, lib.CurrentBranch, true, false, false)}if mod.rejectFileErr != nil {diff --git a/app/cli/cmd/apply.go b/app/cli/cmd/apply.goindex 87b6a5d8..ad40607d 100644--- a/app/cli/cmd/apply.go+++ b/app/cli/cmd/apply.go@@ -11,7 +11,6 @@ import (var autoConfirm, autoCommit, noCommit boolfunc init() {- applyCmd.Flags().BoolVarP(&autoConfirm, "yes", "y", false, "Automatically confirm unless plan is outdated")applyCmd.Flags().BoolVarP(&autoCommit, "commit", "c", false, "Commit changes to git")applyCmd.Flags().BoolVarP(&noCommit, "no-commit", "n", false, "Do not commit changes to git")RootCmd.AddCommand(applyCmd)@@ -32,5 +31,5 @@ func apply(cmd *cobra.Command, args []string) {term.OutputNoCurrentPlanErrorAndExit()}- lib.MustApplyPlan(lib.CurrentPlanId, lib.CurrentBranch, autoConfirm, autoCommit, noCommit)+ lib.MustApplyPlan(lib.CurrentPlanId, lib.CurrentBranch, true, autoCommit, noCommit)}diff --git a/app/cli/cmd/load.go b/app/cli/cmd/load.goindex 6ae65116..65728312 100644--- a/app/cli/cmd/load.go+++ b/app/cli/cmd/load.go@@ -53,6 +53,7 @@ func contextLoad(cmd *cobra.Command, args []string) {NamesOnly: namesOnly,ForceSkipIgnore: forceSkipIgnore,ImageDetail: openai.ImageURLDetail(imageDetail),+ DefsOnly: defsOnly,})fmt.Println()diff --git a/app/cli/cmd/ls.go b/app/cli/cmd/ls.goindex 0e56e7d5..ae7e0d8d 100644--- a/app/cli/cmd/ls.go+++ b/app/cli/cmd/ls.go@@ -52,6 +52,9 @@ func listContext(cmd *cobra.Command, args []string) {t, icon := context.TypeAndIcon()name := context.Name+ if name == "" {+ name = context.FilePath+ }if len(name) > 40 {name = name[:20] + "⋯" + name[len(name)-20:]}diff --git a/app/cli/lib/context_load.go b/app/cli/lib/context_load.goindex ddbd51ee..8b0bad0b 100644--- a/app/cli/lib/context_load.go+++ b/app/cli/lib/context_load.go@@ -234,10 +234,17 @@ func MustLoadContext(resources []string, params *types.LoadContextParams) {onErr(fmt.Errorf("failed to parse input paths: %v", err))}- // Add this check for the number of files- if len(flattenedPaths) > shared.MaxContextCount {- onErr(fmt.Errorf("too many files to load (found %d, limit is %d)", len(flattenedPaths), shared.MaxContextCount))- }+ // // Dump flattenedPaths to JSON file for debugging+ // debugData, err := json.MarshalIndent(flattenedPaths, "", " ")+ // if err != nil {+ // onErr(fmt.Errorf("failed to marshal flattened paths: %v", err))+ // return+ // }++ // if err := os.WriteFile("flattened_paths_debug.json", debugData, 0644); err != nil {+ // onErr(fmt.Errorf("failed to write debug file: %v", err))+ // return+ // }if !params.ForceSkipIgnore {var filteredPaths []string@@ -253,13 +260,41 @@ func MustLoadContext(resources []string, params *types.LoadContextParams) {flattenedPaths = filteredPaths}+ // Add this check for the number of files (after filtering out ignored/irrelevant paths)+ var numPaths int+ if params.DefsOnly {+ for _, path := range flattenedPaths {+ ext := filepath.Ext(path)+ if shared.IsTreeSitterExtension(ext) {+ numPaths+++ }+ }+ } else {+ numPaths = len(flattenedPaths)+ }++ if numPaths > shared.MaxContextCount {+ onErr(fmt.Errorf("too many files to load (found %d, limit is %d)", numPaths, shared.MaxContextCount))+ }+inputFilePaths = flattenedPathsfor _, path := range flattenedPaths {var mapInputPath stringif params.DefsOnly {for _, inputPath := range toLoadMapPaths {- if strings.HasPrefix(path, inputPath) {+ // Clean and make absolute paths for comparison+ absPath, err := filepath.Abs(path)+ if err != nil {+ continue+ }+ absInputPath, err := filepath.Abs(inputPath)+ if err != nil {+ continue+ }++ // Check if paths are equal or if path is under inputPath+ if absPath == absInputPath || strings.HasPrefix(absPath+string(filepath.Separator), absInputPath+string(filepath.Separator)) {mapInputPath = inputPathbreak}@@ -363,6 +398,7 @@ func MustLoadContext(resources []string, params *types.LoadContextParams) {for _, inputPath := range toLoadMapPaths {loadContextReq = append(loadContextReq, &shared.LoadContextParams{ContextType: shared.ContextMapType,+ Name: inputPath,MapInputs: mapInputsByPath[inputPath],FilePath: inputPath,})diff --git a/app/cli/lib/context_update.go b/app/cli/lib/context_update.goindex f7eb3ef2..ba7904ee 100644--- a/app/cli/lib/context_update.go+++ b/app/cli/lib/context_update.go@@ -364,46 +364,64 @@ func checkOutdatedAndMaybeUpdateContext(doUpdate bool, maybeContexts []*shared.Cvar updatedInputs = make(shared.FileMapInputs)var updatedInputShas = map[string]string{}- for path, part := range context.MapParts {- if _, err := os.Stat(path); os.IsNotExist(err) {- removedMapPaths = append(removedMapPaths, path)- }-+ for path, currentSha := range context.MapShas {bytes, err := os.ReadFile(path)if err != nil {+ if os.IsNotExist(err) {+ removedMapPaths = append(removedMapPaths, path)+ continue+ }+errs = append(errs, fmt.Errorf("failed to read map file %s: %v", path, err))return}hash := sha256.Sum256(bytes)- sha := hex.EncodeToString(hash[:])+ newSha := hex.EncodeToString(hash[:])- if sha != part.Sha {+ if newSha != currentSha {+ // fmt.Println("path", path, "newSha", newSha, "currentSha", currentSha)content := string(bytes)updatedInputs[path] = content- updatedInputShas[path] = sha+ updatedInputShas[path] = newSha}}// Check if new files were added- flattenedPaths, err := ParseInputPaths([]string{context.FilePath}, &types.LoadContextParams{})+ baseDir := fs.GetBaseDirForFilePaths([]string{context.FilePath})+ paths, err := fs.GetProjectPaths(baseDir)+ if err != nil {+ errs = append(errs, fmt.Errorf("failed to get project paths: %v", err))+ return+ }++ flattenedPaths, err := ParseInputPaths([]string{context.FilePath}, &types.LoadContextParams{Recursive: true})if err != nil {errs = append(errs, fmt.Errorf("failed to get the directory tree %s: %v", context.FilePath, err))return}+ var filteredPaths []string+ for _, inputFilePath := range flattenedPaths {+ if _, ok := paths.ActivePaths[inputFilePath]; ok {+ filteredPaths = append(filteredPaths, inputFilePath)+ }+ }+ flattenedPaths = filteredPaths+for _, path := range flattenedPaths {ext := filepath.Ext(path)if !shared.IsTreeSitterExtension(ext) {continue}- if _, ok := context.MapParts[path]; !ok {+ if _, ok := context.MapShas[path]; !ok {bytes, err := os.ReadFile(path)if err != nil {errs = append(errs, fmt.Errorf("failed to read map file %s: %v", path, err))return}+content := string(bytes)updatedInputs[path] = contenthash := sha256.Sum256(bytes)@@ -411,10 +429,11 @@ func checkOutdatedAndMaybeUpdateContext(doUpdate bool, maybeContexts []*shared.CupdatedInputShas[path] = sha}}-// If any files changed, get new mapif len(updatedInputs) > 0 || len(removedMapPaths) > 0 {- updatedParts := make(shared.FileMapParts)+ // fmt.Println("updatedInputs", len(updatedInputs), "removedMapPaths", len(removedMapPaths))++ updatedParts := make(shared.FileMapBodies)for k, v := range context.MapParts {updatedParts[k] = v}@@ -431,10 +450,21 @@ func checkOutdatedAndMaybeUpdateContext(doUpdate bool, maybeContexts []*shared.C// Update map parts with new contentfor path, body := range mapRes.MapBodies {- updatedParts[path] = shared.FileMapPart{- Body: body,+ updatedParts[path] = body++ prevTokens := context.MapTokens[path]+ numTokens, err := shared.GetNumTokens(body)+ if err != nil {+ errs = append(errs, fmt.Errorf("failed to get the number of tokens in the file %s: %v", path, err))+ return}++ // fmt.Println("path", path, "numTokens", numTokens, "prevTokens", prevTokens)++ tokenDiffsById[context.Id] += numTokens - prevTokens}++ // test this}if len(removedMapPaths) > 0 {@@ -443,19 +473,9 @@ func checkOutdatedAndMaybeUpdateContext(doUpdate bool, maybeContexts []*shared.C}}- // Combine map parts into single body- body := updatedParts.CombinedMap()- numTokens, err := shared.GetNumTokens(body)- if err != nil {- errs = append(errs, fmt.Errorf("failed to get tokens for combined map: %v", err))- return- }-- tokenDiffsById[context.Id] += (numTokens - context.NumTokens)numMaps++updatedContexts = append(updatedContexts, context)req[context.Id] = &shared.UpdateContextParams{- Body: body,MapBodies: updatedMapBodies,InputShas: updatedInputShas,RemovedMapPaths: removedMapPaths,diff --git a/app/server/db/context_helpers.go b/app/server/db/context_helpers.goindex fd57cd2a..d2ecd739 100644--- a/app/server/db/context_helpers.go+++ b/app/server/db/context_helpers.go@@ -1,7 +1,6 @@package dbimport (- "bytes""context""crypto/sha256""encoding/hex"@@ -21,7 +20,7 @@ import (type Ctx context.Context-func GetPlanContexts(orgId, planId string, includeBody bool) ([]*Context, error) {+func GetPlanContexts(orgId, planId string, includeBody, includeMapParts bool) ([]*Context, error) {var contexts []*ContextcontextDir := getPlanContextDir(orgId, planId)@@ -35,31 +34,36 @@ func GetPlanContexts(orgId, planId string, includeBody bool) ([]*Context, error)return nil, fmt.Errorf("error reading context dir: %v", err)}- errCh := make(chan error, len(files)/2)- contextCh := make(chan *Context, len(files)/2)+ errCh := make(chan error, len(files))+ var mu sync.Mutex// read each context filefor _, file := range files {if strings.HasSuffix(file.Name(), ".meta") {go func(file os.DirEntry) {- context, err := GetContext(orgId, planId, strings.TrimSuffix(file.Name(), ".meta"), includeBody)+ context, err := GetContext(orgId, planId, strings.TrimSuffix(file.Name(), ".meta"), includeBody, includeMapParts)++ mu.Lock()+ defer mu.Unlock()+ contexts = append(contexts, context)if err != nil {errCh <- fmt.Errorf("error reading context file: %v", err)return}- contextCh <- context+ errCh <- nil}(file)+ } else {+ // only processing meta files here, so just send nil for accurate count+ errCh <- nil}}- for i := 0; i < len(files)/2; i++ {- select {- case err := <-errCh:+ for i := 0; i < len(files); i++ {+ err := <-errCh+ if err != nil {return nil, fmt.Errorf("error reading context files: %v", err)- case context := <-contextCh:- contexts = append(contexts, context)}}@@ -71,7 +75,7 @@ func GetPlanContexts(orgId, planId string, includeBody bool) ([]*Context, error)return contexts, nil}-func GetContext(orgId, planId, contextId string, includeBody bool) (*Context, error) {+func GetContext(orgId, planId, contextId string, includeBody, includeMapParts bool) (*Context, error) {contextDir := getPlanContextDir(orgId, planId)// read the meta file@@ -100,6 +104,22 @@ func GetContext(orgId, planId, contextId string, includeBody bool) (*Context, ercontext.Body = string(bodyBytes)}+ if includeMapParts {+ // read the map parts file+ mapPartsPath := filepath.Join(contextDir, strings.TrimSuffix(contextId, ".meta")+".map-parts")+ mapPartsBytes, err := os.ReadFile(mapPartsPath)+ if !os.IsNotExist(err) {+ if err != nil {+ return nil, fmt.Errorf("error reading context map parts file: %v", err)+ }++ err = json.Unmarshal(mapPartsBytes, &context.MapParts)+ if err != nil {+ return nil, fmt.Errorf("error unmarshalling context map parts file: %v", err)+ }+ }+ }+return &context, nil}@@ -113,7 +133,7 @@ func ContextRemove(orgId, planId string, contexts []*Context) error {for _, context := range contexts {filesToUpdate[context.FilePath] = ""contextDir := getPlanContextDir(orgId, planId)- for _, ext := range []string{".meta", ".body"} {+ for _, ext := range []string{".meta", ".body", ".map-parts"} {go func(context *Context, dir, ext string) {errCh <- os.Remove(filepath.Join(dir, context.Id+ext))}(context, contextDir, ext)@@ -122,7 +142,7 @@ func ContextRemove(orgId, planId string, contexts []*Context) error {for i := 0; i < numFiles; i++ {err := <-errCh- if err != nil {+ if err != nil && !os.IsNotExist(err) {return fmt.Errorf("error removing context file: %v", err)}}@@ -136,6 +156,9 @@ func ContextRemove(orgId, planId string, contexts []*Context) error {}func StoreContext(context *Context) error {+ // log.Println("Storing context", context.Id)+ // log.Println("Num tokens", context.NumTokens)+contextDir := getPlanContextDir(context.OrgId, context.PlanId)err := os.MkdirAll(contextDir, os.ModePerm)@@ -162,6 +185,7 @@ func StoreContext(context *Context) error {body := []byte(originalBody)context.Body = ""+ originalMapParts := context.MapPartsvar mapPath stringvar mapBytes []byteif len(context.MapParts) > 0 {@@ -197,6 +221,7 @@ func StoreContext(context *Context) error {}context.Body = originalBody+ context.MapParts = originalMapPartsreturn nil}@@ -264,13 +289,21 @@ func LoadContexts(ctx Ctx, params LoadContextsParams) (*shared.LoadContextResponreturn nil, nil, fmt.Errorf("error processing map files: %v", err)}- mapParts, err := createFileMapParts(mappedFiles)- if err != nil {- return nil, nil, fmt.Errorf("error creating map parts: %v", err)+ mapShas := make(map[string]string, len(context.MapInputs))+ mapTokens := make(map[string]int, len(context.MapInputs))+ for path, input := range context.MapInputs {+ hash := sha256.Sum256([]byte(input))+ mapShas[path] = hex.EncodeToString(hash[:])+ mapBody := mappedFiles[path]+ mapTokens[path], err = shared.GetNumTokens(mapBody)+ if err != nil {+ return nil, nil, fmt.Errorf("error getting num tokens for %s: %v", path, err)+ }}- combinedBody, combinedSha := combineMapParts(mapParts)- numTokens, err := shared.GetNumTokens(combinedBody)+ combinedBody := mappedFiles.CombinedMap()++ numTokens, err = shared.GetNumTokens(combinedBody)if err != nil {return nil, nil, fmt.Errorf("error getting num tokens: %v", err)}@@ -285,9 +318,10 @@ func LoadContexts(ctx Ctx, params LoadContextsParams) (*shared.LoadContextResponUrl: context.Url,FilePath: context.FilePath,NumTokens: numTokens,- Sha: combinedSha,Body: combinedBody,- MapParts: mapParts,+ MapParts: mappedFiles,+ MapShas: mapShas,+ MapTokens: mapTokens,}mapContextsByFilePath[context.FilePath] = newContext@@ -460,6 +494,8 @@ func UpdateContexts(params UpdateContextsParams) (*shared.UpdateContextResponse,return nil, fmt.Errorf("total context body size exceeds limit (size %.2f MB, limit %d MB)", float64(totalBodySize)/1024/1024, int(shared.MaxContextBodySize)/1024/1024)}+ //test+var updatedContexts []*shared.ContextnumFiles := 0@@ -478,12 +514,14 @@ func UpdateContexts(params UpdateContextsParams) (*shared.UpdateContextResponse,context = contextsById[id]} else {var err error- context, err = GetContext(orgId, planId, id, true)+ context, err = GetContext(orgId, planId, id, true, true)if err != nil {errCh <- fmt.Errorf("error getting context: %v", err)return}++ // log.Println("Got context", context.Id, "numTokens", context.NumTokens)}mu.Lock()@@ -492,26 +530,31 @@ func UpdateContexts(params UpdateContextsParams) (*shared.UpdateContextResponse,contextsById[id] = contextupdatedContexts = append(updatedContexts, context.ToApi())- var updateNumTokens int- var err error+ if context.ContextType != shared.ContextMapType {+ var updateNumTokens int+ var err error- if context.ContextType == shared.ContextImageType {- updateNumTokens, err = shared.GetImageTokens(params.Body, context.ImageDetail)- } else {- updateNumTokens, err = shared.GetNumTokens(params.Body)- }+ if context.ContextType == shared.ContextImageType {+ updateNumTokens, err = shared.GetImageTokens(params.Body, context.ImageDetail)+ } else {+ updateNumTokens, err = shared.GetNumTokens(params.Body)- if err != nil {- errCh <- fmt.Errorf("error getting num tokens: %v", err)- return- }+ // log.Println("len(params.Body)", len(params.Body))+ }- tokenDiff := updateNumTokens - context.NumTokens- tokenDiffsById[id] = tokenDiff- tokensDiff += tokenDiff- totalTokens += tokenDiff+ // log.Println("Updating context", id, "updateNumTokens", updateNumTokens)- context.NumTokens = updateNumTokens+ if err != nil {+ errCh <- fmt.Errorf("error getting num tokens: %v", err)+ return+ }++ tokenDiff := updateNumTokens - context.NumTokens+ tokenDiffsById[id] = tokenDiff+ tokensDiff += tokenDiff+ totalTokens += tokenDiff+ context.NumTokens = updateNumTokens+ }switch context.ContextType {case shared.ContextFileType:@@ -574,14 +617,57 @@ func UpdateContexts(params UpdateContextsParams) (*shared.UpdateContextResponse,for id, params := range *req {go func(id string, params *shared.UpdateContextParams) {-context := contextsById[id]- hash := sha256.Sum256([]byte(params.Body))- sha := hex.EncodeToString(hash[:])+ if context.ContextType == shared.ContextMapType {+ oldNumTokens := context.NumTokens++ // log.Println("Updating map context", id, "oldNumTokens", oldNumTokens)++ for path, part := range params.MapBodies {+ context.MapParts[path] = part+ context.MapShas[path] = params.InputShas[path]++ numTokens, err := shared.GetNumTokens(part)+ if err != nil {+ errCh <- fmt.Errorf("error getting num tokens for %s: %v", path, err)+ return+ }+ context.MapTokens[path] = numTokens+ }++ for _, path := range params.RemovedMapPaths {+ delete(context.MapParts, path)+ delete(context.MapShas, path)+ delete(context.MapTokens, path)+ }++ context.Body = context.MapParts.CombinedMap()+ newNumTokens, err := shared.GetNumTokens(context.Body)+ if err != nil {+ errCh <- fmt.Errorf("error getting num tokens for %s: %v", context.Id, err)+ return+ }++ // log.Println("Updated map context", id, "newNumTokens", newNumTokens)++ tokenDiff := newNumTokens - oldNumTokens++ // log.Println("Updated map context", id, "tokenDiff", tokenDiff)- context.Body = params.Body- context.Sha = sha+ tokenDiffsById[id] = tokenDiff+ tokensDiff += tokenDiff++ // log.Println("Updated map context", id, "tokensDiff", tokensDiff)++ totalTokens += tokenDiff++ // log.Println("Updated map context", id, "totalTokens", totalTokens)++ context.NumTokens = newNumTokens+ } else {+ context.Body = params.Body+ }err := StoreContext(context)@@ -692,89 +778,32 @@ func invalidateConflictedResults(orgId, planId string, filesToUpdate map[string]return nil}-type fileMapResult struct {- path string- body string- err error-}-// processMapFiles handles concurrent processing of multiple files for mapping-func processMapFiles(ctx Ctx, inputs map[string]string) (map[string]fileMapResult, error) {- results := make(chan fileMapResult, len(inputs))+func processMapFiles(ctx Ctx, inputs map[string]string) (shared.FileMapBodies, error) {+ bodies := make(shared.FileMapBodies, len(inputs))+ var mu sync.Mutex+ errCh := make(chan error, len(inputs))for path, content := range inputs {go func(path, content string) {fileMap, err := syntax.MapFile(ctx, path, []byte(content))if err != nil {- results <- fileMapResult{path: path, err: err}+ errCh <- fmt.Errorf("error mapping file %s: %v", path, err)return}- results <- fileMapResult{- path: path,- body: fileMap.String(),- }+ mu.Lock()+ defer mu.Unlock()+ bodies[path] = fileMap.String()+ errCh <- nil}(path, content)}- // Collect results- mapResults := make(map[string]fileMapResult)for i := 0; i < len(inputs); i++ {- result := <-results- if result.err != nil {- return nil, fmt.Errorf("error mapping file %s: %v", result.path, result.err)- }- mapResults[result.path] = result- }-- return mapResults, nil-}--// createFileMapParts converts mapped files into FileMapParts with tokens and hashes-func createFileMapParts(mappedFiles map[string]fileMapResult) (shared.FileMapParts, error) {- mapParts := make(shared.FileMapParts)-- for path, result := range mappedFiles {- hash := sha256.Sum256([]byte(result.body))- sha := hex.EncodeToString(hash[:])-- tokens, err := shared.GetNumTokens(result.body)+ err := <-errChif err != nil {- return nil, fmt.Errorf("error getting num tokens for %s: %v", path, err)+ return nil, err}-- mapParts[path] = shared.FileMapPart{- Body: result.body,- Sha: sha,- NumTokens: tokens,- }- }-- return mapParts, nil-}--// combineMapParts creates a combined body and hash from FileMapParts-func combineMapParts(mapParts shared.FileMapParts) (combinedBody string, combinedSha string) {- var combinedMap strings.Builder- var combinedHashes bytes.Buffer-- // Sort paths for consistent ordering- paths := make([]string, 0, len(mapParts))- for path := range mapParts {- paths = append(paths, path)- }- sort.Strings(paths)-- for _, path := range paths {- part := mapParts[path]- fileHeading := fmt.Sprintf("### %s\n", path)- combinedMap.WriteString(fileHeading)- combinedMap.WriteString(part.Body)- combinedMap.WriteString("\n")-- hash := sha256.Sum256([]byte(part.Body))- combinedHashes.Write(hash[:])}- combinedHash := sha256.Sum256(combinedHashes.Bytes())- return combinedMap.String(), hex.EncodeToString(combinedHash[:])+ return bodies, nil}diff --git a/app/server/db/data_models.go b/app/server/db/data_models.goindex 60987934..abb0573b 100644--- a/app/server/db/data_models.go+++ b/app/server/db/data_models.go@@ -390,7 +390,9 @@ type Context struct {BodySize int64 `json:"bodySize,omitempty"`ForceSkipIgnore bool `json:"forceSkipIgnore"`ImageDetail openai.ImageURLDetail `json:"imageDetail,omitempty"`- MapParts shared.FileMapParts `json:"mapParts,omitempty"`+ MapParts shared.FileMapBodies `json:"mapParts,omitempty"`+ MapShas map[string]string `json:"mapShas,omitempty"`+ MapTokens map[string]int `json:"mapTokens,omitempty"`CreatedAt time.Time `json:"createdAt"`UpdatedAt time.Time `json:"updatedAt"`}@@ -410,6 +412,8 @@ func (context *Context) ToApi() *shared.Context {ForceSkipIgnore: context.ForceSkipIgnore,ImageDetail: context.ImageDetail,MapParts: context.MapParts,+ MapShas: context.MapShas,+ MapTokens: context.MapTokens,CreatedAt: context.CreatedAt,UpdatedAt: context.UpdatedAt,}diff --git a/app/server/db/plan_helpers.go b/app/server/db/plan_helpers.goindex 12e0863f..bf955699 100644--- a/app/server/db/plan_helpers.go+++ b/app/server/db/plan_helpers.go@@ -158,7 +158,7 @@ func SyncPlanTokens(orgId, planId, branch string) error {go func() {var err error- contexts, err = GetPlanContexts(orgId, planId, false)+ contexts, err = GetPlanContexts(orgId, planId, false, false)errCh <- err}()diff --git a/app/server/db/result_helpers.go b/app/server/db/result_helpers.goindex 6e9c1154..99ca061d 100644--- a/app/server/db/result_helpers.go+++ b/app/server/db/result_helpers.go@@ -1,6 +1,7 @@package dbimport (+ "context""encoding/json""fmt""log"@@ -105,7 +106,7 @@ func GetCurrentPlanState(params CurrentPlanStateParams) (*shared.CurrentPlanStatgo func() {var contexts []*Contextif params.Contexts == nil {- res, err := GetPlanContexts(orgId, planId, true)+ res, err := GetPlanContexts(orgId, planId, true, false)if err != nil {errCh <- fmt.Errorf("error getting contexts: %v", err)return@@ -357,7 +358,7 @@ func GetPlanResult(planFileResults []*shared.PlanFileResult) *shared.PlanResult}}-func ApplyPlan(orgId, userId, branchName string, plan *Plan) (*shared.CurrentPlanState, error) {+func ApplyPlan(ctx context.Context, orgId, userId, branchName string, plan *Plan) (*shared.CurrentPlanState, error) {planId := plan.IdresultsDir := getPlanResultsDir(orgId, planId)@@ -390,7 +391,7 @@ func ApplyPlan(orgId, userId, branchName string, plan *Plan) (*shared.CurrentPla}()go func() {- res, err := GetPlanContexts(orgId, planId, false)+ res, err := GetPlanContexts(orgId, planId, false, false)if err != nil {errCh <- fmt.Errorf("error getting contexts: %v", err)return@@ -505,6 +506,7 @@ func ApplyPlan(orgId, userId, branchName string, plan *Plan) (*shared.CurrentPla}res, _, err := LoadContexts(+ ctx,LoadContextsParams{OrgId: orgId,UserId: userId,diff --git a/app/server/handlers/file_maps.go b/app/server/handlers/file_maps.goindex 3aa7c6f8..1eb6e934 100644--- a/app/server/handlers/file_maps.go+++ b/app/server/handlers/file_maps.go@@ -3,6 +3,7 @@ package handlersimport ("encoding/json""fmt"+ "log""net/http""plandex-server/syntax"@@ -17,17 +18,18 @@ func GetFileMapHandler(w http.ResponseWriter, r *http.Request) {}maps := make(shared.FileMapBodies)- for filepath, content := range req.Files {- fileMap, err := syntax.MapFile(r.Context(), filepath, []byte(content))+ for path, input := range req.MapInputs {+ fileMap, err := syntax.MapFile(r.Context(), path, []byte(input))if err != nil {// Skip files that can't be parsed, just log the error+ log.Printf("Error mapping file %s: %v", path, err)continue}- maps[filepath] = fileMap.String()+ maps[path] = fileMap.String()}resp := shared.GetFileMapResponse{- Maps: maps,+ MapBodies: maps,}respBytes, err := json.Marshal(resp)diff --git a/app/server/handlers/plans_changes.go b/app/server/handlers/plans_changes.goindex ce04869f..1c230e8f 100644--- a/app/server/handlers/plans_changes.go+++ b/app/server/handlers/plans_changes.go@@ -104,7 +104,7 @@ func ApplyPlanHandler(w http.ResponseWriter, r *http.Request) {return}- ctx, cancel := context.WithCancel(context.Background())+ ctx, cancel := context.WithCancel(r.Context())unlockFn := LockRepo(w, r, auth, db.LockScopeWrite, ctx, cancel, true)if unlockFn == nil {return@@ -121,7 +121,7 @@ func ApplyPlanHandler(w http.ResponseWriter, r *http.Request) {return}- currentPlan, err := db.ApplyPlan(auth.OrgId, auth.User.Id, branch, plan)+ currentPlan, err := db.ApplyPlan(ctx, auth.OrgId, auth.User.Id, branch, plan)if err != nil {log.Printf("Error applying plan: %v\n", err)diff --git a/app/server/handlers/plans_context.go b/app/server/handlers/plans_context.goindex 11868457..aa1cedfd 100644--- a/app/server/handlers/plans_context.go+++ b/app/server/handlers/plans_context.go@@ -39,7 +39,7 @@ func ListContextHandler(w http.ResponseWriter, r *http.Request) {}()}- dbContexts, err := db.GetPlanContexts(auth.OrgId, planId, false)+ dbContexts, err := db.GetPlanContexts(auth.OrgId, planId, false, false)if err != nil {log.Printf("Error getting contexts: %v\n", err)@@ -262,7 +262,7 @@ func DeleteContextHandler(w http.ResponseWriter, r *http.Request) {}()}- dbContexts, err := db.GetPlanContexts(auth.OrgId, planId, false)+ dbContexts, err := db.GetPlanContexts(auth.OrgId, planId, false, false)if err != nil {log.Printf("Error getting contexts: %v\n", err)diff --git a/app/server/model/lib/context.go b/app/server/model/lib/context.goindex eaea39f9..3427a917 100644--- a/app/server/model/lib/context.go+++ b/app/server/model/lib/context.go@@ -22,6 +22,9 @@ func FormatModelContext(context []*db.Context) (string, int, error) {} else if part.ContextType == shared.ContextFileType {fmtStr = "\n\n- %s:\n\n```\n%s\n```"args = append(args, part.FilePath, part.Body)+ } else if part.ContextType == shared.ContextMapType {+ fmtStr = "\n\n- %s | map:\n\n```\n%s\n```"+ args = append(args, part.FilePath, part.Body)} else if part.Url != "" {fmtStr = "\n\n- %s:\n\n```\n%s\n```"args = append(args, part.Url, part.Body)diff --git a/app/server/model/plan/build_load.go b/app/server/model/plan/build_load.goindex 75ca8ab3..1a08ba53 100644--- a/app/server/model/plan/build_load.go+++ b/app/server/model/plan/build_load.go@@ -54,7 +54,7 @@ func (state *activeBuildStreamState) loadPendingBuilds() (map[string][]*types.AcerrCh := make(chan error)go func() {- res, err := db.GetPlanContexts(auth.OrgId, plan.Id, true)+ res, err := db.GetPlanContexts(auth.OrgId, plan.Id, true, false)if err != nil {log.Printf("Error getting plan modelContext: %v\n", err)errCh <- fmt.Errorf("error getting plan modelContext: %v", err)diff --git a/app/server/model/plan/tell_load.go b/app/server/model/plan/tell_load.goindex 0415650d..8eff7351 100644--- a/app/server/model/plan/tell_load.go+++ b/app/server/model/plan/tell_load.go@@ -140,7 +140,7 @@ func (state *activeTellStreamState) loadTellPlan() error {if iteration > 0 || missingFileResponse != "" {modelContext = active.Contexts} else {- res, err := db.GetPlanContexts(currentOrgId, planId, true)+ res, err := db.GetPlanContexts(currentOrgId, planId, true, false)if err != nil {log.Printf("Error getting plan modelContext: %v\n", err)errCh <- fmt.Errorf("error getting plan modelContext: %v", err)diff --git a/app/shared/data_models.go b/app/shared/data_models.goindex 4800199d..b0ca5b0f 100644--- a/app/shared/data_models.go+++ b/app/shared/data_models.go@@ -92,13 +92,7 @@ const (ContextMapType ContextType = "map")-type FileMapPart struct {- Sha string `json:"sha"`- Body string `json:"body"`- NumTokens int `json:"numTokens"`-}--type FileMapParts map[string]FileMapPart+type FileMapBodies map[string]stringtype Context struct {Id string `json:"id"`@@ -113,7 +107,9 @@ type Context struct {BodySize int64 `json:"bodySize,omitempty"`ForceSkipIgnore bool `json:"forceSkipIgnore"`ImageDetail openai.ImageURLDetail `json:"imageDetail,omitempty"`- MapParts FileMapParts `json:"mapParts,omitempty"`+ MapParts FileMapBodies `json:"mapParts,omitempty"`+ MapShas map[string]string `json:"mapShas,omitempty"`+ MapTokens map[string]int `json:"mapTokens,omitempty"`CreatedAt time.Time `json:"createdAt"`UpdatedAt time.Time `json:"updatedAt"`}diff --git a/app/shared/file_maps.go b/app/shared/file_maps.goindex 33cf9925..eb62f812 100644--- a/app/shared/file_maps.go+++ b/app/shared/file_maps.go@@ -1,42 +1,12 @@package sharedimport (- "bytes"- "crypto/sha256"- "encoding/hex""fmt""sort""strings")-func (m FileMapParts) CombinedMapAndSha() (string, string) {- // Combine map parts into single body- var combinedMap strings.Builder- var combinedHashes bytes.Buffer- paths := make([]string, 0, len(m))- for path := range m {- paths = append(paths, path)- }- sort.Strings(paths)-- for _, path := range paths {- part := m[path]- fileHeading := fmt.Sprintf("### %s\n", path)- combinedMap.WriteString(fileHeading)- combinedMap.WriteString(part.Body)- combinedMap.WriteString("\n")-- hash := sha256.Sum256([]byte(part.Body))- combinedHashes.Write(hash[:])- }-- combinedHash := sha256.Sum256(combinedHashes.Bytes())- combinedSha := hex.EncodeToString(combinedHash[:])-- return combinedMap.String(), combinedSha-}--func (m FileMapParts) CombinedMap() string {+func (m FileMapBodies) CombinedMap() string {var combinedMap strings.Builderpaths := make([]string, 0, len(m))for path := range m {@@ -44,10 +14,10 @@ func (m FileMapParts) CombinedMap() string {}sort.Strings(paths)for _, path := range paths {- part := m[path]+ body := m[path]fileHeading := fmt.Sprintf("### %s\n", path)combinedMap.WriteString(fileHeading)- combinedMap.WriteString(part.Body)+ combinedMap.WriteString(body)combinedMap.WriteString("\n")}return combinedMap.String()diff --git a/app/shared/req_res.go b/app/shared/req_res.goindex e441b914..1e0d978f 100644--- a/app/shared/req_res.go+++ b/app/shared/req_res.go@@ -157,7 +157,6 @@ type RespondMissingFileRequest struct {}type FileMapInputs map[string]string-type FileMapBodies map[string]stringtype LoadContextParams struct {ContextType ContextType `json:"contextType"`@@ -188,8 +187,8 @@ type LoadContextResponse struct {type UpdateContextParams struct {Body string `json:"body"`- MapBodies FileMapBodies `json:"mapBodies"`InputShas map[string]string `json:"inputShas"`+ MapBodies FileMapBodies `json:"mapBodies"`RemovedMapPaths []string `json:"removedMapPaths"`}