diff --git a/pkg/agentic/prep.go b/pkg/agentic/prep.go
index 6ba1566..7c025f8 100644
--- a/pkg/agentic/prep.go
+++ b/pkg/agentic/prep.go
@@ -220,6 +220,14 @@ func (s *PrepSubsystem) prepWorkspace(ctx context.Context, _ *mcp.CallToolReques
 	resumed := fs.IsDir(core.JoinPath(repoDir, ".git"))
 	out.Resumed = resumed
 
+	// Extract default workspace template (go.work etc.)
+	lib.ExtractWorkspace("default", wsDir, &lib.WorkspaceData{
+		Repo:   input.Repo,
+		Branch: "",
+		Task:   input.Task,
+		Agent:  input.Agent,
+	})
+
 	if !resumed {
 		// Clone repo into repo/
 		cloneCmd := exec.CommandContext(ctx, "git", "clone", repoPath, repoDir)
diff --git a/pkg/lib/workspace/default/go.work.tmpl b/pkg/lib/workspace/default/go.work.tmpl
index 3ed003a..e69b5f9 100644
--- a/pkg/lib/workspace/default/go.work.tmpl
+++ b/pkg/lib/workspace/default/go.work.tmpl
@@ -1,3 +1,3 @@
 go 1.26.0
 
-use ./src
+use ./repo
diff --git a/pkg/lib/workspace/default/src/.gitkeep b/pkg/lib/workspace/default/src/.gitkeep
deleted file mode 100644
index e69de29..0000000