feat(FN-5035): merge fusion/fn-5035

2026-05-18 18:07:53 -07:00
parent f46629ef10
commit af7367ab99
9 changed files with 128 additions and 24 deletions
--- a/packages/core/src/settings-schema.ts
+++ b/packages/core/src/settings-schema.ts
@@ -100,6 +100,7 @@ export const DEFAULT_GLOBAL_SETTINGS = {
  persistAgentThinkingLog: false,
  agentMemoryInclusionMode: "full",
  secretsAccessPolicy: undefined,
+  secretsSyncPassphraseConfigured: false,
  researchGlobalDefaults: {
    searchProvider: undefined,
    synthesisProvider: undefined,
@@ -200,7 +201,6 @@ export const DEFAULT_PROJECT_SETTINGS = {
  owningNodeHandoffPolicy: "reassign-to-local",
  defaultNodeId: undefined,
  secretsEnv: undefined,
-  secretsSyncPassphrase: undefined,
  worktreeInitCommand: undefined,
  testCommand: undefined,
  buildCommand: undefined,