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
WIP: context file maps
Dane Schneiderd8613be6bf47
diff --git a/app/cli/api/methods.go b/app/cli/api/methods.goindex 31324819..7917aaeb 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 := GetApiHost() + "/projects"+ serverUrl := GetAuthenticatedApiHost() + "/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 := GetApiHost() + "/projects"+ serverUrl := GetAuthenticatedApiHost() + "/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", GetApiHost(), projectId)+ serverUrl := fmt.Sprintf("%s/projects/%s/set_plan", GetAuthenticatedApiHost(), 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", GetApiHost(), projectId)+ serverUrl := fmt.Sprintf("%s/projects/%s/rename", GetAuthenticatedApiHost(), 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?", GetApiHost())+ serverUrl := fmt.Sprintf("%s/plans?", GetAuthenticatedApiHost())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?", GetApiHost())+ serverUrl := fmt.Sprintf("%s/plans/archive?", GetAuthenticatedApiHost())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?", GetApiHost())+ serverUrl := fmt.Sprintf("%s/plans/ps?", GetAuthenticatedApiHost())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", GetApiHost(), projectId)+ serverUrl := fmt.Sprintf("%s/projects/%s/plans/current_branches", GetAuthenticatedApiHost(), 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", GetApiHost(), projectId)+ serverUrl := fmt.Sprintf("%s/projects/%s/plans", GetAuthenticatedApiHost(), 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", GetApiHost(), planId)+ serverUrl := fmt.Sprintf("%s/plans/%s", GetAuthenticatedApiHost(), 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", GetApiHost(), planId)+ serverUrl := fmt.Sprintf("%s/plans/%s", GetAuthenticatedApiHost(), 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", GetApiHost(), projectId)+ serverUrl := fmt.Sprintf("%s/projects/%s/plans", GetAuthenticatedApiHost(), 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", GetApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/tell", GetAuthenticatedApiHost(), 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", GetApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/build", GetAuthenticatedApiHost(), 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", GetApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/respond_missing_file", GetAuthenticatedApiHost(), 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", GetApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/connect", GetAuthenticatedApiHost(), 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", GetApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/stop", GetAuthenticatedApiHost(), 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", GetApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/current_plan", GetAuthenticatedApiHost(), 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", GetApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/apply", GetAuthenticatedApiHost(), 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", GetApiHost(), planId)+ serverUrl := fmt.Sprintf("%s/plans/%s/archive", GetAuthenticatedApiHost(), 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", GetApiHost(), planId)+ serverUrl := fmt.Sprintf("%s/plans/%s/unarchive", GetAuthenticatedApiHost(), 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", GetApiHost(), planId)+ serverUrl := fmt.Sprintf("%s/plans/%s/rename", GetAuthenticatedApiHost(), 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", GetApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/reject_all", GetAuthenticatedApiHost(), 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", GetApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/reject_file", GetAuthenticatedApiHost(), 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", GetApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/reject_files", GetAuthenticatedApiHost(), 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", GetApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/context", GetAuthenticatedApiHost(), 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", GetApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/context", GetAuthenticatedApiHost(), 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", GetApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/context", GetAuthenticatedApiHost(), 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", GetApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/context", GetAuthenticatedApiHost(), 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", GetApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/convo", GetAuthenticatedApiHost(), 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", GetApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/status", GetAuthenticatedApiHost(), 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", GetApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/diffs", GetAuthenticatedApiHost(), 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", GetApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/logs", GetAuthenticatedApiHost(), 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", GetApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/rewind", GetAuthenticatedApiHost(), 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 := GetApiHost() + "/orgs"+ serverUrl := GetAuthenticatedApiHost() + "/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 := GetApiHost() + "/orgs/session"+ serverUrl := GetAuthenticatedApiHost() + "/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 := GetApiHost() + "/orgs"+ serverUrl := GetAuthenticatedApiHost() + "/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", GetApiHost(), userId)+ serverUrl := fmt.Sprintf("%s/orgs/users/%s", GetAuthenticatedApiHost(), 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 := GetApiHost() + "/orgs/roles"+ serverUrl := GetAuthenticatedApiHost() + "/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 := GetApiHost() + "/invites"+ serverUrl := GetAuthenticatedApiHost() + "/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 := GetApiHost() + "/invites/pending"+ serverUrl := GetAuthenticatedApiHost() + "/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 := GetApiHost() + "/invites/accepted"+ serverUrl := GetAuthenticatedApiHost() + "/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 := GetApiHost() + "/invites/all"+ serverUrl := GetAuthenticatedApiHost() + "/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", GetApiHost(), inviteId)+ serverUrl := fmt.Sprintf("%s/invites/%s", GetAuthenticatedApiHost(), 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 := GetApiHost() + "/accounts/sign_in_codes"+ serverUrl := GetAuthenticatedApiHost() + "/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 := GetApiHost() + "/accounts/sign_out"+ serverUrl := GetAuthenticatedApiHost() + "/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 := GetApiHost() + "/users"+ serverUrl := GetAuthenticatedApiHost() + "/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", GetApiHost(), planId)+ serverUrl := fmt.Sprintf("%s/plans/%s/branches", GetAuthenticatedApiHost(), 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", GetApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/branches", GetAuthenticatedApiHost(), 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", GetApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/branches/%s", GetAuthenticatedApiHost(), 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", GetApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/settings", GetAuthenticatedApiHost(), 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", GetApiHost(), planId, branch)+ serverUrl := fmt.Sprintf("%s/plans/%s/%s/settings", GetAuthenticatedApiHost(), 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", GetApiHost())+ serverUrl := fmt.Sprintf("%s/default_settings", GetAuthenticatedApiHost())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", GetApiHost())+ serverUrl := fmt.Sprintf("%s/default_settings", GetAuthenticatedApiHost())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", GetApiHost())+ serverUrl := fmt.Sprintf("%s/custom_models", GetAuthenticatedApiHost())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", GetApiHost())+ serverUrl := fmt.Sprintf("%s/custom_models", GetAuthenticatedApiHost())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", GetApiHost(), modelId)+ serverUrl := fmt.Sprintf("%s/custom_models/%s", GetAuthenticatedApiHost(), 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", GetApiHost())+ serverUrl := fmt.Sprintf("%s/model_sets", GetAuthenticatedApiHost())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", GetApiHost())+ serverUrl := fmt.Sprintf("%s/model_sets", GetAuthenticatedApiHost())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", GetApiHost(), setId)+ serverUrl := fmt.Sprintf("%s/model_sets/%s", GetAuthenticatedApiHost(), 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", GetApiHost(), pageSize, pageNum)+ serverUrl := fmt.Sprintf("%s/billing/credits_transactions?size=%d&page=%d", GetAuthenticatedApiHost(), pageSize, pageNum)resp, err := authenticatedFastClient.Get(serverUrl)if err != nil {@@ -2085,3 +2085,35 @@ func (a *Api) GetCreditsTransactions(pageSize, pageNum int) (*shared.CreditsLogRreturn res, nil}++func (a *Api) GetFileMap(req shared.GetFileMapRequest) (*shared.GetFileMapResponse, *shared.ApiError) {+ serverUrl := fmt.Sprintf("%s/file_map", GetAuthenticatedApiHost())+ reqBytes, err := json.Marshal(req)+ if err != nil {+ return nil, &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error marshalling request: %v", err)}+ }++ resp, err := authenticatedFastClient.Post(serverUrl, "application/json", bytes.NewBuffer(reqBytes))+ if err != nil {+ return nil, &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error sending request: %v", err)}+ }+ defer resp.Body.Close()++ if resp.StatusCode >= 400 {+ errorBody, _ := io.ReadAll(resp.Body)+ apiErr := HandleApiError(resp, errorBody)+ tokenRefreshed, apiErr := refreshTokenIfNeeded(apiErr)+ if tokenRefreshed {+ return a.GetFileMap(req)+ }+ return nil, apiErr+ }++ var respBody shared.GetFileMapResponse+ err = json.NewDecoder(resp.Body).Decode(&respBody)+ if err != nil {+ return nil, &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error decoding response: %v", err)}+ }++ return &respBody, nil+}diff --git a/app/cli/cmd/load.go b/app/cli/cmd/load.goindex 2325ed98..6ae65116 100644--- a/app/cli/cmd/load.go+++ b/app/cli/cmd/load.go@@ -34,7 +34,7 @@ func init() {contextLoadCmd.Flags().BoolVar(&namesOnly, "tree", false, "Load directory tree with file names only")contextLoadCmd.Flags().BoolVarP(&forceSkipIgnore, "force", "f", false, "Load files even when ignored by .gitignore or .plandexignore")contextLoadCmd.Flags().StringVarP(&imageDetail, "detail", "d", "high", "Image detail level (high or low)")- contextLoadCmd.Flags().BoolVar(&defsOnly, "defs", false, "Load definitions only (function/method/class signatures, variable names, types, etc.)")+ contextLoadCmd.Flags().BoolVar(&defsOnly, "map", false, "Load file maps (function/method/class signatures, variable names, types, etc.)")RootCmd.AddCommand(contextLoadCmd)}diff --git a/app/cli/lib/context_display.go b/app/cli/lib/context_display.goindex 0f588eac..6b9e0e5a 100644--- a/app/cli/lib/context_display.go+++ b/app/cli/lib/context_display.go@@ -24,6 +24,9 @@ func GetContextLabelAndIcon(contextType shared.ContextType) (string, string) {case shared.ContextImageType:icon = "🖼️ "lbl = "image"+ case shared.ContextMapType:+ icon = "🗺️ "+ lbl = "map"}return lbl, icondiff --git a/app/cli/lib/context_load.go b/app/cli/lib/context_load.goindex 0bc4c47b..ddbd51ee 100644--- a/app/cli/lib/context_load.go+++ b/app/cli/lib/context_load.go@@ -6,6 +6,7 @@ import ("fmt""io""os"+ "path/filepath""plandex/api""plandex/auth""plandex/fs"@@ -110,7 +111,7 @@ func MustLoadContext(resources []string, params *types.LoadContextParams) {existsByComposite := make(map[string]*shared.Context)for _, context := range existingContexts {switch context.ContextType {- case shared.ContextFileType, shared.ContextDirectoryTreeType:+ case shared.ContextFileType, shared.ContextDirectoryTreeType, shared.ContextMapType:existsByComposite[strings.Join([]string{string(context.ContextType), context.FilePath}, "|")] = contextcase shared.ContextURLType:existsByComposite[strings.Join([]string{string(context.ContextType), context.Url}, "|")] = context@@ -118,6 +119,23 @@ func MustLoadContext(resources []string, params *types.LoadContextParams) {}if len(inputFilePaths) > 0 {+ mapInputsByPath := map[string]shared.FileMapInputs{}+ toLoadMapPaths := []string{}+ var mapSize int64++ if params.DefsOnly {+ for _, inputFilePath := range inputFilePaths {+ composite := strings.Join([]string{string(shared.ContextMapType), inputFilePath}, "|")+ if existsByComposite[composite] != nil {+ alreadyLoadedByComposite[composite] = existsByComposite[composite]+ continue+ }++ mapInputsByPath[inputFilePath] = shared.FileMapInputs{}+ toLoadMapPaths = append(toLoadMapPaths, inputFilePath)+ }+ }+baseDir := fs.GetBaseDirForFilePaths(inputFilePaths)paths, err := fs.GetProjectPaths(baseDir)@@ -204,7 +222,6 @@ func MustLoadContext(resources []string, params *types.LoadContextParams) {Body: body,FilePath: inputFilePath,ForceSkipIgnore: params.ForceSkipIgnore,- DefsOnly: params.DefsOnly,})errCh <- nil@@ -239,19 +256,48 @@ func MustLoadContext(resources []string, params *types.LoadContextParams) {inputFilePaths = flattenedPathsfor _, path := range flattenedPaths {+ var mapInputPath string+ if params.DefsOnly {+ for _, inputPath := range toLoadMapPaths {+ if strings.HasPrefix(path, inputPath) {+ mapInputPath = inputPath+ break+ }+ }++ if mapInputPath == "" {+ continue // not a child of any input path+ }++ ext := filepath.Ext(path)+ if !shared.IsTreeSitterExtension(ext) {+ // not a tree-sitter supported extension+ continue+ }++ if _, ok := mapInputsByPath[mapInputPath]; !ok {+ mapInputsByPath[mapInputPath] = shared.FileMapInputs{}+ }++ }+var contextType shared.ContextTypeisImage := shared.IsImageFile(path)if isImage {contextType = shared.ContextImageType+ } else if params.DefsOnly {+ contextType = shared.ContextMapType} else {contextType = shared.ContextFileType}- composite := strings.Join([]string{string(contextType), path}, "|")+ if !params.DefsOnly {+ composite := strings.Join([]string{string(contextType), path}, "|")- if existsByComposite[composite] != nil {- alreadyLoadedByComposite[composite] = existsByComposite[composite]- continue+ if existsByComposite[composite] != nil {+ alreadyLoadedByComposite[composite] = existsByComposite[composite]+ continue+ }}numRoutines++@@ -263,7 +309,9 @@ func MustLoadContext(resources []string, params *types.LoadContextParams) {return}- if fileInfo.Size() > shared.MaxContextBodySize {+ size := fileInfo.Size()++ if size > shared.MaxContextBodySize {errCh <- fmt.Errorf("file %s exceeds size limit (size %.2f MB, limit %d MB)", path, float64(fileInfo.Size())/1024/1024, int(shared.MaxContextBodySize)/1024/1024)return}@@ -277,8 +325,20 @@ func MustLoadContext(resources []string, params *types.LoadContextParams) {contextMu.Lock()defer contextMu.Unlock()- if isImage {+ if params.DefsOnly {+ if mapSize+size > shared.MaxContextMapInputSize {+ errCh <- fmt.Errorf("map size limit exceeded (size %.2f MB, limit %d MB)", float64(mapSize+size)/1024/1024, int(shared.MaxContextBodySize)/1024/1024)+ return+ }++ if len(mapInputsByPath[mapInputPath])+1 > shared.MaxContextMapPaths {+ errCh <- fmt.Errorf("map paths limit exceeded (found %d, limit %d)", len(mapInputsByPath[mapInputPath])+1, shared.MaxContextMapPaths)+ return+ }+ mapInputsByPath[mapInputPath][path] = string(fileContent)+ mapSize += size+ } else if isImage {loadContextReq = append(loadContextReq, &shared.LoadContextParams{ContextType: shared.ContextImageType,Name: path,@@ -298,6 +358,16 @@ func MustLoadContext(resources []string, params *types.LoadContextParams) {errCh <- nil}(path)}++ if params.DefsOnly {+ for _, inputPath := range toLoadMapPaths {+ loadContextReq = append(loadContextReq, &shared.LoadContextParams{+ ContextType: shared.ContextMapType,+ MapInputs: mapInputsByPath[inputPath],+ FilePath: inputPath,+ })+ }+ }}}diff --git a/app/cli/lib/context_update.go b/app/cli/lib/context_update.goindex eda558f4..f7eb3ef2 100644--- a/app/cli/lib/context_update.go+++ b/app/cli/lib/context_update.go@@ -6,6 +6,7 @@ import ("fmt""log""os"+ "path/filepath""plandex/api""plandex/fs""plandex/term"@@ -65,6 +66,14 @@ func CheckOutdatedContextWithOutput(quiet, autoConfirm bool, maybeContexts []*shlbl = strconv.Itoa(outdatedRes.NumTrees) + " " + lbltypes = append(types, lbl)}+ if outdatedRes.NumMaps > 0 {+ lbl := "map"+ if outdatedRes.NumMaps > 1 {+ lbl = "maps"+ }+ lbl = strconv.Itoa(outdatedRes.NumMaps) + " " + lbl+ types = append(types, lbl)+ }var msg stringif len(types) <= 2 {@@ -202,6 +211,7 @@ func checkOutdatedAndMaybeUpdateContext(doUpdate bool, maybeContexts []*shared.Cvar numFiles intvar numUrls intvar numTrees int+ var numMaps intvar numFilesRemoved intvar numTreesRemoved intvar mu sync.Mutex@@ -340,6 +350,118 @@ func checkOutdatedAndMaybeUpdateContext(doUpdate bool, maybeContexts []*shared.C}}(context)+ } else if context.ContextType == shared.ContextMapType {+ wg.Add(1)+ go func(context *shared.Context) {+ defer wg.Done()++ mu.Lock()+ defer mu.Unlock()++ var removedMapPaths []string++ // Check if any input files have changed+ var 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)+ }++ bytes, err := os.ReadFile(path)+ if err != nil {+ errs = append(errs, fmt.Errorf("failed to read map file %s: %v", path, err))+ return+ }++ hash := sha256.Sum256(bytes)+ sha := hex.EncodeToString(hash[:])++ if sha != part.Sha {+ content := string(bytes)+ updatedInputs[path] = content+ updatedInputShas[path] = sha+ }+ }++ // Check if new files were added+ flattenedPaths, err := ParseInputPaths([]string{context.FilePath}, &types.LoadContextParams{})+ if err != nil {+ errs = append(errs, fmt.Errorf("failed to get the directory tree %s: %v", context.FilePath, err))+ return+ }++ for _, path := range flattenedPaths {+ ext := filepath.Ext(path)+ if !shared.IsTreeSitterExtension(ext) {+ continue+ }++ if _, ok := context.MapParts[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] = content+ hash := sha256.Sum256(bytes)+ sha := hex.EncodeToString(hash[:])+ updatedInputShas[path] = sha+ }+ }++ // If any files changed, get new map+ if len(updatedInputs) > 0 || len(removedMapPaths) > 0 {+ updatedParts := make(shared.FileMapParts)+ for k, v := range context.MapParts {+ updatedParts[k] = v+ }+ var updatedMapBodies shared.FileMapBodies+ if len(updatedInputs) > 0 {+ mapRes, apiErr := api.Client.GetFileMap(shared.GetFileMapRequest{+ MapInputs: updatedInputs,+ })+ if apiErr != nil {+ errs = append(errs, fmt.Errorf("failed to get file map: %v", apiErr))+ return+ }+ updatedMapBodies = mapRes.MapBodies++ // Update map parts with new content+ for path, body := range mapRes.MapBodies {+ updatedParts[path] = shared.FileMapPart{+ Body: body,+ }+ }+ }++ if len(removedMapPaths) > 0 {+ for _, path := range removedMapPaths {+ delete(updatedParts, path)+ }+ }++ // 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,+ }+ }+ }(context)} else if context.ContextType == shared.ContextURLType {wg.Add(1)go func(context *shared.Context) {@@ -476,6 +598,7 @@ func checkOutdatedAndMaybeUpdateContext(doUpdate bool, maybeContexts []*shared.CNumFiles: numFiles,NumUrls: numUrls,NumTrees: numTrees,+ NumMaps: numMaps,NumFilesRemoved: numFilesRemoved,NumTreesRemoved: numTreesRemoved,}, nildiff --git a/app/cli/types/api.go b/app/cli/types/api.goindex dfd3906b..09816b55 100644--- a/app/cli/types/api.go+++ b/app/cli/types/api.go@@ -102,4 +102,5 @@ type ApiClient interface {DeleteModelPack(setId string) *shared.ApiErrorGetCreditsTransactions(pageSize, pageNum int) (*shared.CreditsLogResponse, *shared.ApiError)+ GetFileMap(req shared.GetFileMapRequest) (*shared.GetFileMapResponse, *shared.ApiError)}diff --git a/app/cli/types/types.go b/app/cli/types/types.goindex a779babe..700811dc 100644--- a/app/cli/types/types.go+++ b/app/cli/types/types.go@@ -22,6 +22,7 @@ type ContextOutdatedResult struct {NumFiles intNumUrls intNumTrees int+ NumMaps intNumFilesRemoved intNumTreesRemoved int}diff --git a/app/server/db/context_helpers.go b/app/server/db/context_helpers.goindex 9c2f8407..fd57cd2a 100644--- a/app/server/db/context_helpers.go+++ b/app/server/db/context_helpers.go@@ -1,12 +1,15 @@package dbimport (+ "bytes"+ "context""crypto/sha256""encoding/hex""encoding/json""fmt""os""path/filepath"+ "plandex-server/syntax""sort""strings""sync"@@ -16,6 +19,8 @@ import ("github.com/plandex/plandex/shared")+type Ctx context.Context+func GetPlanContexts(orgId, planId string, includeBody bool) ([]*Context, error) {var contexts []*ContextcontextDir := getPlanContextDir(orgId, planId)@@ -157,6 +162,18 @@ func StoreContext(context *Context) error {body := []byte(originalBody)context.Body = ""+ var mapPath string+ var mapBytes []byte+ if len(context.MapParts) > 0 {+ mapFilename := context.Id + ".map-parts"+ mapPath = filepath.Join(contextDir, mapFilename)+ mapBytes, err = json.MarshalIndent(context.MapParts, "", " ")+ if err != nil {+ return fmt.Errorf("failed to marshal map parts: %v", err)+ }+ context.MapParts = nil+ }+// Convert the ModelContextPart to JSONdata, err := json.MarshalIndent(context, "", " ")if err != nil {@@ -173,6 +190,12 @@ func StoreContext(context *Context) error {return fmt.Errorf("failed to write context meta to file %s: %v", metaPath, err)}+ if mapPath != "" {+ if err = os.WriteFile(mapPath, mapBytes, 0644); err != nil {+ return fmt.Errorf("failed to write context map to file %s: %v", mapPath, err)+ }+ }+context.Body = originalBodyreturn nil@@ -187,7 +210,7 @@ type LoadContextsParams struct {SkipConflictInvalidation bool}-func LoadContexts(params LoadContextsParams) (*shared.LoadContextResponse, []*Context, error) {+func LoadContexts(ctx Ctx, params LoadContextsParams) (*shared.LoadContextResponse, []*Context, error) {req := params.ReqorgId := params.OrgIdplan := params.Plan@@ -226,6 +249,7 @@ func LoadContexts(params LoadContextsParams) (*shared.LoadContextResponse, []*Co}maxTokens := settings.GetPlannerEffectiveMaxTokens()+ mapContextsByFilePath := make(map[string]Context)for _, context := range *req {tempId := uuid.New().String()@@ -233,7 +257,42 @@ func LoadContexts(params LoadContextsParams) (*shared.LoadContextResponse, []*Covar numTokens intvar err error- if context.ContextType == shared.ContextImageType {+ if context.ContextType == shared.ContextMapType && len(context.MapInputs) > 0 {+ // Process file maps+ mappedFiles, err := processMapFiles(ctx, context.MapInputs)+ if err != nil {+ return 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)+ }++ combinedBody, combinedSha := combineMapParts(mapParts)+ numTokens, err := shared.GetNumTokens(combinedBody)+ if err != nil {+ return nil, nil, fmt.Errorf("error getting num tokens: %v", err)+ }++ newContext := Context{+ // Id generated by db layer+ OrgId: orgId,+ OwnerId: userId,+ PlanId: planId,+ ContextType: shared.ContextMapType,+ Name: context.Name,+ Url: context.Url,+ FilePath: context.FilePath,+ NumTokens: numTokens,+ Sha: combinedSha,+ Body: combinedBody,+ MapParts: mapParts,+ }++ mapContextsByFilePath[context.FilePath] = newContext++ } else if context.ContextType == shared.ContextImageType {numTokens, err = shared.GetImageTokens(context.Body, context.ImageDetail)} else {numTokens, err = shared.GetNumTokens(context.Body)@@ -267,20 +326,25 @@ func LoadContexts(params LoadContextsParams) (*shared.LoadContextResponse, []*Cohash := sha256.Sum256([]byte(params.Body))sha := hex.EncodeToString(hash[:])- context := Context{- // Id generated by db layer- OrgId: orgId,- OwnerId: userId,- PlanId: planId,- ContextType: params.ContextType,- Name: params.Name,- Url: params.Url,- FilePath: params.FilePath,- NumTokens: numTokensByTempId[tempId],- Sha: sha,- Body: params.Body,- ForceSkipIgnore: params.ForceSkipIgnore,- ImageDetail: params.ImageDetail,+ var context Context+ if mapContext, ok := mapContextsByFilePath[params.FilePath]; ok {+ context = mapContext+ } else {+ context = Context{+ // Id generated by db layer+ OrgId: orgId,+ OwnerId: userId,+ PlanId: planId,+ ContextType: params.ContextType,+ Name: params.Name,+ Url: params.Url,+ FilePath: params.FilePath,+ NumTokens: numTokensByTempId[tempId],+ Sha: sha,+ Body: params.Body,+ ForceSkipIgnore: params.ForceSkipIgnore,+ ImageDetail: params.ImageDetail,+ }}err := StoreContext(&context)@@ -401,6 +465,7 @@ func UpdateContexts(params UpdateContextsParams) (*shared.UpdateContextResponse,numFiles := 0numUrls := 0numTrees := 0+ numMaps := 0var mu sync.MutexerrCh := make(chan error)@@ -455,6 +520,8 @@ func UpdateContexts(params UpdateContextsParams) (*shared.UpdateContextResponse,numUrls++case shared.ContextDirectoryTreeType:numTrees+++ case shared.ContextMapType:+ numMaps++}errCh <- nil@@ -476,6 +543,7 @@ func UpdateContexts(params UpdateContextsParams) (*shared.UpdateContextResponse,NumFiles: numFiles,NumUrls: numUrls,NumTrees: numTrees,+ NumMaps: numMaps,MaxTokens: maxTokens,}@@ -623,3 +691,90 @@ 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))++ 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}+ return+ }+ results <- fileMapResult{+ path: path,+ body: fileMap.String(),+ }+ }(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)+ if err != nil {+ return nil, fmt.Errorf("error getting num tokens for %s: %v", path, 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[:])+}diff --git a/app/server/db/data_models.go b/app/server/db/data_models.goindex d1f5f937..60987934 100644--- a/app/server/db/data_models.go+++ b/app/server/db/data_models.go@@ -387,8 +387,10 @@ type Context struct {Sha string `json:"sha"`NumTokens int `json:"numTokens"`Body string `json:"body,omitempty"`+ BodySize int64 `json:"bodySize,omitempty"`ForceSkipIgnore bool `json:"forceSkipIgnore"`ImageDetail openai.ImageURLDetail `json:"imageDetail,omitempty"`+ MapParts shared.FileMapParts `json:"mapParts,omitempty"`CreatedAt time.Time `json:"createdAt"`UpdatedAt time.Time `json:"updatedAt"`}@@ -404,7 +406,10 @@ func (context *Context) ToApi() *shared.Context {Sha: context.Sha,NumTokens: context.NumTokens,Body: context.Body,+ BodySize: context.BodySize,ForceSkipIgnore: context.ForceSkipIgnore,+ ImageDetail: context.ImageDetail,+ MapParts: context.MapParts,CreatedAt: context.CreatedAt,UpdatedAt: context.UpdatedAt,}diff --git a/app/server/handlers/context_helper.go b/app/server/handlers/context_helper.goindex 8c59aa43..03b45f98 100644--- a/app/server/handlers/context_helper.go+++ b/app/server/handlers/context_helper.go@@ -119,7 +119,7 @@ func loadContexts(w http.ResponseWriter, r *http.Request, auth *types.ServerAuth}}- 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 nil, nil@@ -129,7 +129,7 @@ func loadContexts(w http.ResponseWriter, r *http.Request, auth *types.ServerAuth}()}- res, dbContexts, err := db.LoadContexts(db.LoadContextsParams{+ res, dbContexts, err := db.LoadContexts(ctx, db.LoadContextsParams{OrgId: auth.OrgId,Plan: plan,BranchName: branchName,diff --git a/app/server/handlers/file_maps.go b/app/server/handlers/file_maps.gonew file mode 100644index 00000000..3aa7c6f8--- /dev/null+++ b/app/server/handlers/file_maps.go@@ -0,0 +1,41 @@+package handlers++import (+ "encoding/json"+ "fmt"+ "net/http"+ "plandex-server/syntax"++ "github.com/plandex/plandex/shared"+)++func GetFileMapHandler(w http.ResponseWriter, r *http.Request) {+ var req shared.GetFileMapRequest+ if err := json.NewDecoder(r.Body).Decode(&req); err != nil {+ http.Error(w, fmt.Sprintf("Error decoding request: %v", err), http.StatusBadRequest)+ return+ }++ maps := make(shared.FileMapBodies)+ for filepath, content := range req.Files {+ fileMap, err := syntax.MapFile(r.Context(), filepath, []byte(content))+ if err != nil {+ // Skip files that can't be parsed, just log the error+ continue+ }+ maps[filepath] = fileMap.String()+ }++ resp := shared.GetFileMapResponse{+ Maps: maps,+ }++ respBytes, err := json.Marshal(resp)+ if err != nil {+ http.Error(w, fmt.Sprintf("Error marshalling response: %v", err), http.StatusInternalServerError)+ return+ }++ w.Header().Set("Content-Type", "application/json")+ w.Write(respBytes)+}diff --git a/app/server/model/plan/build_state.go b/app/server/model/plan/build_state.goindex acd190d8..92832929 100644--- a/app/server/model/plan/build_state.go+++ b/app/server/model/plan/build_state.go@@ -36,7 +36,7 @@ type activeBuildStreamFileState struct {activeBuild *types.ActiveBuildpreBuildState stringparser *sitter.Parser- language string+ language shared.TreeSitterLanguagepreBuildStateSyntaxInvalid boolstructuredEditNumRetry intdiff --git a/app/server/routes/routes.go b/app/server/routes/routes.goindex 293ce0c2..1d1f032d 100644--- a/app/server/routes/routes.go+++ b/app/server/routes/routes.go@@ -141,4 +141,6 @@ func addApiRoutes(r *mux.Router, prefix string) {r.HandleFunc(prefix+"/default_settings", handlers.GetDefaultSettingsHandler).Methods("GET")r.HandleFunc(prefix+"/default_settings", handlers.UpdateDefaultSettingsHandler).Methods("PUT")++ r.HandleFunc(prefix+"/file_map", handlers.GetFileMapHandler).Methods("POST")}diff --git a/app/server/syntax/comments.go b/app/server/syntax/comments.goindex b6131c05..8dd816e2 100644--- a/app/server/syntax/comments.go+++ b/app/server/syntax/comments.go@@ -6,6 +6,7 @@ import ("path/filepath""sort"+ "github.com/plandex/plandex/shared"tree_sitter "github.com/smacker/go-tree-sitter")@@ -59,21 +60,21 @@ func findCommentNodes(node *tree_sitter.Node) []*tree_sitter.Node {return commentNodes}-func GetCommentSymbols(lang string) (string, string) {+func GetCommentSymbols(lang shared.TreeSitterLanguage) (string, string) {switch lang {- case "c", "cpp", "csharp", "java", "javascript", "go", "rust", "swift", "kotlin", "groovy", "scala", "typescript", "php":+ case shared.TreeSitterLanguageC, shared.TreeSitterLanguageCpp, shared.TreeSitterLanguageCsharp, shared.TreeSitterLanguageJava, shared.TreeSitterLanguageJavascript, shared.TreeSitterLanguageGo, shared.TreeSitterLanguageRust, shared.TreeSitterLanguageSwift, shared.TreeSitterLanguageKotlin, shared.TreeSitterLanguageGroovy, shared.TreeSitterLanguageScala, shared.TreeSitterLanguageTypescript, shared.TreeSitterLanguagePhp:return "//", ""- case "bash", "dockerfile", "elixir", "hcl", "python", "ruby", "toml", "yaml":+ case shared.TreeSitterLanguageBash, shared.TreeSitterLanguageDockerfile, shared.TreeSitterLanguageElixir, shared.TreeSitterLanguageHcl, shared.TreeSitterLanguagePython, shared.TreeSitterLanguageRuby, shared.TreeSitterLanguageToml, shared.TreeSitterLanguageYaml:return "#", ""- case "lua", "elm":+ case shared.TreeSitterLanguageLua, shared.TreeSitterLanguageElm:return "--", ""- case "css":+ case shared.TreeSitterLanguageCss:return "/*", "*/"- case "html":+ case shared.TreeSitterLanguageHtml:return "<!--", "-->"- case "ocaml":+ case shared.TreeSitterLanguageOCaml:return "(*", "*)"- case "svelte", "jsx", "tsx", "json":+ case shared.TreeSitterLanguageSvelte, shared.TreeSitterLanguageJsx, shared.TreeSitterLanguageTsx, shared.TreeSitterLanguageJson:return "", "" // comments are either not allowed or correct symbols depend on the context}diff --git a/app/server/syntax/file_map.go b/app/server/syntax/file_map.goindex b2424c50..da711d9a 100644--- a/app/server/syntax/file_map.go+++ b/app/server/syntax/file_map.go@@ -6,6 +6,7 @@ import ("path/filepath""strings"+ "github.com/plandex/plandex/shared"tree_sitter "github.com/smacker/go-tree-sitter")@@ -45,15 +46,15 @@ func MapFile(ctx context.Context, filename string, content []byte) (*FileMap, erreturn m, nil}-func mapNode(node *tree_sitter.Node, content []byte, lang string) []Definition {+func mapNode(node *tree_sitter.Node, content []byte, lang shared.TreeSitterLanguage) []Definition {switch lang {- case "dockerfile":+ case shared.TreeSitterLanguageDockerfile:return mapDockerfile(node, content)- case "yaml", "toml", "json", "cue", "hcl":+ case shared.TreeSitterLanguageYaml, shared.TreeSitterLanguageToml, shared.TreeSitterLanguageJson, shared.TreeSitterLanguageCue, shared.TreeSitterLanguageHcl:return mapConfig(node, content)- case "html", "svelte":+ case shared.TreeSitterLanguageHtml, shared.TreeSitterLanguageSvelte:return mapMarkup(node, content)- case "css":+ case shared.TreeSitterLanguageCss:return mapCSS(node, content)default:return mapTraditional(node, content)diff --git a/app/server/syntax/parsers.go b/app/server/syntax/parsers.goindex d6762350..2451523a 100644--- a/app/server/syntax/parsers.go+++ b/app/server/syntax/parsers.go@@ -32,17 +32,19 @@ import ("github.com/smacker/go-tree-sitter/typescript/tsx""github.com/smacker/go-tree-sitter/typescript/typescript""github.com/smacker/go-tree-sitter/yaml"++ "github.com/plandex/plandex/shared")-func GetParserForExt(ext string) (*tree_sitter.Parser, string, *tree_sitter.Parser, string) {- lang, ok := languageByExtension[ext]+func GetParserForExt(ext string) (*tree_sitter.Parser, shared.TreeSitterLanguage, *tree_sitter.Parser, shared.TreeSitterLanguage) {+ lang, ok := shared.TreeSitterLanguageByExtension[ext]if !ok {return nil, "", nil, ""}parser := getParserForLanguage(lang)- fallback := fallbackByExtension[ext]+ fallback := shared.TreeSitterLanguageFallbackByExtension[ext]var fallbackParser *tree_sitter.Parserif fallback != "" {fallbackParser = getParserForLanguage(fallback)@@ -51,116 +53,71 @@ func GetParserForExt(ext string) (*tree_sitter.Parser, string, *tree_sitter.Parsreturn parser, lang, fallbackParser, fallback}-func getParserForLanguage(lang string) *tree_sitter.Parser {+func getParserForLanguage(lang shared.TreeSitterLanguage) *tree_sitter.Parser {parser := tree_sitter.NewParser()switch lang {- case "bash":+ case shared.TreeSitterLanguageBash:parser.SetLanguage(bash.GetLanguage())- case "c":+ case shared.TreeSitterLanguageC:parser.SetLanguage(c.GetLanguage())- case "cpp":+ case shared.TreeSitterLanguageCpp:parser.SetLanguage(cpp.GetLanguage())- case "csharp":+ case shared.TreeSitterLanguageCsharp:parser.SetLanguage(csharp.GetLanguage())- case "css":+ case shared.TreeSitterLanguageCss:parser.SetLanguage(css.GetLanguage())- case "cue":+ case shared.TreeSitterLanguageCue:parser.SetLanguage(cue.GetLanguage())- case "dockerfile":+ case shared.TreeSitterLanguageDockerfile:parser.SetLanguage(dockerfile.GetLanguage())- case "elixir":+ case shared.TreeSitterLanguageElixir:parser.SetLanguage(elixir.GetLanguage())- case "elm":+ case shared.TreeSitterLanguageElm:parser.SetLanguage(elm.GetLanguage())- case "go":+ case shared.TreeSitterLanguageGo:parser.SetLanguage(golang.GetLanguage())- case "groovy":+ case shared.TreeSitterLanguageGroovy:parser.SetLanguage(groovy.GetLanguage())- case "hcl":+ case shared.TreeSitterLanguageHcl:parser.SetLanguage(hcl.GetLanguage())- case "html":+ case shared.TreeSitterLanguageHtml:parser.SetLanguage(html.GetLanguage())- case "java":+ case shared.TreeSitterLanguageJava:parser.SetLanguage(java.GetLanguage())- case "javascript", "json":+ case shared.TreeSitterLanguageJavascript, shared.TreeSitterLanguageJson:parser.SetLanguage(javascript.GetLanguage())- case "kotlin":+ case shared.TreeSitterLanguageKotlin:parser.SetLanguage(kotlin.GetLanguage())- case "lua":+ case shared.TreeSitterLanguageLua:parser.SetLanguage(lua.GetLanguage())- case "ocaml":+ case shared.TreeSitterLanguageOCaml:parser.SetLanguage(ocaml.GetLanguage())- case "php":+ case shared.TreeSitterLanguagePhp:parser.SetLanguage(php.GetLanguage())- case "protobuf":+ case shared.TreeSitterLanguageProtobuf:parser.SetLanguage(protobuf.GetLanguage())- case "python":+ case shared.TreeSitterLanguagePython:parser.SetLanguage(python.GetLanguage())- case "ruby":+ case shared.TreeSitterLanguageRuby:parser.SetLanguage(ruby.GetLanguage())- case "rust":+ case shared.TreeSitterLanguageRust:parser.SetLanguage(rust.GetLanguage())- case "scala":+ case shared.TreeSitterLanguageScala:parser.SetLanguage(scala.GetLanguage())- case "svelte":+ case shared.TreeSitterLanguageSvelte:parser.SetLanguage(svelte.GetLanguage())- case "swift":+ case shared.TreeSitterLanguageSwift:parser.SetLanguage(swift.GetLanguage())- case "toml":+ case shared.TreeSitterLanguageToml:parser.SetLanguage(toml.GetLanguage())- case "typescript":+ case shared.TreeSitterLanguageTypescript:parser.SetLanguage(typescript.GetLanguage())- case "jsx", "tsx":+ case shared.TreeSitterLanguageJsx, shared.TreeSitterLanguageTsx:parser.SetLanguage(tsx.GetLanguage())- case "yaml":+ case shared.TreeSitterLanguageYaml:parser.SetLanguage(yaml.GetLanguage())default:return nil}return parser}--var languageByExtension = map[string]string{- ".sh": "bash",- ".bash": "bash",- ".c": "c",- ".h": "c",- ".cpp": "cpp",- ".cc": "cpp",- ".cs": "csharp",- ".css": "css",- ".cue": "cue",- ".dockerfile": "dockerfile",- ".ex": "elixir",- ".exs": "elixir",- ".elm": "elm",- ".go": "go",- ".groovy": "groovy",- ".hcl": "hcl",- ".html": "html",- ".java": "java",- ".js": "javascript",- ".json": "json",- ".jsx": "tsx",- ".kt": "kotlin",- ".lua": "lua",- ".ml": "ocaml",- ".php": "php",- ".proto": "protobuf",- ".py": "python",- ".rb": "ruby",- ".rs": "rust",- ".scala": "scala",- ".svelte": "svelte",- ".swift": "swift",- ".toml": "toml",- ".ts": "typescript",- ".tsx": "tsx",- ".yaml": "yaml",- ".yml": "yaml",-}--var fallbackByExtension = map[string]string{- ".ts": "tsx",- ".js": "tsx",-}diff --git a/app/server/syntax/structural_edits.go b/app/server/syntax/structural_edits.goindex 57f2ec02..aea6c131 100644--- a/app/server/syntax/structural_edits.go+++ b/app/server/syntax/structural_edits.go@@ -6,6 +6,7 @@ import ("strings""github.com/davecgh/go-spew/spew"+ "github.com/plandex/plandex/shared"tree_sitter "github.com/smacker/go-tree-sitter")@@ -23,7 +24,7 @@ const verboseLogging = falsefunc ApplyChanges(ctx context.Context,- language string,+ language shared.TreeSitterLanguage,parser *tree_sitter.Parser,original,proposed string,diff --git a/app/server/syntax/structural_edits_test.go b/app/server/syntax/structural_edits_test.goindex a52fbfda..3e46056f 100644--- a/app/server/syntax/structural_edits_test.go+++ b/app/server/syntax/structural_edits_test.go@@ -6,6 +6,7 @@ import ("strings""testing"+ "github.com/plandex/plandex/shared"tree_sitter "github.com/smacker/go-tree-sitter""github.com/stretchr/testify/assert")@@ -18,7 +19,7 @@ func TestStructuralReplacements(t *testing.T) {references []Referenceremovals []Removalwant string- language string+ language shared.TreeSitterLanguageparser *tree_sitter.ParseranchorLines map[int]int}{@@ -50,7 +51,7 @@ func TestStructuralReplacements(t *testing.T) {log.Info("processing user")return nil}`,- language: "go",+ language: shared.TreeSitterLanguageGo,parser: getParserForLanguage("go"),},{@@ -83,7 +84,7 @@ func TestStructuralReplacements(t *testing.T) {}return update(id)}`,- language: "go",+ language: shared.TreeSitterLanguageGo,parser: getParserForLanguage("go"),},{@@ -173,7 +174,7 @@ func TestStructuralReplacements(t *testing.T) {log.Println("record")}`,- language: "go",+ language: shared.TreeSitterLanguageGo,parser: getParserForLanguage("go"),},{@@ -208,7 +209,7 @@ func TestStructuralReplacements(t *testing.T) {commit()return nil}`,- language: "go",+ language: shared.TreeSitterLanguageGo,parser: getParserForLanguage("go"),},{@@ -245,7 +246,7 @@ func TestStructuralReplacements(t *testing.T) {commit()return nil}`,- language: "go",+ language: shared.TreeSitterLanguageGo,parser: getParserForLanguage("go"),},{@@ -294,7 +295,7 @@ func TestStructuralReplacements(t *testing.T) {"build": "webpack"}}`,- language: "json",+ language: shared.TreeSitterLanguageJson,parser: getParserForLanguage("json"),},{@@ -364,7 +365,7 @@ func TestStructuralReplacements(t *testing.T) {this.cache.clear()}}`,- language: "javascript",+ language: shared.TreeSitterLanguageJavascript,parser: getParserForLanguage("javascript"),},{@@ -430,7 +431,7 @@ func TestStructuralReplacements(t *testing.T) {}}}`,- language: "typescript",+ language: shared.TreeSitterLanguageTypescript,parser: getParserForLanguage("typescript"),},{@@ -472,7 +473,7 @@ func TestStructuralReplacements(t *testing.T) {console.log("finishing")},}`,- language: "javascript",+ language: shared.TreeSitterLanguageJavascript,parser: getParserForLanguage("javascript"),},{@@ -550,7 +551,7 @@ func TestStructuralReplacements(t *testing.T) {process.exit(1)}}`,- language: "javascript",+ language: shared.TreeSitterLanguageJavascript,parser: getParserForLanguage("javascript"),},{@@ -578,7 +579,7 @@ func TestStructuralReplacements(t *testing.T) {const b = 2;const c = 3;`,- language: "javascript",+ language: shared.TreeSitterLanguageJavascript,parser: getParserForLanguage("javascript"),},@@ -748,7 +749,7 @@ func TestStructuralReplacements(t *testing.T) {}}`,- language: "json",+ language: shared.TreeSitterLanguageJson,parser: getParserForLanguage("json"),references: []Reference{3, 24, 26,@@ -970,7 +971,7 @@ func TestStructuralReplacements(t *testing.T) {}}`,- language: "json",+ language: shared.TreeSitterLanguageJson,parser: getParserForLanguage("json"),references: []Reference{3, 6, 19, 22,diff --git a/app/server/syntax/validate.go b/app/server/syntax/validate.goindex 8be79b9f..e59d03f4 100644--- a/app/server/syntax/validate.go+++ b/app/server/syntax/validate.go@@ -5,6 +5,7 @@ import ("strings""time"+ "github.com/plandex/plandex/shared"tree_sitter "github.com/smacker/go-tree-sitter""context"@@ -15,7 +16,7 @@ const parserTimeout = 500 * time.Millisecondtype ValidationRes = struct {Ext string- Lang string+ Lang shared.TreeSitterLanguageHasParser boolTimedOut boolValid booldiff --git a/app/shared/context.go b/app/shared/context.goindex 46076634..40363dd3 100644--- a/app/shared/context.go+++ b/app/shared/context.go@@ -10,8 +10,11 @@ import ()const (- MaxContextBodySize = 10 * 1024 * 1024 // 10MB- MaxContextCount = 500+ MaxContextBodySize = 10 * 1024 * 1024 // 10MB+ MaxContextCount = 500+ MaxContextMapPaths = 10000+ MaxContextMapInputSize = 100 * 1024 * 1024 // 100MB+ MaxTotalContextSize = 2 * 1024 * 1024 * 1024 // 2GB)type ContextUpdateResult struct {@@ -23,6 +26,7 @@ type ContextUpdateResult struct {NumUrls intNumImages intNumTrees int+ NumMaps intMaxTokens int}@@ -48,6 +52,9 @@ func (c *Context) TypeAndIcon() (string, string) {case ContextImageType:icon = "🖼️ "t = "image"+ case ContextMapType:+ icon = "🗺️ "+ t = "map"}return t, icon@@ -87,6 +94,7 @@ func SummaryForLoadContext(contexts []*Context, tokensAdded, totalTokens int) stvar numFiles intvar numTrees intvar numUrls int+ var numMaps intfor _, context := range contexts {switch context.ContextType {@@ -100,6 +108,8 @@ func SummaryForLoadContext(contexts []*Context, tokensAdded, totalTokens int) sthasNote = truecase ContextPipedDataType:hasPiped = true+ case ContextMapType:+ numMaps++}}@@ -132,6 +142,13 @@ func SummaryForLoadContext(contexts []*Context, tokensAdded, totalTokens int) st}added = append(added, fmt.Sprintf("%d %s", numUrls, label))}+ if numMaps > 0 {+ label := "map"+ if numMaps > 1 {+ label = "maps"+ }+ added = append(added, fmt.Sprintf("%d %s", numMaps, label))+ }msg := "Loaded "@@ -199,6 +216,7 @@ func SummaryForUpdateContext(updateRes *ContextUpdateResult) string {numFiles := updateRes.NumFilesnumTrees := updateRes.NumTreesnumUrls := updateRes.NumUrls+ numMaps := updateRes.NumMapstokensDiff := updateRes.TokensDifftotalTokens := updateRes.TotalTokens@@ -225,6 +243,13 @@ func SummaryForUpdateContext(updateRes *ContextUpdateResult) string {}toAdd = append(toAdd, fmt.Sprintf("%d url%s", numUrls, postfix))}+ if numMaps > 0 {+ postfix := "s"+ if numMaps == 1 {+ postfix = ""+ }+ toAdd = append(toAdd, fmt.Sprintf("%d map%s", numMaps, postfix))+ }if len(toAdd) <= 2 {msg += " " + strings.Join(toAdd, " and ")diff --git a/app/shared/data_models.go b/app/shared/data_models.goindex dfdc46c5..4800199d 100644--- a/app/shared/data_models.go+++ b/app/shared/data_models.go@@ -89,8 +89,17 @@ const (ContextDirectoryTreeType ContextType = "directory tree"ContextPipedDataType ContextType = "piped data"ContextImageType ContextType = "image"+ ContextMapType ContextType = "map")+type FileMapPart struct {+ Sha string `json:"sha"`+ Body string `json:"body"`+ NumTokens int `json:"numTokens"`+}++type FileMapParts map[string]FileMapPart+type Context struct {Id string `json:"id"`OwnerId string `json:"ownerId"`@@ -101,8 +110,10 @@ type Context struct {Sha string `json:"sha"`NumTokens int `json:"numTokens"`Body string `json:"body,omitempty"`+ BodySize int64 `json:"bodySize,omitempty"`ForceSkipIgnore bool `json:"forceSkipIgnore"`ImageDetail openai.ImageURLDetail `json:"imageDetail,omitempty"`+ MapParts FileMapParts `json:"mapParts,omitempty"`CreatedAt time.Time `json:"createdAt"`UpdatedAt time.Time `json:"updatedAt"`}diff --git a/app/shared/file_maps.go b/app/shared/file_maps.gonew file mode 100644index 00000000..33cf9925--- /dev/null+++ b/app/shared/file_maps.go@@ -0,0 +1,54 @@+package shared++import (+ "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 {+ var combinedMap strings.Builder+ 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")+ }+ return combinedMap.String()+}diff --git a/app/shared/req_res.go b/app/shared/req_res.goindex 7b2382d8..e441b914 100644--- a/app/shared/req_res.go+++ b/app/shared/req_res.go@@ -156,6 +156,9 @@ type RespondMissingFileRequest struct {Body string `json:"body"`}+type FileMapInputs map[string]string+type FileMapBodies map[string]string+type LoadContextParams struct {ContextType ContextType `json:"contextType"`Name string `json:"name"`@@ -165,6 +168,7 @@ type LoadContextParams struct {ForceSkipIgnore bool `json:"forceSkipIgnore"`ImageDetail openai.ImageURLDetail `json:"imageDetail"`DefsOnly bool `json:"defsOnly"`+ MapInputs FileMapInputs `json:"mapInputs"`// For naming piped dataApiKeys map[string]string `json:"apiKeys"`@@ -183,7 +187,18 @@ type LoadContextResponse struct {}type UpdateContextParams struct {- Body string `json:"body"`+ Body string `json:"body"`+ MapBodies FileMapBodies `json:"mapBodies"`+ InputShas map[string]string `json:"inputShas"`+ RemovedMapPaths []string `json:"removedMapPaths"`+}++type GetFileMapRequest struct {+ MapInputs FileMapInputs `json:"mapInputs"`+}++type GetFileMapResponse struct {+ MapBodies FileMapBodies `json:"mapBodies"`}type UpdateContextRequest map[string]*UpdateContextParamsdiff --git a/app/shared/syntax.go b/app/shared/syntax.gonew file mode 100644index 00000000..75c8ecfd--- /dev/null+++ b/app/shared/syntax.go@@ -0,0 +1,134 @@+package shared++type TreeSitterLanguage string++const (+ TreeSitterLanguageBash TreeSitterLanguage = "bash"+ TreeSitterLanguageC TreeSitterLanguage = "c"+ TreeSitterLanguageCpp TreeSitterLanguage = "cpp"+ TreeSitterLanguageCsharp TreeSitterLanguage = "csharp"+ TreeSitterLanguageCss TreeSitterLanguage = "css"+ TreeSitterLanguageCue TreeSitterLanguage = "cue"+ TreeSitterLanguageDockerfile TreeSitterLanguage = "dockerfile"+ TreeSitterLanguageElixir TreeSitterLanguage = "elixir"+ TreeSitterLanguageElm TreeSitterLanguage = "elm"+ TreeSitterLanguageGo TreeSitterLanguage = "go"+ TreeSitterLanguageGroovy TreeSitterLanguage = "groovy"+ TreeSitterLanguageHcl TreeSitterLanguage = "hcl"+ TreeSitterLanguageHtml TreeSitterLanguage = "html"+ TreeSitterLanguageJava TreeSitterLanguage = "java"+ TreeSitterLanguageJavascript TreeSitterLanguage = "javascript"+ TreeSitterLanguageJson TreeSitterLanguage = "json"+ TreeSitterLanguageKotlin TreeSitterLanguage = "kotlin"+ TreeSitterLanguageLua TreeSitterLanguage = "lua"+ TreeSitterLanguageOCaml TreeSitterLanguage = "ocaml"+ TreeSitterLanguagePhp TreeSitterLanguage = "php"+ TreeSitterLanguageProtobuf TreeSitterLanguage = "protobuf"+ TreeSitterLanguagePython TreeSitterLanguage = "python"+ TreeSitterLanguageRuby TreeSitterLanguage = "ruby"+ TreeSitterLanguageRust TreeSitterLanguage = "rust"+ TreeSitterLanguageScala TreeSitterLanguage = "scala"+ TreeSitterLanguageSvelte TreeSitterLanguage = "svelte"+ TreeSitterLanguageSwift TreeSitterLanguage = "swift"+ TreeSitterLanguageToml TreeSitterLanguage = "toml"+ TreeSitterLanguageTypescript TreeSitterLanguage = "typescript"+ TreeSitterLanguageJsx TreeSitterLanguage = "jsx"+ TreeSitterLanguageTsx TreeSitterLanguage = "tsx"+ TreeSitterLanguageYaml TreeSitterLanguage = "yaml"+)++var TreeSitterLanguages = []TreeSitterLanguage{+ TreeSitterLanguageBash,+ TreeSitterLanguageC,+ TreeSitterLanguageCpp,+ TreeSitterLanguageCsharp,+ TreeSitterLanguageCss,+ TreeSitterLanguageCue,+ TreeSitterLanguageDockerfile,+ TreeSitterLanguageElixir,+ TreeSitterLanguageElm,+ TreeSitterLanguageGo,+ TreeSitterLanguageGroovy,+ TreeSitterLanguageHcl,+ TreeSitterLanguageHtml,+ TreeSitterLanguageJava,+ TreeSitterLanguageJavascript,+ TreeSitterLanguageJson,+ TreeSitterLanguageKotlin,+ TreeSitterLanguageLua,+ TreeSitterLanguageOCaml,+ TreeSitterLanguagePhp,+ TreeSitterLanguageProtobuf,+ TreeSitterLanguagePython,+ TreeSitterLanguageRuby,+ TreeSitterLanguageRust,+ TreeSitterLanguageScala,+ TreeSitterLanguageSvelte,+ TreeSitterLanguageSwift,+ TreeSitterLanguageToml,+ TreeSitterLanguageTypescript,+ TreeSitterLanguageJsx,+ TreeSitterLanguageTsx,+ TreeSitterLanguageYaml,+}++var TreeSitterLanguageSet = map[TreeSitterLanguage]bool{}++func init() {+ for _, lang := range TreeSitterLanguages {+ TreeSitterLanguageSet[lang] = true+ }+}++func IsTreeSitterLanguage(lang TreeSitterLanguage) bool {+ return TreeSitterLanguageSet[lang]+}++func IsTreeSitterExtension(ext string) bool {+ return TreeSitterLanguageByExtension[ext] != ""+}++var TreeSitterLanguageByExtension = map[string]TreeSitterLanguage{+ ".sh": TreeSitterLanguageBash,+ ".bash": TreeSitterLanguageBash,+ ".c": TreeSitterLanguageC,+ ".h": TreeSitterLanguageC,+ ".cpp": TreeSitterLanguageCpp,+ ".cc": TreeSitterLanguageCpp,+ ".cs": TreeSitterLanguageCsharp,+ ".css": TreeSitterLanguageCss,+ ".cue": TreeSitterLanguageCue,+ ".dockerfile": TreeSitterLanguageDockerfile,+ ".ex": TreeSitterLanguageElixir,+ ".exs": TreeSitterLanguageElixir,+ ".elm": TreeSitterLanguageElm,+ ".go": TreeSitterLanguageGo,+ ".groovy": TreeSitterLanguageGroovy,+ ".hcl": TreeSitterLanguageHcl,+ ".html": TreeSitterLanguageHtml,+ ".java": TreeSitterLanguageJava,+ ".js": TreeSitterLanguageJavascript,+ ".json": TreeSitterLanguageJson,+ ".jsx": TreeSitterLanguageTsx,+ ".kt": TreeSitterLanguageKotlin,+ ".lua": TreeSitterLanguageLua,+ ".ml": TreeSitterLanguageOCaml,+ ".php": TreeSitterLanguagePhp,+ ".proto": TreeSitterLanguageProtobuf,+ ".py": TreeSitterLanguagePython,+ ".rb": TreeSitterLanguageRuby,+ ".rs": TreeSitterLanguageRust,+ ".scala": TreeSitterLanguageScala,+ ".svelte": TreeSitterLanguageSvelte,+ ".swift": TreeSitterLanguageSwift,+ ".toml": TreeSitterLanguageToml,+ ".ts": TreeSitterLanguageTypescript,+ ".tsx": TreeSitterLanguageTsx,+ ".yaml": TreeSitterLanguageYaml,+ ".yml": TreeSitterLanguageYaml,+}++var TreeSitterLanguageFallbackByExtension = map[string]TreeSitterLanguage{+ ".ts": TreeSitterLanguageTsx,+ ".js": TreeSitterLanguageTsx,+}