mirror of
https://github.com/AutoMaker-Org/automaker.git
synced 2026-03-19 10:43:08 +00:00
Add quick-add feature with improved workflows (#802)
* Changes from feature/quick-add * feat: Clarify system prompt and improve error handling across services. Address PR Feedback * feat: Improve PR description parsing and refactor event handling * feat: Add context options to pipeline orchestrator initialization * fix: Deduplicate React and handle CJS interop for use-sync-external-store Resolve "Cannot read properties of null (reading 'useState')" errors by deduplicating React/react-dom and ensuring use-sync-external-store is bundled together with React to prevent CJS packages from resolving to different React instances.
This commit is contained in:
@@ -31,6 +31,7 @@ import type {
|
||||
WorktreeInfo,
|
||||
PhaseModelConfig,
|
||||
PhaseModelEntry,
|
||||
FeatureTemplate,
|
||||
ClaudeApiProfile,
|
||||
ClaudeCompatibleProvider,
|
||||
ProviderModel,
|
||||
@@ -40,6 +41,7 @@ import {
|
||||
DEFAULT_CREDENTIALS,
|
||||
DEFAULT_PROJECT_SETTINGS,
|
||||
DEFAULT_PHASE_MODELS,
|
||||
DEFAULT_FEATURE_TEMPLATES,
|
||||
SETTINGS_VERSION,
|
||||
CREDENTIALS_VERSION,
|
||||
PROJECT_SETTINGS_VERSION,
|
||||
@@ -139,6 +141,11 @@ export class SettingsService {
|
||||
// Migrate model IDs to canonical format
|
||||
const migratedModelSettings = this.migrateModelSettings(settings);
|
||||
|
||||
// Merge built-in feature templates: ensure all built-in templates exist in user settings.
|
||||
// User customizations (enabled/disabled state, order overrides) are preserved.
|
||||
// New built-in templates added in code updates are injected for existing users.
|
||||
const mergedFeatureTemplates = this.mergeBuiltInTemplates(settings.featureTemplates);
|
||||
|
||||
// Apply any missing defaults (for backwards compatibility)
|
||||
let result: GlobalSettings = {
|
||||
...DEFAULT_GLOBAL_SETTINGS,
|
||||
@@ -149,6 +156,7 @@ export class SettingsService {
|
||||
...settings.keyboardShortcuts,
|
||||
},
|
||||
phaseModels: migratedPhaseModels,
|
||||
featureTemplates: mergedFeatureTemplates,
|
||||
};
|
||||
|
||||
// Version-based migrations
|
||||
@@ -250,6 +258,32 @@ export class SettingsService {
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Merge built-in feature templates with user's stored templates.
|
||||
*
|
||||
* Ensures new built-in templates added in code updates are available to existing users
|
||||
* without overwriting their customizations (e.g., enabled/disabled state, custom order).
|
||||
* Built-in templates missing from stored settings are appended with their defaults.
|
||||
*
|
||||
* @param storedTemplates - Templates from user's settings file (may be undefined for new installs)
|
||||
* @returns Merged template list with all built-in templates present
|
||||
*/
|
||||
private mergeBuiltInTemplates(storedTemplates: FeatureTemplate[] | undefined): FeatureTemplate[] {
|
||||
if (!storedTemplates) {
|
||||
return DEFAULT_FEATURE_TEMPLATES;
|
||||
}
|
||||
|
||||
const storedIds = new Set(storedTemplates.map((t) => t.id));
|
||||
const missingBuiltIns = DEFAULT_FEATURE_TEMPLATES.filter((t) => !storedIds.has(t.id));
|
||||
|
||||
if (missingBuiltIns.length === 0) {
|
||||
return storedTemplates;
|
||||
}
|
||||
|
||||
// Append missing built-in templates after existing ones
|
||||
return [...storedTemplates, ...missingBuiltIns];
|
||||
}
|
||||
|
||||
/**
|
||||
* Migrate legacy enhancementModel/validationModel fields to phaseModels structure
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user