Merge remote-tracking branch 'origin/staging' into feat/granola-expansion

# Conflicts:
#	apps/sim/tools/generated/tool-ids.ts
#	apps/sim/tools/generated/tool-metadata.ts
#	apps/sim/tools/generated/tool-outputs.ts

Author: waleedlatif1

apps/docs/components/icons.tsx

@@ -9340,3 +9340,18 @@ export function ZohoDeskIcon(props: SVGProps<SVGSVGElement>) {
     </svg>
   )
 }
+
+export function PitchBookIcon(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      {...props}
+      viewBox='-3.16 0 102 101.7'
+      fill='currentColor'
+      xmlns='http://www.w3.org/2000/svg'
+      aria-hidden='true'
+    >
+      <path d='M75.43,0C16.66,4.78-7.6,53.48,2.06,84.09c5.67-8.73,16.21-18.24,37.78-21.76-1.25-25.79,8.08-43.79,35.59-62.33Z' />
+      <path d='M45.3,66.03c-14.85,2.43-25.18,6.46-31.65,12.57.2,8.16,2.53,16.13,6.77,23.1,5.02-12.27,21.5-20.95,46.55-21.01-6.1-29.4,7.53-56.33,28.71-74.41-10.48,1.55-20.75,4.31-30.61,8.21-16.13,15.54-22.14,35.57-19.77,51.55Z' />
+    </svg>
+  )
+}

apps/docs/components/ui/icon-mapping.ts

@@ -176,6 +176,7 @@ import {
   PersonaIcon,
   PineconeIcon,
   PipedriveIcon,
+  PitchBookIcon,
   PolymarketIcon,
   PostgresIcon,
   PosthogIcon,
@@ -466,6 +467,7 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   persona: PersonaIcon,
   pinecone: PineconeIcon,
   pipedrive: PipedriveIcon,
+  pitchbook: PitchBookIcon,
   polymarket: PolymarketIcon,
   postgresql: PostgresIcon,
   posthog: PosthogIcon,

apps/docs/content/docs/en/integrations/meta.json

@@ -188,6 +188,7 @@
     "pinecone",
     "pipedrive",
     "pipedrive-service-account",
+    "pitchbook",
     "polymarket",
     "postgresql",
     "posthog",

apps/docs/content/docs/en/integrations/pitchbook.mdx

@@ -249,6 +249,7 @@ import { PersonaBlock, PersonaBlockMeta } from '@/blocks/blocks/persona'
 import { PiBlock } from '@/blocks/blocks/pi'
 import { PineconeBlock, PineconeBlockMeta } from '@/blocks/blocks/pinecone'
 import { PipedriveBlock, PipedriveBlockMeta } from '@/blocks/blocks/pipedrive'
+import { PitchBookBlock, PitchBookBlockMeta } from '@/blocks/blocks/pitchbook'
 import { PolymarketBlock, PolymarketBlockMeta } from '@/blocks/blocks/polymarket'
 import { PostgreSQLBlock, PostgreSQLBlockMeta } from '@/blocks/blocks/postgresql'
 import { PostHogBlock, PostHogBlockMeta } from '@/blocks/blocks/posthog'
@@ -578,6 +579,7 @@ export const BLOCK_REGISTRY: Record<string, BlockConfig> = {
   pi: PiBlock,
   pinecone: PineconeBlock,
   pipedrive: PipedriveBlock,
+  pitchbook: PitchBookBlock,
   polymarket: PolymarketBlock,
   postgresql: PostgreSQLBlock,
   posthog: PostHogBlock,
@@ -886,6 +888,7 @@ export const BLOCK_META_REGISTRY: Record<string, BlockMeta> = {
   persona: PersonaBlockMeta,
   pinecone: PineconeBlockMeta,
   pipedrive: PipedriveBlockMeta,
+  pitchbook: PitchBookBlockMeta,
   polymarket: PolymarketBlockMeta,
   postgresql: PostgreSQLBlockMeta,
   posthog: PostHogBlockMeta,

apps/sim/blocks/blocks/pitchbook.ts

@@ -9340,3 +9340,18 @@ export function ZohoDeskIcon(props: SVGProps<SVGSVGElement>) {
     </svg>
   )
 }
+
+export function PitchBookIcon(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      {...props}
+      viewBox='-3.16 0 102 101.7'
+      fill='currentColor'
+      xmlns='http://www.w3.org/2000/svg'
+      aria-hidden='true'
+    >
+      <path d='M75.43,0C16.66,4.78-7.6,53.48,2.06,84.09c5.67-8.73,16.21-18.24,37.78-21.76-1.25-25.79,8.08-43.79,35.59-62.33Z' />
+      <path d='M45.3,66.03c-14.85,2.43-25.18,6.46-31.65,12.57.2,8.16,2.53,16.13,6.77,23.1,5.02-12.27,21.5-20.95,46.55-21.01-6.1-29.4,7.53-56.33,28.71-74.41-10.48,1.55-20.75,4.31-30.61,8.21-16.13,15.54-22.14,35.57-19.77,51.55Z' />
+    </svg>
+  )
+}

apps/sim/blocks/registry-maps.ts

@@ -49,6 +49,7 @@ import {
 } from '@/ee/workspace-forking/components/fork-sync/dependent-value'
 import {
   type ForkSyncController,
+  shouldReconfigureEntry,
   useForkSync,
 } from '@/ee/workspace-forking/components/fork-sync/use-fork-sync'
 
@@ -556,3 +557,71 @@ describe('useForkSync post-sync reset', () => {
     expect(get().dirty).toBe(true)
   })
 })
