From 646c8db97006376e945130abed01d855aa36cd82 Mon Sep 17 00:00:00 2001 From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com> Date: Sun, 8 Nov 2026 17:27:34 -0800 Subject: [PATCH] fix(workspaces): re-ask the host for folder setup support on every create --- .../quick-submit-preparation.ts | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/renderer/src/hooks/composer-state/quick-submit-preparation.ts b/src/renderer/src/hooks/composer-state/quick-submit-preparation.ts index 26ecc2fff54..7a3cc6677d0 100644 --- a/src/renderer/src/hooks/composer-state/quick-submit-preparation.ts +++ b/src/renderer/src/hooks/composer-state/quick-submit-preparation.ts @@ -79,30 +79,31 @@ export function useQuickSubmitPreparation(input: QuickSubmitPreparationInput) { let submitResolvedSetupDecision = resolvedSetupDecision - // Create waits for the host's answer so an unanswered probe can't drop an ask-policy prompt. + // Create re-asks the host so a pending or stale answer can't drop an ask-policy prompt. const supportSettlement = await settleComposerSubmit( - setupSupport === 'pending' - ? resolveFolderSetupSupported(selectedRepo).catch(() => { - throw new Error( - translate( - 'auto.hooks.useComposerState.folderSetupSupportCheckFailed', - "Couldn't confirm whether this host runs folder setup scripts. Try again." - ) - ) - }) - : Promise.resolve(setupSupport === 'supported'), + resolveFolderSetupSupported(selectedRepo).catch(() => { + throw new Error( + translate( + 'auto.hooks.useComposerState.folderSetupSupportCheckFailed', + "Couldn't confirm whether this host runs folder setup scripts. Try again." + ) + ) + }), isSubmissionCancelled ) if (supportSettlement.status === 'cancelled') { return null } const submitSetupSupported = supportSettlement.value + if (!submitSetupSupported) { + submitSetupConfig = null + } if ( submitSetupSupported && - (setupSupport === 'pending' || setupPolicy === 'ask') && + (setupSupport !== 'supported' || setupPolicy === 'ask') && selectedRepoHookContextKey && - (setupSupport === 'pending' || checkedHooksContextKey !== selectedRepoHookContextKey) + (setupSupport !== 'supported' || checkedHooksContextKey !== selectedRepoHookContextKey) ) { const outcome = await readWorkspaceSetupInspection( () => loadHookCheckForRepo(repoId),