mirror of
https://github.com/AutoMaker-Org/automaker.git
synced 2026-02-02 08:33:36 +00:00
merge: integrate v0.13.0rc with React Query refactor
Resolved conflict in use-project-settings-loader.ts: - Keep React Query approach from upstream - Add phaseModelOverrides loading for provider model persistence - Update both currentProject and projects array to keep in sync
This commit is contained in:
@@ -1029,6 +1029,18 @@ export interface GlobalSettings {
|
||||
* Each PhaseModelEntry can specify a providerId for provider-specific models.
|
||||
*/
|
||||
activeClaudeApiProfileId?: string | null;
|
||||
|
||||
/**
|
||||
* Per-worktree auto mode settings
|
||||
* Key: "${projectId}::${branchName ?? '__main__'}"
|
||||
*/
|
||||
autoModeByWorktree?: Record<
|
||||
string,
|
||||
{
|
||||
maxConcurrency: number;
|
||||
branchName: string | null;
|
||||
}
|
||||
>;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1308,6 +1320,7 @@ export const DEFAULT_GLOBAL_SETTINGS: GlobalSettings = {
|
||||
// Deprecated - kept for migration
|
||||
claudeApiProfiles: [],
|
||||
activeClaudeApiProfileId: null,
|
||||
autoModeByWorktree: {},
|
||||
};
|
||||
|
||||
/** Default credentials (empty strings - user must provide API keys) */
|
||||
|
||||
Reference in New Issue
Block a user