Merge remote-tracking branch 'origin/staging' into feat/connector-service-account-auth

# Conflicts:
#	packages/db/migrations/meta/0322_snapshot.json
#	packages/db/migrations/meta/_journal.json

Author: icecrasher321

apps/desktop/src/main/browser-agent/session.test.ts

@@ -4661,12 +4661,14 @@ describe('reopening a closed tab', () => {
 })
 
 describe('importAgentCookies', () => {
-  /** Points the mocked partition at a cookie jar and returns its `set` spy. */
-  function withCookieJar(set: ReturnType<typeof vi.fn>): SessionModule {
+  function withCookieJar(
+    set: ReturnType<typeof vi.fn>,
+    flushStore = vi.fn(async () => {})
+  ): SessionModule {
     // The partition is resolved per call, not captured at module load, so
     // re-mocking it here is enough — no module reload required.
     vi.mocked(electronSession.fromPartition).mockReturnValue({
-      cookies: { set },
+      cookies: { set, flushStore },
     } as unknown as ReturnType<typeof electronSession.fromPartition>)
     return sessionModule
   }
@@ -4683,14 +4685,17 @@ describe('importAgentCookies', () => {
 
   it('writes every cookie into the dedicated browser profile', async () => {
     const set = vi.fn(async () => {})
-    const session = withCookieJar(set)
+    const flushStore = vi.fn(async () => {})
+    const session = withCookieJar(set, flushStore)
 
     const result = await session.importAgentCookies([cookie('a'), cookie('b')])
 
     expect(result).toEqual({ imported: 2, failed: 0 })
     expect(electronSession.fromPartition).toHaveBeenCalledWith('persist:sim-browser-agent')
     expect(set).toHaveBeenCalledTimes(2)
     expect(set).toHaveBeenNthCalledWith(1, cookie('a'))
+    expect(flushStore).toHaveBeenCalledOnce()
+    expect(flushStore.mock.invocationCallOrder[0]).toBeGreaterThan(set.mock.invocationCallOrder[1])
   })
 
   it('counts a rejected cookie without losing the rest', async () => {
@@ -4709,9 +4714,22 @@ describe('importAgentCookies', () => {
 
   it('does nothing when there is nothing to import', async () => {
     const set = vi.fn(async () => {})
-    const session = withCookieJar(set)
+    const flushStore = vi.fn(async () => {})
+    const session = withCookieJar(set, flushStore)
 
     await expect(session.importAgentCookies([])).resolves.toEqual({ imported: 0, failed: 0 })
     expect(set).not.toHaveBeenCalled()
+    expect(flushStore).not.toHaveBeenCalled()
+  })
+
+  it('does not report a durable import when flushing to disk fails', async () => {
+    const session = withCookieJar(
+      vi.fn(async () => {}),
+      vi.fn(async () => {
+        throw new Error('Disk unavailable')
+      })
+    )
+
+    await expect(session.importAgentCookies([cookie('a')])).rejects.toThrow('Disk unavailable')
   })
 })

apps/desktop/src/main/browser-agent/session.ts

@@ -1196,6 +1196,7 @@ export async function importAgentCookies(
       failed += 1
     }
   }
+  if (imported > 0) await jar.flushStore()
   return { imported, failed }
 }
 

apps/desktop/src/main/browser-credentials/vault.test.ts

@@ -39,6 +39,25 @@ const CANDIDATES = [
 ]
 
 describe('CredentialVault', () => {
+  it('retains imported logins when the vault is reopened and does not duplicate a re-import', async () => {
+    const original = new CredentialVault(vaultPath, encryption())
+    await original.importCredentials(CANDIDATES, 'replace')
+    const metadata = await original.list()
+
+    const reopened = new CredentialVault(vaultPath, encryption())
+    expect(await reopened.list()).toEqual(metadata)
+    expect(await reopened.readForFill(metadata[0].id, metadata[0].origin)).toEqual({
+      username: 'ada',
+      password: 'hunter2',
+    })
+    expect(await reopened.importCredentials(CANDIDATES, 'replace')).toEqual({
+      added: 0,
+      updated: 0,
+      skipped: 2,
+    })
+    expect(await reopened.list()).toEqual(metadata)
+  })
+
   it('stores and lists credentials without their passwords', async () => {
     const vault = new CredentialVault(vaultPath, encryption())
 

apps/desktop/src/main/browser-import/import-service.test.ts

@@ -616,26 +616,33 @@ describe('importChromePasswords', () => {
     expect(importCredentials).toHaveBeenCalledWith([expect.any(Object)], 'replace')
   })
 
-  it('keeps credentials from one password store when the other is unreadable', async () => {
-    const localPath = '/arc/Default/Login Data'
-    const accountPath = '/arc/Default/Login Data For Account'
-    const deps = createDeps({
-      listProfiles: async () => [
-        { ...PROFILES[1], id: 'arc:Default', loginDataPaths: [localPath, accountPath] },
-      ],
-      readPasswords: async (path) => {
-        if (path === accountPath) {
-          throw new ImportFailure('unsupported-schema', 'unknown account-store schema')
-        }
-        return readPasswords()
-      },
-    })
+  it.each(['local', 'account'])(
+    'reports a partial import when the %s password store is unreadable',
+    async (failedStore) => {
+      const localPath = '/arc/Default/Login Data'
+      const accountPath = '/arc/Default/Login Data For Account'
+      const deps = createDeps({
+        listProfiles: async () => [
+          { ...PROFILES[1], id: 'arc:Default', loginDataPaths: [localPath, accountPath] },
+        ],
+        readPasswords: async (path) => {
+          if (path === (failedStore === 'local' ? localPath : accountPath)) {
+            throw new ImportFailure('unsupported-schema', 'unknown account-store schema')
+          }
+          return readPasswords()
+        },
+      })
 
-    await expect(importChromePasswords('arc:Default', 'replace', deps)).resolves.toMatchObject({
-      passwordsAdded: 1,
-      passwordsSkipped: 0,
-    })
-  })
+      await expect(importChromeData('arc:Default', 'replace', deps)).resolves.toMatchObject({
+        cookies: { cookiesImported: 1 },
+        passwords: {
+          passwordsAdded: 1,
+          passwordsSkipped: 0,
+          error: 'unsupported-schema',
+        },
+      })
+    }
+  )
 
   it('surfaces a failed password store when the other store only has unreadable rows', async () => {
     const localPath = '/arc/Default/Login Data'

apps/desktop/src/main/browser-import/import-service.ts

@@ -302,6 +302,7 @@ async function runPasswordImport(
     passwordsAdded: outcome.added,
     passwordsUpdated: outcome.updated,
     passwordsSkipped: outcome.skipped + read.skipped,
+    ...(read.error ? { error: read.error } : {}),
   }
   logger.info('Chrome password import finished', {
     added: result.passwordsAdded,
@@ -321,14 +322,15 @@ async function runPasswordImport(
  * source order breaks ties deterministically before applying the vault policy.
  *
  * One damaged store does not discard credentials already read from the other.
+ * A partial read carries its failure to the UI alongside the imported counts.
  * If no store can produce any useful signal, the first concrete reader error
  * is surfaced instead of reporting a misleading successful import of zero.
  */
 async function readProfilePasswords(
   paths: readonly string[],
   key: Buffer,
   deps: ImportServiceDeps
-): Promise<ReadPasswordsResult> {
+): Promise<ReadPasswordsResult & { error?: BrowserPasswordImportResult['error'] }> {
   const combined: ReadPasswordsResult = { credentials: [], skipped: 0, rowsSeen: 0 }
   const credentialIndexes = new Map<string, number>()
   let successfulReads = 0
@@ -379,6 +381,7 @@ async function readProfilePasswords(
   if (firstFailure !== undefined) {
     // Category only: database names and paths are deliberately absent.
     logger.warn('Could not read every password store in the selected browser profile')
+    return { ...combined, error: categorize(firstFailure, 'password') }
   }
   return combined
 }

apps/docs/components/icons.tsx

@@ -2710,6 +2710,25 @@ export function BrexIcon(props: SVGProps<SVGSVGElement>) {
   )
 }
 
+/**
+ * Official QuickBooks circular mark, cropped from the user-supplied
+ * Intuit_QuickBooks_logo.svg wordmark.
+ */
+export function QuickBooksIcon(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg {...props} viewBox='0 0 61.54 61.54' fill='none' xmlns='http://www.w3.org/2000/svg'>
+      <path
+        fill='#2CA01C'
+        d='M30.77 61.54c16.99 0 30.77-13.78 30.77-30.77S47.76 0 30.77 0 0 13.78 0 30.77s13.77 30.77 30.77 30.77Z'
+      />
+      <path
+        fill='#FFF'
+        d='M20.51 18.8c-6.61 0-11.97 5.36-11.97 11.97s5.35 11.96 11.97 11.96h1.71v-4.44h-1.71c-4.15 0-7.52-3.37-7.52-7.52 0-4.15 3.37-7.52 7.52-7.52h4.11V46.5c0 2.45 1.99 4.44 4.44 4.44V18.8h-8.55Zm20.52 23.93c6.61 0 11.97-5.36 11.97-11.96S47.65 18.81 41.03 18.81h-1.71v4.44h1.71c4.15 0 7.52 3.37 7.52 7.52s-3.37 7.52-7.52 7.52h-4.11V15.04c0-2.45-1.99-4.44-4.44-4.44v32.13h8.55Z'
+      />
+    </svg>
+  )
+}
+
 export function BrightDataIcon(props: SVGProps<SVGSVGElement>) {
   return (
     <svg
@@ -6845,6 +6864,32 @@ export function SecretsManagerIcon(props: SVGProps<SVGSVGElement>) {
   )
 }
 
+export function SSMIcon(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      {...props}
+      viewBox='5 5 70 70'
+      version='1.1'
+      xmlns='http://www.w3.org/2000/svg'
+      xmlnsXlink='http://www.w3.org/1999/xlink'
+    >
+      <g
+        id='Icon-Architecture/64/Arch_AWS-Systems-Manager_64'
+        stroke='none'
+        strokeWidth='1'
+        fill='none'
+        fillRule='evenodd'
+      >
+        <path
+          d='M47,54.998 L60,54.998 L60,56.998 L47,56.998 L47,58.999 L45,58.999 L45,56.998 L41,56.998 L41,54.998 L45,54.998 L45,53.998 L47,53.998 L47,54.998 Z M51,48.997 L60,48.997 L60,50.997 L51,50.997 L51,52.998 L49,52.998 L49,50.997 L41,50.997 L41,48.997 L49,48.997 L49,47.997 L51,47.997 L51,48.997 Z M56,42.996 L60,42.996 L60,44.997 L56,44.997 L56,46.997 L54,46.997 L54,44.997 L41,44.997 L41,42.996 L54,42.996 L54,41.996 L56,41.996 L56,42.996 Z M21,46.997 L30,46.997 L30,48.997 L21,48.997 C19.745,48.997 18.404,48.62 17.413,47.989 C15.393,46.71 12,43.715 12,38.042 C12,31.161 16.665,28.635 19.38,27.75 L19.326,26.834 C19.324,21.166 23.074,15.354 28.046,13.257 C33.869,10.781 40.036,12.008 44.545,16.537 C45.944,17.939 47.096,19.648 47.978,21.631 C49.749,20.156 52.16,19.651 54.4,20.386 C57.247,21.32 59.019,23.951 59.227,27.494 C62.065,28.173 68,30.508 68,38.132 C68,38.417 67.989,38.692 67.978,38.955 L65.979,38.902 C65.989,38.635 66,38.389 66,38.132 C66,31.398 60.443,29.706 58.054,29.292 C57.784,29.245 57.546,29.091 57.394,28.864 C57.243,28.639 57.19,28.363 57.246,28.098 C57.217,25.117 55.956,23.001 53.776,22.286 C51.823,21.643 49.677,22.352 48.434,24.044 C48.214,24.341 47.853,24.497 47.482,24.44 C47.116,24.387 46.81,24.135 46.686,23.786 C45.853,21.443 44.656,19.48 43.129,17.951 C39.216,14.019 33.867,12.955 28.826,15.099 C24.618,16.873 21.324,22.002 21.324,26.775 L21.423,28.429 C21.451,28.907 21.136,29.338 20.671,29.456 C18.18,30.09 14,32.049 14,38.042 C14,42.521 16.438,45.005 18.485,46.3 C19.16,46.731 20.123,46.997 21,46.997 L21,46.997 Z M66,52.318 L64.236,52.217 C63.763,52.192 63.312,52.518 63.204,52.996 C62.866,54.494 62.278,55.914 61.456,57.216 C61.195,57.63 61.271,58.172 61.637,58.498 L62.954,59.672 L59.673,62.954 L58.502,61.641 C58.176,61.274 57.633,61.2 57.222,61.461 C55.92,62.283 54.499,62.872 52.997,63.211 C52.521,63.319 52.191,63.756 52.22,64.244 L52.32,66 L47.68,66 L47.78,64.242 C47.809,63.754 47.479,63.317 47.003,63.209 C45.505,62.871 44.084,62.281 42.78,61.458 C42.367,61.196 41.825,61.271 41.5,61.638 L40.326,62.953 L37.046,59.672 L38.361,58.5 C38.726,58.174 38.802,57.632 38.541,57.219 C37.72,55.917 37.132,54.497 36.794,52.996 C36.687,52.518 36.209,52.192 35.762,52.217 L34,52.318 L34,47.677 L35.768,47.778 C36.233,47.804 36.691,47.477 36.8,47 C37.139,45.505 37.728,44.086 38.55,42.785 C38.811,42.371 38.734,41.829 38.37,41.504 L37.046,40.323 L40.327,37.041 L41.508,38.365 C41.834,38.729 42.376,38.804 42.787,38.544 C44.087,37.724 45.505,37.137 47.003,36.799 C47.479,36.691 47.809,36.254 47.78,35.766 L47.68,33.995 L52.32,33.995 L52.22,35.768 C52.191,36.256 52.521,36.692 52.997,36.8 C54.492,37.139 55.909,37.726 57.211,38.547 C57.622,38.808 58.165,38.732 58.49,38.368 L59.673,37.041 L62.954,40.323 L61.633,41.501 C61.269,41.827 61.192,42.368 61.453,42.782 C62.275,44.083 62.864,45.503 63.202,47 C63.31,47.476 63.763,47.804 64.234,47.778 L66,47.677 L66,52.318 Z M66.943,45.62 L64.942,45.734 C64.617,44.589 64.16,43.487 63.579,42.445 L65.076,41.11 C65.281,40.927 65.402,40.668 65.41,40.392 C65.418,40.118 65.312,39.851 65.117,39.657 L60.339,34.878 C60.145,34.683 59.868,34.571 59.604,34.586 C59.328,34.594 59.069,34.714 58.886,34.919 L57.546,36.421 C56.505,35.841 55.406,35.386 54.263,35.06 L54.377,33.052 C54.393,32.777 54.295,32.508 54.105,32.308 C53.917,32.108 53.654,31.995 53.379,31.995 L46.621,31.995 C46.346,31.995 46.083,32.108 45.895,32.308 C45.705,32.508 45.607,32.777 45.623,33.052 L45.737,35.058 C44.592,35.383 43.492,35.839 42.452,36.418 L41.114,34.919 C40.931,34.714 40.672,34.594 40.396,34.586 C40.113,34.573 39.855,34.683 39.661,34.878 L34.883,39.657 C34.688,39.851 34.582,40.118 34.59,40.392 C34.598,40.667 34.719,40.927 34.924,41.11 L36.424,42.448 C35.843,43.49 35.386,44.59 35.06,45.734 L33.057,45.62 C32.789,45.602 32.513,45.703 32.313,45.891 C32.113,46.08 32,46.343 32,46.618 L32,53.377 C32,53.652 32.113,53.915 32.313,54.104 C32.513,54.292 32.79,54.39 33.057,54.375 L35.053,54.261 C35.378,55.409 35.834,56.511 36.415,57.554 L34.924,58.884 C34.719,59.067 34.598,59.327 34.59,59.602 C34.582,59.877 34.688,60.144 34.883,60.338 L39.661,65.117 C39.855,65.312 40.138,65.419 40.396,65.41 C40.672,65.402 40.932,65.281 41.114,65.076 L42.444,63.583 C43.487,64.166 44.59,64.624 45.736,64.951 L45.623,66.943 C45.607,67.217 45.705,67.486 45.895,67.687 C46.083,67.887 46.346,68 46.621,68 L53.379,68 C53.654,68 53.917,67.887 54.106,67.687 C54.295,67.486 54.393,67.217 54.377,66.943 L54.264,64.953 C55.412,64.625 56.515,64.168 57.558,63.586 L58.886,65.076 C59.068,65.281 59.328,65.402 59.604,65.41 C59.871,65.422 60.145,65.312 60.339,65.117 L65.117,60.338 C65.312,60.144 65.418,59.877 65.41,59.602 C65.402,59.327 65.281,59.067 65.075,58.884 L63.582,57.552 C64.163,56.509 64.619,55.407 64.945,54.261 L66.943,54.375 C67.213,54.39 67.487,54.292 67.687,54.104 C67.887,53.915 68,53.652 68,53.377 L68,46.618 C68,46.343 67.887,46.08 67.687,45.891 C67.487,45.703 67.214,45.603 66.943,45.62 L66.943,45.62 Z'
+          id='AWS-Systems-Manager_Icon_64_Squid'
+          fill='currentColor'
+        />
+      </g>
+    </svg>
+  )
+}
+
 export function SQSIcon(props: SVGProps<SVGSVGElement>) {
   return (
     <svg
@@ -6953,6 +6998,33 @@ export function AthenaIcon(props: SVGProps<SVGSVGElement>) {
   )
 }
 
+export function CloudTrailIcon(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      {...props}
+      viewBox='5 5 70.002 70.002'
+      version='1.1'
+      xmlns='http://www.w3.org/2000/svg'
+      xmlnsXlink='http://www.w3.org/1999/xlink'
+    >
+      <g
+        id='Icon-Architecture/64/Arch_AWS-Cloud-Trail_64'
+        stroke='none'
+        strokeWidth='1'
+        fill='none'
+        fillRule='evenodd'
+        transform='translate(40, 40) scale(1.25) translate(-40, -40)'
+      >
+        <path
+          d='M25,52.996 L29,52.996 L29,50.994 L25,50.994 L25,52.996 Z M59.971,38.163 C59.746,35.126 58.261,32.89 55.902,32.1 C54.003,31.467 51.911,31.914 50.318,33.213 C49.352,31.308 47.9,29.442 46.702,28.26 C42.406,24.019 37.668,22.938 32.616,25.045 C28.106,26.922 24,33.087 24,37.981 L24,38.171 C21.293,39.086 19.109,41.074 18.074,43.609 L19.926,44.366 C21.245,41.135 24.332,40.122 25.247,39.889 C25.69,39.776 26,39.377 26,38.919 L26,37.981 C26,33.936 29.657,28.445 33.385,26.893 C37.68,25.103 41.578,26.011 45.298,29.685 C46.88,31.246 48.427,33.561 49.06,35.318 C49.184,35.664 49.488,35.913 49.852,35.968 C50.212,36.023 50.577,35.874 50.799,35.58 C51.904,34.11 53.696,33.474 55.269,33.999 C57.004,34.581 58,36.397 58,38.982 C58,39.472 58.354,39.889 58.836,39.969 C59.569,40.091 66,41.352 66,47.991 C66,54.868 59.281,54.996 59,54.998 L36,54.998 L36,57 L59.002,57 C62.114,56.994 68,55.104 68,47.991 C68,41.784 63.279,38.989 59.971,38.163 L59.971,38.163 Z M31,52.996 L45,52.996 L45,50.994 L31,50.994 L31,52.996 Z M27,57 L33,57 L33,54.998 L27,54.998 L27,57 Z M12,57 L15,57 L15,54.998 L12,54.998 L12,57 Z M15,48.992 L24,48.992 L24,46.99 L15,46.99 L15,48.992 Z M13,52.996 L23,52.996 L23,50.994 L13,50.994 L13,52.996 Z M27,48.992 L34,48.992 L34,46.99 L27,46.99 L27,48.992 Z M17,57 L25,57 L25,54.998 L17,54.998 L17,57 Z'
+          id='AWS-Cloud-Trail_Icon_64_Squid'
+          fill='currentColor'
+        />
+      </g>
+    </svg>
+  )
+}
+
 export function CloudWatchIcon(props: SVGProps<SVGSVGElement>) {
   return (
     <svg

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

@@ -44,6 +44,7 @@ import {
   ClickUpIcon,
   CloudFormationIcon,
   CloudflareIcon,
+  CloudTrailIcon,
   CloudWatchIcon,
   CodePipelineIcon,
   ConfluenceIcon,
@@ -194,6 +195,7 @@ import {
   PulseIcon,
   QdrantIcon,
   QuartrIcon,
+  QuickBooksIcon,
   QuiverIcon,
   RabbitmqIcon,
   RailwayIcon,
@@ -234,6 +236,7 @@ import {
   SportmonksIcon,
   SQSIcon,
   SquareIcon,
+  SSMIcon,
   SshIcon,
   STSIcon,
   STTIcon,
@@ -317,6 +320,7 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   clickup: ClickUpIcon,
   cloudflare: CloudflareIcon,
   cloudformation: CloudFormationIcon,
+  cloudtrail: CloudTrailIcon,
   cloudwatch: CloudWatchIcon,
   codepipeline: CodePipelineIcon,
   confluence: ConfluenceIcon,
@@ -500,6 +504,7 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   pulse_v2: PulseIcon,
   qdrant: QdrantIcon,
   quartr: QuartrIcon,
+  quickbooks: QuickBooksIcon,
   quiver: QuiverIcon,
   rabbitmq: RabbitmqIcon,
   railway: RailwayIcon,
@@ -546,6 +551,7 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   sqs: SQSIcon,
   square: SquareIcon,
   ssh: SshIcon,
+  ssm: SSMIcon,
   stagehand: StagehandIcon,
   stripe: StripeIcon,
   sts: STSIcon,