fix: gate app studio creation on git readiness

cwilhit · cwilhit · commit 5273ed166dec · 2026-06-30T08:14:43.000-05:00
diff --git a/providers/app-studio/api/code_repository.go b/providers/app-studio/api/code_repository.go
@@ -18,6 +18,7 @@ package api
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"sort"
 	"strings"
@@ -68,6 +69,16 @@ type projectRepositoryPlan struct {
 	Description   string
 }
 
+type ProjectCreateReadinessView struct {
+	GitConnection ProjectCreateGitConnectionReadiness `json:"gitConnection"`
+}
+
+type ProjectCreateGitConnectionReadiness struct {
+	Ready         bool   `json:"ready"`
+	ConnectionRef string `json:"connectionRef,omitempty"`
+	Message       string `json:"message,omitempty"`
+}
+
 type codeResourceGetter func(ctx context.Context, gvr schema.GroupVersionResource, name string) (*unstructured.Unstructured, error)
 type codeResourceLister func(ctx context.Context, gvr schema.GroupVersionResource, opts metav1.ListOptions) (*unstructured.UnstructuredList, error)
 
@@ -99,6 +110,28 @@ func (s *Server) prepareProjectRepository(ctx context.Context, c *asclient.Clien
 	}, nil
 }
 
+func projectCreateReadiness(ctx context.Context, c *asclient.Client) (ProjectCreateReadinessView, error) {
+	connectionRef, err := selectCodeConnection(ctx, c, "")
+	if err != nil {
+		var validationErr *ValidationError
+		if errors.As(err, &validationErr) {
+			return ProjectCreateReadinessView{
+				GitConnection: ProjectCreateGitConnectionReadiness{
+					Ready:   false,
+					Message: err.Error(),
+				},
+			}, nil
+		}
+		return ProjectCreateReadinessView{}, err
+	}
+	return ProjectCreateReadinessView{
+		GitConnection: ProjectCreateGitConnectionReadiness{
+			Ready:         true,
+			ConnectionRef: connectionRef,
+		},
+	}, nil
+}
+
 func selectCodeConnection(ctx context.Context, c *asclient.Client, requested string) (string, error) {
 	if requested != "" {
 		conn, err := c.Resource(codeConnectionResource, "").Get(ctx, requested, metav1.GetOptions{})
diff --git a/providers/app-studio/api/code_repository_test.go b/providers/app-studio/api/code_repository_test.go
@@ -0,0 +1,94 @@
+/*
+Copyright 2026 The Faros Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package api
+
+import (
+	"context"
+	"testing"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/client-go/dynamic/fake"
+
+	asclient "github.com/faroshq/provider-app-studio/client"
+)
+
+func TestProjectCreateReadinessRequiresValidatedGitConnection(t *testing.T) {
+	client := newCodeRepositoryTestClient()
+
+	readiness, err := projectCreateReadiness(context.Background(), client)
+	if err != nil {
+		t.Fatalf("projectCreateReadiness returned error: %v", err)
+	}
+	if readiness.GitConnection.Ready {
+		t.Fatalf("GitConnection.Ready = true, want false")
+	}
+	if readiness.GitConnection.ConnectionRef != "" {
+		t.Fatalf("GitConnection.ConnectionRef = %q, want empty", readiness.GitConnection.ConnectionRef)
+	}
+	if readiness.GitConnection.Message != "You need to connect to a Git account before you can continue" {
+		t.Fatalf("GitConnection.Message = %q, want missing connection guidance", readiness.GitConnection.Message)
+	}
+}
+
+func TestProjectCreateReadinessSelectsValidatedGitConnection(t *testing.T) {
+	client := newCodeRepositoryTestClient(
+		codeConnectionObjectWithValidated("github", metav1.ConditionTrue),
+	)
+
+	readiness, err := projectCreateReadiness(context.Background(), client)
+	if err != nil {
+		t.Fatalf("projectCreateReadiness returned error: %v", err)
+	}
+	if !readiness.GitConnection.Ready {
+		t.Fatalf("GitConnection.Ready = false, want true")
+	}
+	if readiness.GitConnection.ConnectionRef != "github" {
+		t.Fatalf("GitConnection.ConnectionRef = %q, want github", readiness.GitConnection.ConnectionRef)
+	}
+	if readiness.GitConnection.Message != "" {
+		t.Fatalf("GitConnection.Message = %q, want empty", readiness.GitConnection.Message)
+	}
+}
+
+func newCodeRepositoryTestClient(objects ...runtime.Object) *asclient.Client {
+	return asclient.NewFromDynamic(fake.NewSimpleDynamicClientWithCustomListKinds(
+		runtime.NewScheme(),
+		map[schema.GroupVersionResource]string{
+			codeConnectionsGVR: "ConnectionList",
+		},
+		objects...,
+	))
+}
+
+func codeConnectionObjectWithValidated(name string, status metav1.ConditionStatus) *unstructured.Unstructured {
+	u := &unstructured.Unstructured{
+		Object: map[string]any{
+			"status": map[string]any{
+				"conditions": []any{
+					map[string]any{"type": codeConditionValidated, "status": string(status)},
+				},
+			},
+		},
+	}
+	u.SetAPIVersion(codeSchemeGroupVersion.String())
+	u.SetKind("Connection")
+	u.SetName(name)
+	return u
+}
diff --git a/providers/app-studio/api/projects.go b/providers/app-studio/api/projects.go
@@ -166,6 +166,19 @@ func writeProjectError(w http.ResponseWriter, err error) {
 	writeError(w, err)
 }
 
+func (s *Server) getProjectCreateReadiness(w http.ResponseWriter, r *http.Request) {
+	c, _, ok := s.requireProjectClient(w, r)
+	if !ok {
+		return
+	}
+	readiness, err := projectCreateReadiness(r.Context(), c)
+	if err != nil {
+		writeProjectError(w, err)
+		return
+	}
+	writeJSON(w, http.StatusOK, readiness)
+}
+
 func isProjectAPIInitializingError(err error) bool {
 	if err == nil {
 		return false
diff --git a/providers/app-studio/api/server.go b/providers/app-studio/api/server.go
@@ -144,6 +144,7 @@ func (s *Server) Register(r *mux.Router) {
 	r.HandleFunc("/api/projects", s.listProjects).Methods(http.MethodGet)
 	r.HandleFunc("/api/projects", s.createProject).Methods(http.MethodPost)
 	r.HandleFunc("/api/projects/stream", s.createProjectStartStream).Methods(http.MethodPost)
+	r.HandleFunc("/api/projects/create-readiness", s.getProjectCreateReadiness).Methods(http.MethodGet)
 	r.HandleFunc("/api/projects/llm-settings", s.getProjectLLMSettings).Methods(http.MethodGet)
 	r.HandleFunc("/api/projects/llm-settings", s.patchProjectLLMSettings).Methods(http.MethodPatch)
 	r.HandleFunc("/api/projects/{project}", s.getProject).Methods(http.MethodGet)
diff --git a/providers/app-studio/portal/package.json b/providers/app-studio/portal/package.json
@@ -9,6 +9,7 @@
     "dev": "vite",
     "test:workbench": "node --test src/workbench.test.mjs",
     "test:preview-state": "node --test src/previewState.test.mjs",
+    "test:create-readiness": "node --test src/createReadiness.test.mjs",
     "typecheck": "vue-tsc --noEmit"
   },
   "dependencies": {
diff --git a/providers/app-studio/portal/src/App.vue b/providers/app-studio/portal/src/App.vue
@@ -30,6 +30,12 @@ import {
   X,
 } from 'lucide-vue-next'
 import { api, isProjectAPIInitializingError } from './api'
+import {
+  canSubmitCreatePrompt,
+  createPromptBlockedMessage,
+  gitConnectionReady,
+  type ProjectCreateReadiness,
+} from './createReadiness'
 import ConfirmDialog from '@/components/ConfirmDialog.vue'
 import StatusBadge from '@/components/StatusBadge.vue'
 import { useEscapeKey } from '@/composables/useEscapeKey'
@@ -313,6 +319,9 @@ const followUpAnswers = ref<Record<string, string>>({})
 const followUpBusy = ref<Record<string, boolean>>({})
 const followUpErrors = ref<Record<string, string>>({})
 const toolState = ref<'idle' | 'loading' | 'ready' | 'error'>('idle')
+const createReadiness = ref<ProjectCreateReadiness | null>(null)
+const createReadinessLoading = ref(false)
+const createReadinessError = ref<string | null>(null)
 const workbench = ref(createDefaultWorkbenchState())
 const draggedWorkbenchTabID = ref<string | null>(null)
 const dragOverWorkbenchTabID = ref<string | null>(null)
@@ -359,7 +368,7 @@ const isBuilderVisible = computed(() => !isAppStudioLandingRoute.value || select
 const showNewProjectComposer = computed(() => isCreateRoute.value)
 const chatPaneStyle = computed(() => ({ flexBasis: `${splitWidth.value}%` }))
 const assistantResumeBusy = computed(() => Object.keys(permissionBusy.value).length > 0 || Object.keys(followUpBusy.value).length > 0)
-const canStartProjectFromPrompt = computed(() => prompt.value.trim().length > 0)
+const canStartProjectFromPrompt = computed(() => canSubmitCreatePrompt(prompt.value, createReadiness.value))
 const canSendPrompt = computed(() => (llmSettings.value?.configured ?? false) && prompt.value.trim().length > 0 && !messageStreaming.value && !assistantResumeBusy.value)
 const settingsProject = computed(() => (isAppStudioLandingRoute.value ? null : selected.value))
 const settingsTitle = computed(() => (settingsProject.value ? 'Project settings' : 'LLM settings'))
@@ -375,6 +384,28 @@ const conversationWorkingLabel = computed(() => {
   if (lastAssistant?.content.trim()) return 'Working'
   return 'Working'
 })
+const gitConnectionCreateReady = computed(() => gitConnectionReady(createReadiness.value))
+const createReadinessChecking = computed(() => createReadinessLoading.value || (!!props.ctx?.token && createReadiness.value === null && !createReadinessError.value))
+const createReadinessBlockMessage = computed(() => {
+  if (createReadinessError.value) return createReadinessError.value
+  if (createReadinessChecking.value) return 'Checking Git connection...'
+  return createPromptBlockedMessage(createReadiness.value)
+})
+const createPromptSubmitTitle = computed(() => {
+  if (!gitConnectionCreateReady.value) return 'Connect Git before creating a durable project'
+  return llmSettings.value?.configured ? 'Create project and send prompt' : 'Configure LLM settings before creating a project'
+})
+const createPromptSubmitLabel = computed(() => {
+  if (!gitConnectionCreateReady.value) return createReadinessChecking.value ? 'Checking Git' : 'Connect Git'
+  return llmSettings.value?.configured ? 'Create and send' : 'Set up and send'
+})
+const llmConfigured = computed(() => llmSettings.value?.configured ?? false)
+const workspaceSetupReady = computed(() => gitConnectionCreateReady.value && llmConfigured.value)
+const workspaceSetupLabel = computed(() => {
+  if (!gitConnectionCreateReady.value) return createReadinessChecking.value ? 'Checking Git' : 'Git setup needed'
+  if (!llmConfigured.value) return 'LLM setup needed'
+  return 'Workspace ready'
+})
 const deleteProjectMessage = computed(() => {
   const project = deleteProjectTarget.value
   if (!project) return ''
@@ -723,6 +754,7 @@ const developmentPreviewUnavailableMessage = computed(() => {
 onMounted(() => {
   void load()
   void loadProviders()
+  void loadCreateReadiness()
   void loadLLMSettings()
   startLandingPlaceholderRotation()
   window.addEventListener('focus', handleDevelopmentPreviewAuthorizationWake)
@@ -742,6 +774,7 @@ watch(
   () => props.ctx?.token,
   () => {
     void loadProviders()
+    void loadCreateReadiness()
     void loadLLMSettings()
   },
 )
@@ -903,6 +936,7 @@ function handleProjectAPIInitializing(err: unknown): boolean {
   initializationRetryTimer = window.setTimeout(() => {
     initializationRetryTimer = undefined
     void load()
+    void loadCreateReadiness()
     void loadLLMSettings()
   }, 2000)
   return true
@@ -938,6 +972,21 @@ async function loadProviders() {
   }
 }
 
+async function loadCreateReadiness() {
+  if (!props.ctx?.token) return
+  createReadinessLoading.value = true
+  createReadinessError.value = null
+  try {
+    createReadiness.value = await api.getProjectCreateReadiness(props.ctx)
+  } catch (e) {
+    if (handleProjectAPIInitializing(e)) return
+    createReadiness.value = null
+    createReadinessError.value = e instanceof Error ? e.message : String(e)
+  } finally {
+    createReadinessLoading.value = false
+  }
+}
+
 async function loadLLMSettings() {
   if (!props.ctx?.token) return
   try {
@@ -1211,13 +1260,23 @@ async function clearLLMKey() {
 async function createProjectFromPrompt() {
   const content = prompt.value.trim()
   if (!content) return
+  if (!await ensureGitConnectionReady()) return
   if (!llmSettings.value?.configured) {
     openSettings()
     return
   }
   await createProjectAndStartConversation(content)
 }
 
+async function ensureGitConnectionReady(): Promise<boolean> {
+  if (!gitConnectionCreateReady.value && !createReadinessLoading.value) {
+    await loadCreateReadiness()
+  }
+  if (gitConnectionCreateReady.value) return true
+  error.value = createReadinessError.value || createPromptBlockedMessage(createReadiness.value)
+  return false
+}
+
 async function createProjectAndStartConversation(content: string) {
   const now = new Date().toISOString()
   const draftName = `draft-${Date.now()}`
@@ -2881,16 +2940,16 @@ function repositoryCommitFilesLabel(commit: ProjectRepositoryCommit): string {
         <main class="flex min-h-0 flex-1 items-center justify-center py-4">
           <section class="w-full max-w-[1060px]">
             <div class="mx-auto flex max-w-[760px] flex-col items-center text-center">
-              <span
-                class="inline-flex items-center gap-1.5 rounded-full border px-3 py-1.5 text-[12px] font-medium"
-                :class="llmSettings?.configured
-                  ? 'border-success/30 bg-success-subtle text-success'
-                  : 'border-warning/30 bg-warning-subtle text-warning'"
-              >
-                <Check v-if="llmSettings?.configured" class="h-3.5 w-3.5" :stroke-width="2" />
-                <Settings2 v-else class="h-3.5 w-3.5" :stroke-width="1.75" />
-                {{ llmSettings?.configured ? 'Workspace ready' : 'LLM setup needed' }}
-              </span>
+	              <span
+	                class="inline-flex items-center gap-1.5 rounded-full border px-3 py-1.5 text-[12px] font-medium"
+	                :class="workspaceSetupReady
+	                  ? 'border-success/30 bg-success-subtle text-success'
+	                  : 'border-warning/30 bg-warning-subtle text-warning'"
+	              >
+	                <Check v-if="workspaceSetupReady" class="h-3.5 w-3.5" :stroke-width="2" />
+	                <Settings2 v-else class="h-3.5 w-3.5" :stroke-width="1.75" />
+	                {{ workspaceSetupLabel }}
+	              </span>
               <h2 class="mt-5 text-[44px] font-semibold leading-[1.05] text-text-primary md:text-[56px]">
                 What do you want to build?
               </h2>
@@ -2938,16 +2997,29 @@ function repositoryCommitFilesLabel(commit: ProjectRepositoryCommit): string {
                     <span v-else class="text-[12px] text-text-muted">
                       The first message will create the project and start the conversation.
                     </span>
+                    <span
+                      v-if="createReadinessBlockMessage"
+                      class="inline-flex items-center gap-1.5 rounded-md border border-warning/30 bg-warning-subtle px-2.5 py-1.5 text-[12px] font-medium text-warning"
+                    >
+                      <GitBranch class="h-3.5 w-3.5" :stroke-width="1.75" />
+                      <template v-if="isMissingCodeConnectionError(createReadinessBlockMessage)">
+                        <a :href="CODE_CONNECTIONS_URL" class="underline underline-offset-2 hover:text-warning/80">
+                          Connect Git
+                        </a>
+                        <span>to create a durable project.</span>
+                      </template>
+                      <template v-else>{{ createReadinessBlockMessage }}</template>
+                    </span>
                   </div>
                   <button
                     class="inline-flex h-9 items-center justify-center gap-2 rounded-md border border-accent/30 bg-accent/10 px-3 text-[13px] font-medium text-accent transition hover:bg-accent/20 disabled:cursor-not-allowed disabled:opacity-60"
                     type="submit"
                     :disabled="busy || !canStartProjectFromPrompt"
-                    :title="llmSettings?.configured ? 'Create project and send prompt' : 'Configure LLM settings before creating a project'"
+                    :title="createPromptSubmitTitle"
                   >
-                    <Plus v-if="llmSettings?.configured" class="h-4 w-4" :stroke-width="2" />
+                    <Plus v-if="gitConnectionCreateReady && llmSettings?.configured" class="h-4 w-4" :stroke-width="2" />
                     <Settings2 v-else class="h-4 w-4" :stroke-width="1.75" />
-                    {{ llmSettings?.configured ? 'Create and send' : 'Set up and send' }}
+                    {{ createPromptSubmitLabel }}
                   </button>
                 </div>
               </div>
diff --git a/providers/app-studio/portal/src/api.ts b/providers/app-studio/portal/src/api.ts
@@ -13,6 +13,7 @@ import type {
   ProjectMessagesPage,
   ProviderItem,
 } from './types'
+import type { ProjectCreateReadiness } from './createReadiness'
 
 interface TenantSelection {
   orgUUID: string | null
@@ -593,6 +594,10 @@ export const api = {
     return requestStream(ctx, 'POST', `${baseURL(ctx)}/stream`, body, onEvent, signal)
   },
 
+  async getProjectCreateReadiness(ctx: KedgeContext | null): Promise<ProjectCreateReadiness> {
+    return request<ProjectCreateReadiness>(ctx, 'GET', `${baseURL(ctx)}/create-readiness`)
+  },
+
   async getLLMSettings(ctx: KedgeContext | null): Promise<ProjectLLMSettings> {
     return request<ProjectLLMSettings>(ctx, 'GET', `${baseURL(ctx)}/llm-settings`)
   },
diff --git a/providers/app-studio/portal/src/createReadiness.test.mjs b/providers/app-studio/portal/src/createReadiness.test.mjs
diff --git a/providers/app-studio/portal/src/createReadiness.ts b/providers/app-studio/portal/src/createReadiness.ts