+
+describe('shouldReconfigureEntry', () => {
+  const entry = (overrides: Partial<ForkMappingEntry> = {}): ForkMappingEntry =>
+    ({
+      kind: 'credential',
+      sourceId: 'cred-src',
+      targetId: 'cred-tgt',
+      suggested: false,
+      ...overrides,
+    }) as ForkMappingEntry
+
+  it('is false for a settled non-custom-block mapping', () => {
+    // An unchanged credential mapping leaves its stored dependent picks valid, so its fields
+    // stay out of the way until something actually changes.
+    expect(shouldReconfigureEntry(entry(), {})).toBe(false)
+  })
+
+  it('is true for a custom block mapped to a DIFFERENT block, even once saved', () => {
+    // The regression: `parentChanged` drove the reconfigure UI off "was this edited in this
+    // session", so a saved mapping read as settled and the modal showed "no changes required"
+    // with no inputs. A custom block pointed elsewhere has sub-blocks keyed by the SOURCE
+    // block's field ids — they describe nothing on the target and nothing carries over — so it
+    // needs configuring for as long as the mapping stands, not just the session it was made in.
+    const saved = entry({
+      kind: 'custom-block',
+      sourceId: 'custom_block_prod01',
+      targetId: 'custom_block_uat0001',
+    })
+
+    expect(shouldReconfigureEntry(saved, {})).toBe(true)
+  })
+
+  it('is false for a custom block mapped to itself', () => {
+    // "Keep the same block across environments": the type never changes, so the source's own
+    // field ids still describe it and its values carry across untouched.
+    const identity = entry({
+      kind: 'custom-block',
+      sourceId: 'custom_block_prod01',
+      targetId: 'custom_block_prod01',
+    })
+
+    expect(shouldReconfigureEntry(identity, {})).toBe(false)
+  })
+
+  it('follows an in-session custom-block re-pick rather than the saved target', () => {
+    const saved = entry({
+      kind: 'custom-block',
+      sourceId: 'custom_block_prod01',
+      targetId: 'custom_block_uat0001',
+    })
+    const key = `${saved.kind}:${saved.sourceId}`
+
+    // Re-pointed back at itself in-session: nothing to configure.
+    expect(shouldReconfigureEntry(saved, { [key]: 'custom_block_prod01' })).toBe(false)
+    // Re-pointed at a third block: configure against that one.
+    expect(shouldReconfigureEntry(saved, { [key]: 'custom_block_sbx0001' })).toBe(true)
+  })
+
+  it('is false for an unmapped custom block, which the promote blocks instead', () => {
+    const unmapped = entry({
+      kind: 'custom-block',
+      sourceId: 'custom_block_prod01',
+      targetId: null,
+    })
+
+    expect(shouldReconfigureEntry(unmapped, {})).toBe(false)
+  })
+})

apps/sim/components/icons.tsx

@@ -236,9 +236,21 @@ const entryKey = (entry: ForkMappingEntry) => forkRefKey(entry)
  * the dependents). Pure over (entry, in-session targets) so the inline render, the Sync
  * gate, and the payload build share one predicate instead of drifting copies.
  */
-function shouldReconfigureEntry(entry: ForkMappingEntry, targets: Record<string, string>): boolean {
+export function shouldReconfigureEntry(
+  entry: ForkMappingEntry,
+  targets: Record<string, string>
+): boolean {
   const next = targets[entryKey(entry)] ?? entry.targetId ?? ''
   if (next === '') return false
+  // A custom block pointed at a DIFFERENT block needs its inputs configured for as long as
+  // that mapping stands, not only in the session where it was picked. Every other kind can
+  // fall through to the in-session test because an unchanged mapping leaves its stored
+  // dependent values valid — a Gmail label picked under the same credential still resolves.
+  // A custom block has no such continuity: its sub-blocks are keyed by the SOURCE block's
+  // Start field ids, so under a different target they describe fields that do not exist and
+  // nothing carries over. Treating it as settled once saved is what left the fields hidden
+  // behind "no changes required" on every sync after the first.
+  if (entry.kind === 'custom-block') return next !== entry.sourceId
   return entry.suggested || next !== (entry.targetId ?? '')
 }
 

apps/sim/ee/workspace-forking/components/fork-sync/use-fork-sync.test.tsx

@@ -174,6 +174,7 @@ import {
   PersonaIcon,
   PineconeIcon,
   PipedriveIcon,
+  PitchBookIcon,
   PolymarketIcon,
   PostgresIcon,
   PosthogIcon,
@@ -449,6 +450,7 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   persona: PersonaIcon,
   pinecone: PineconeIcon,
   pipedrive: PipedriveIcon,
+  pitchbook: PitchBookIcon,
   polymarket: PolymarketIcon,
   postgresql: PostgresIcon,
   posthog: PosthogIcon,