Skip to content

POC: user-defined environments #132

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

POC: user-defined environments #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions environment/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ const (

func DefaultConfig() *EnvironmentConfig {
return &EnvironmentConfig{
BaseImage: defaultImage,
Instructions: "No instructions found. Please look around the filesystem and update me",
Workdir: "/workdir",
BaseImage: defaultImage,
// Instructions: "No instructions found. Please look around the filesystem and update me",
Workdir: "/workdir",
}
}

Expand Down
30 changes: 17 additions & 13 deletions mcpserver/tools.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ func wrapToolWithClient(tool *Tool, dag *dagger.Client) *Tool {
func init() {
registerTool(
EnvironmentOpenTool,
EnvironmentCreateTool,
EnvironmentUpdateTool,
EnvironmentListTool,
// EnvironmentUpdateTool,

EnvironmentRunCmdTool,

Expand Down Expand Up @@ -151,8 +151,8 @@ func marshalEnvironment(env *environment.Environment) (string, error) {
return string(out), nil
}

func marshalEnvironmentInfo(envInfo *environment.EnvironmentInfo) (string, error) {
resp := &EnvironmentResponse{
func envInfoToResponse(envInfo *environment.EnvironmentInfo) *EnvironmentResponse {
return &EnvironmentResponse{
ID: envInfo.ID,
Title: envInfo.State.Title,
Instructions: envInfo.Config.Instructions,
Expand All @@ -164,6 +164,10 @@ func marshalEnvironmentInfo(envInfo *environment.EnvironmentInfo) (string, error
LogCommand: fmt.Sprintf("cu log %s", envInfo.ID),
Services: nil, // EnvironmentInfo doesn't have "active" services, specifically useful for EndpointMappings
}
}

func marshalEnvironmentInfo(envInfo *environment.EnvironmentInfo) (string, error) {
resp := envInfoToResponse(envInfo)
out, err := json.Marshal(resp)
if err != nil {
return "", fmt.Errorf("failed to marshal response: %w", err)
Expand All @@ -189,7 +193,7 @@ func EnvironmentInfoToCallResult(envInfo *environment.EnvironmentInfo) (*mcp.Cal

var EnvironmentOpenTool = &Tool{
Definition: mcp.NewTool("environment_open",
mcp.WithDescription("Opens an existing environment. Return format is same as environment_create."),
mcp.WithDescription("Opens an existing environment. If unsure, use `environment_list` to list available environments."),
mcp.WithString("explanation",
mcp.Description("One sentence explanation for why this environment is being opened."),
),
Expand Down Expand Up @@ -245,7 +249,7 @@ DO NOT manually install toolchains inside the environment, instead explicitly ca
return mcp.NewToolResultErrorFromErr("dagger client not found in context", nil), nil
}

env, err := repo.Create(ctx, dag, title, request.GetString("explanation", ""))
env, err := repo.Create(ctx, dag, "", title, request.GetString("explanation", ""))
if err != nil {
return mcp.NewToolResultErrorFromErr("failed to create environment", err), nil
}
Expand Down Expand Up @@ -421,7 +425,7 @@ var EnvironmentRunCmdTool = &Tool{
mcp.Required(),
),
mcp.WithString("environment_id",
mcp.Description("The ID of the environment for this command. Must call `environment_create` first."),
mcp.Description("The ID of the environment for this command."),
mcp.Required(),
),
mcp.WithString("command",
Expand Down Expand Up @@ -514,7 +518,7 @@ var EnvironmentFileReadTool = &Tool{
mcp.Required(),
),
mcp.WithString("environment_id",
mcp.Description("The ID of the environment for this command. Must call `environment_create` first."),
mcp.Description("The ID of the environment for this command."),
mcp.Required(),
),
mcp.WithString("target_file",
Expand Down Expand Up @@ -565,7 +569,7 @@ var EnvironmentFileListTool = &Tool{
mcp.Required(),
),
mcp.WithString("environment_id",
mcp.Description("The ID of the environment for this command. Must call `environment_create` first."),
mcp.Description("The ID of the environment for this command."),
mcp.Required(),
),
mcp.WithString("path",
Expand Down Expand Up @@ -604,7 +608,7 @@ var EnvironmentFileWriteTool = &Tool{
mcp.Required(),
),
mcp.WithString("environment_id",
mcp.Description("The ID of the environment for this command. Must call `environment_create` first."),
mcp.Description("The ID of the environment for this command."),
mcp.Required(),
),
mcp.WithString("target_file",
Expand Down Expand Up @@ -654,7 +658,7 @@ var EnvironmentFileDeleteTool = &Tool{
mcp.Required(),
),
mcp.WithString("environment_id",
mcp.Description("The ID of the environment for this command. Must call `environment_create` first."),
mcp.Description("The ID of the environment for this command."),
mcp.Required(),
),
mcp.WithString("target_file",
Expand Down Expand Up @@ -692,7 +696,7 @@ var EnvironmentCheckpointTool = &Tool{
mcp.Description("One sentence explanation for why this checkpoint is being created."),
),
mcp.WithString("environment_id",
mcp.Description("The ID of the environment for this command. Must call `environment_create` first."),
mcp.Description("The ID of the environment for this command."),
mcp.Required(),
),
mcp.WithString("destination",
Expand Down Expand Up @@ -729,7 +733,7 @@ var EnvironmentAddServiceTool = &Tool{
mcp.Required(),
),
mcp.WithString("environment_id",
mcp.Description("The ID of the environment for this command. Must call `environment_create` first."),
mcp.Description("The ID of the environment for this command."),
mcp.Required(),
),
mcp.WithString("name",
Expand Down
7 changes: 5 additions & 2 deletions repository/repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,11 @@ func (r *Repository) exists(ctx context.Context, id string) error {

// Create creates a new environment with the given description and explanation.
// Requires a dagger client for container operations during environment initialization.
func (r *Repository) Create(ctx context.Context, dag *dagger.Client, description, explanation string) (*environment.Environment, error) {
id := petname.Generate(2, "-")
func (r *Repository) Create(ctx context.Context, dag *dagger.Client, id, description, explanation string) (*environment.Environment, error) {
if id == "" {
id = petname.Generate(2, "-")
}

worktree, err := r.initializeWorktree(ctx, id)
if err != nil {
return nil, err
Expand Down