@@ -411,7 +411,7 @@ export const {service}PollingHandler: PollingProviderHandler = {
       await markWebhookSuccess(webhookId, logger)
       return 'success'
     } catch (error) {
-      logger.error(`[${requestId}] Error processing {service} webhook ${webhookId}:`, error)
+      logger.error('Error processing {service} webhook:', error)
       await markWebhookFailed(webhookId, logger)
       return 'failure'
     }
 
@@ -0,0 +1,65 @@
+---
+description: One pattern per job across the organization views (Settings, People, Integrations, Links, Home)
+paths:
+  - "apps/sim/platform/app/(shell)/{settings,people,integrations,links,home}/**"
+  - "apps/sim/platform/design-system/components/{status,modal,picker,settings-section,search-field,activity-row}/**"
+  - "apps/sim/app/o/*/**"
+---
+
+# Organization Views
+
+The organization views live in `apps/sim/platform/app/(shell)/` and take everything shared from
+`@/platform/design-system/components`. Each job below has one pattern. A view that differs needs a
+reason written where it differs; "it was already like that" is not one.
+
+| Job | Use | Never |
+| --- | --- | --- |
+| First read of a view | `QueryBoundary` (`query`, `failure`, `loadingLabel`, optional `empty`, `loading`), which renders `LoadingRows`, then `FailureNotice`, then `empty`, then `children(data)` | Inline `isPending ? … : error ? …`, a raw `<p>Loading…</p>`, a loading `InlineNotice` |
+| Loading | `LoadingRows` by default. A placeholder shaped like its content (`WidgetSkeleton`, usage charts) only where rows would misrepresent it | A second generic skeleton |
+| Failed read | `FailureNotice`, labelled Retry. `intent='warning'` where the read partly answered | A hand-built retry button or `InlineNotice` + `Button` |
+| Failed background refresh | `FailureNotice` outside the boundary, over the content it keeps | Replacing content already on screen |
+| Empty | `EmptyState`, with no create button when the page already has one. A picker's no-match line inside a dialog stays `Muted`, since a block would take over the dialog | `Muted` or a raw `<p>` anywhere else |
+| Confirm | `ConfirmDialog` (`target`, `title`, `confirmLabel`, `pendingLabel`, `onConfirm`, `safe` when nothing is lost). Removing a person, revoking an invite and any destructive row action always ask first | `Modal variant='confirm'`, `window.confirm`, an unconfirmed destructive action |
+| Save | `SaveActions`, end-aligned in the page flow under the fields it commits: Discard while dirty, then Save. Save is visible and disabled while clean | Save in a header, Save before Discard, a Cancel beside Discard |
+| Editing a server value | `useServerDraft`. Adopts a newer value while clean; while dirty it keeps the edits and sets `conflict`. Show `DraftConflictNotice`, and block Save until the viewer chooses | Seeding `useState` from a query once |
+| Autosave vs Save | One or the other per page. A page with `SaveActions` holds every field in one draft and writes it in one request. List actions with their own dialog, such as adding or removing a member, are not field edits | A page mixing both |
+| Create | A primary compact button in `SectionToolbar`, or in the page header on a page with one | Create in both the toolbar and the empty state |
+| Search over a section's rows | `SectionSearch subject='members'` | `SearchField` with its own copy, unless the search covers more than the subject's name |
+| Row | `ActivityRow` for a row that opens something, `SettingsRow` for a row holding a control | A hand-built row |
+| List of rows | `RowList` (`dividers` for a list read as one block). `ActivityRow density='comfortable'` in settings | `calc(-1 * var(--ui-row-inset))` around a list; styling a row's height from outside |
+| Row actions | `ActionMenu` with icon `I108`, destructive item last with a separator | The same action in the row and its menu |
+| Section heading | `SettingsSection title` (h2), `DetailHeader` for a sub-view's way back | A hand-written heading |
+| Toolbar | `SectionToolbar grow={<SectionSearch />}` with its actions as children | A hand-built flex row |
+
+## Failure feedback
+
+- Form validation is inline, on the field (`error`), once a save has been attempted.
+- A dialog's own action failing stays in the dialog: `Modal` shows a rejected `onConfirm`'s message and keeps the draft.
+- Any other action failing is a toast. Nothing fails silently.
+
+## Page gates
+
+Every page under `app/o/[organizationId]` calls
+`requireOrganizationViewer(organizationId, callbackUrl)` from `@/app/o/[organizationId]/viewer`. It
+redirects a signed-out viewer to sign-in and back, 404s a viewer with no access, and returns
+`{ userId, principal, surface }`. Never write `{ kind: 'session', ... }` in a page.
+
+## Dialogs
+
+`Modal` holds itself open while `onConfirm`'s promise or its `pending` prop runs. Escape, the backdrop
+and Close do nothing until it settles, including when the browser closes the `<dialog>` itself: once
+user activation is spent, `cancel` cannot be prevented, so `OverlayDialog` reopens from `close`.
+
+## Files
+
+- A section with more than one job splits by job: `group-detail.tsx` is the shell, `group-general-tab.tsx`
+  and `group-catalog-tabs.tsx` its bodies, `use-group-draft.ts` its write.
+- Merge logic worth a test is a pure module next to the view, such as `secrets-draft.ts`.
+- `section-parts/` holds what only settings needs: `SectionStack`, `FieldStack`, `SectionToolbar`,
+  `DetailHeader`, `HeadingRow`, `Muted`, `SectionSkeleton`, `DraftConflictNotice`. `useServerDraft` is in `_components/`, since Integrations uses it too.
+
+## Legacy workspace settings
+
+`apps/sim/app/workspace/*/settings/**` keeps `SettingsPanel` from `@/components/settings/settings-panel`,
+which owns chrome through `settings/[section]/layout.tsx`. The `add-settings-page` skill describes it.
+New organization work never imports it.
@@ -2,7 +2,6 @@
 description: Settings page layout and SettingsPanel design-system compliance
 paths:
   - "apps/sim/app/workspace/*/settings/**"
-  - "apps/sim/app/o/*/settings/**"
   - "apps/sim/app/workspace/*/{integrations,skills,upgrade}/**"
   - "apps/sim/app/workspace/*/components/{resource-tile,credential-detail}/**"
   - "apps/sim/components/{settings,permissions}/**"
 
@@ -0,0 +1,64 @@
+---
+description: "One pattern per job across the organization views (Settings, People, Integrations, Links, Home)"
+globs: ["apps/sim/platform/app/(shell)/{settings,people,integrations,links,home}/**","apps/sim/platform/design-system/components/{status,modal,picker,settings-section,search-field,activity-row}/**","apps/sim/app/o/*/**"]
+---
+
+<!-- Generated from .claude/rules/sim-platform-views.md by `bun run skills:sync`. Edit the source, not this file. -->
+
+# Organization Views
+
+The organization views live in `apps/sim/platform/app/(shell)/` and take everything shared from
+`@/platform/design-system/components`. Each job below has one pattern. A view that differs needs a
+reason written where it differs; "it was already like that" is not one.
+
+| Job | Use | Never |
+| --- | --- | --- |
+| First read of a view | `QueryBoundary` (`query`, `failure`, `loadingLabel`, optional `empty`, `loading`), which renders `LoadingRows`, then `FailureNotice`, then `empty`, then `children(data)` | Inline `isPending ? … : error ? …`, a raw `<p>Loading…</p>`, a loading `InlineNotice` |
+| Loading | `LoadingRows` by default. A placeholder shaped like its content (`WidgetSkeleton`, usage charts) only where rows would misrepresent it | A second generic skeleton |
+| Failed read | `FailureNotice`, labelled Retry. `intent='warning'` where the read partly answered | A hand-built retry button or `InlineNotice` + `Button` |
+| Failed background refresh | `FailureNotice` outside the boundary, over the content it keeps | Replacing content already on screen |
+| Empty | `EmptyState`, with no create button when the page already has one. A picker's no-match line inside a dialog stays `Muted`, since a block would take over the dialog | `Muted` or a raw `<p>` anywhere else |
+| Confirm | `ConfirmDialog` (`target`, `title`, `confirmLabel`, `pendingLabel`, `onConfirm`, `safe` when nothing is lost). Removing a person, revoking an invite and any destructive row action always ask first | `Modal variant='confirm'`, `window.confirm`, an unconfirmed destructive action |
+| Save | `SaveActions`, end-aligned in the page flow under the fields it commits: Discard while dirty, then Save. Save is visible and disabled while clean | Save in a header, Save before Discard, a Cancel beside Discard |
+| Editing a server value | `useServerDraft`. Adopts a newer value while clean; while dirty it keeps the edits and sets `conflict`. Show `DraftConflictNotice`, and block Save until the viewer chooses | Seeding `useState` from a query once |
+| Autosave vs Save | One or the other per page. A page with `SaveActions` holds every field in one draft and writes it in one request. List actions with their own dialog, such as adding or removing a member, are not field edits | A page mixing both |
+| Create | A primary compact button in `SectionToolbar`, or in the page header on a page with one | Create in both the toolbar and the empty state |
+| Search over a section's rows | `SectionSearch subject='members'` | `SearchField` with its own copy, unless the search covers more than the subject's name |
+| Row | `ActivityRow` for a row that opens something, `SettingsRow` for a row holding a control | A hand-built row |
+| List of rows | `RowList` (`dividers` for a list read as one block). `ActivityRow density='comfortable'` in settings | `calc(-1 * var(--ui-row-inset))` around a list; styling a row's height from outside |
+| Row actions | `ActionMenu` with icon `I108`, destructive item last with a separator | The same action in the row and its menu |
+| Section heading | `SettingsSection title` (h2), `DetailHeader` for a sub-view's way back | A hand-written heading |
+| Toolbar | `SectionToolbar grow={<SectionSearch />}` with its actions as children | A hand-built flex row |
+
+## Failure feedback
+
+- Form validation is inline, on the field (`error`), once a save has been attempted.
+- A dialog's own action failing stays in the dialog: `Modal` shows a rejected `onConfirm`'s message and keeps the draft.
+- Any other action failing is a toast. Nothing fails silently.
+
+## Page gates
+
+Every page under `app/o/[organizationId]` calls
+`requireOrganizationViewer(organizationId, callbackUrl)` from `@/app/o/[organizationId]/viewer`. It
+redirects a signed-out viewer to sign-in and back, 404s a viewer with no access, and returns
+`{ userId, principal, surface }`. Never write `{ kind: 'session', ... }` in a page.
+
+## Dialogs
+
+`Modal` holds itself open while `onConfirm`'s promise or its `pending` prop runs. Escape, the backdrop
+and Close do nothing until it settles, including when the browser closes the `<dialog>` itself: once
+user activation is spent, `cancel` cannot be prevented, so `OverlayDialog` reopens from `close`.
+
+## Files
+
+- A section with more than one job splits by job: `group-detail.tsx` is the shell, `group-general-tab.tsx`
+  and `group-catalog-tabs.tsx` its bodies, `use-group-draft.ts` its write.
+- Merge logic worth a test is a pure module next to the view, such as `secrets-draft.ts`.
+- `section-parts/` holds what only settings needs: `SectionStack`, `FieldStack`, `SectionToolbar`,
+  `DetailHeader`, `HeadingRow`, `Muted`, `SectionSkeleton`, `DraftConflictNotice`. `useServerDraft` is in `_components/`, since Integrations uses it too.
+
+## Legacy workspace settings
+
+`apps/sim/app/workspace/*/settings/**` keeps `SettingsPanel` from `@/components/settings/settings-panel`,
+which owns chrome through `settings/[section]/layout.tsx`. The `add-settings-page` skill describes it.
+New organization work never imports it.
@@ -1,6 +1,6 @@
 ---
 description: "Settings page layout and SettingsPanel design-system compliance"
-globs: ["apps/sim/app/workspace/*/settings/**","apps/sim/app/o/*/settings/**","apps/sim/app/workspace/*/{integrations,skills,upgrade}/**","apps/sim/app/workspace/*/components/{resource-tile,credential-detail}/**","apps/sim/components/{settings,permissions}/**","apps/sim/ee/**/components/**"]
+globs: ["apps/sim/app/workspace/*/settings/**","apps/sim/app/workspace/*/{integrations,skills,upgrade}/**","apps/sim/app/workspace/*/components/{resource-tile,credential-detail}/**","apps/sim/components/{settings,permissions}/**","apps/sim/ee/**/components/**"]
 ---
 
 <!-- Generated from .claude/rules/sim-settings-pages.md by `bun run skills:sync`. Edit the source, not this file. -->
 
@@ -5,7 +5,7 @@ This file (also `AGENTS.md`) holds the repo-wide rules. Area detail lives in `.c
 ## Global Standards
 
 - **Package manager**: `bun` and `bunx`, never `npm` and `npx`.
-- **Logging**: `createLogger` from `@sim/logger`; `logger.info` / `logger.warn` / `logger.error`, never `console.log`. Inside `withRouteHandler` the logger already carries the request ID — no manual `withMetadata({ requestId })`.
+- **Logging**: `createLogger` from `@sim/logger`; `logger.info` / `logger.warn` / `logger.error`, never `console.log`. Messages are static text; ids go in metadata (`logger.info('Sync started', { requestId, documentId })`), never a `[${requestId}]` tag or an interpolated request id, so lines group and filter by field (`check:source-conventions` rule `log-message-tag`). Inside `withRouteHandler` every line already carries the request ID, so a `generateRequestId()` id there needs no field and no manual `withMetadata({ requestId })`.
 - **Comments**: name things so the code explains itself. TSDoc documents exported APIs and non-obvious modules. An inline `//` is only for a terse, non-obvious *why*, or for a script-enforced `// <tag>: <reason>` annotation (`boundary-raw-fetch`, `double-cast-allowed`, `boundary-raw-json`, `untyped-response`, `rq-lint-allow`, `client-boundary-allow`, `utils-lint-allow`, …). History belongs in the commit message. No `====` separators, commented-out code, or ESLint directives (`eslint-disable`/`eslint-enable`; nothing runs ESLint; `check:comment-hygiene` enforces all three). The `/you-might-not-need-a-comment` skill applies this to a diff.
 - **ID generation**: `generateId()` (UUID v4, the default) or `generateShortId(size?)` (URL-safe, 21 chars by default) from `@sim/utils/id` — never `crypto.randomUUID()`, `nanoid`, or `uuid`. Both use `crypto.getRandomValues()`, so they also work in non-secure (HTTP) browsers. For other randomness, `@sim/utils/random` (`randomInt`, `randomFloat`, `randomItem`, `generateRandomBytes`, `generateRandomHex`) — never `Math.random()` or `crypto.randomBytes()`.
 - **Common utilities**: use the shared helpers from the `@sim/utils/<module>` subpaths instead of inline implementations (`check:utils` bans most of the inline forms below):
 
@@ -5,7 +5,7 @@ This file (also `AGENTS.md`) holds the repo-wide rules. Area detail lives in `.c
 ## Global Standards
 
 - **Package manager**: `bun` and `bunx`, never `npm` and `npx`.
-- **Logging**: `createLogger` from `@sim/logger`; `logger.info` / `logger.warn` / `logger.error`, never `console.log`. Inside `withRouteHandler` the logger already carries the request ID — no manual `withMetadata({ requestId })`.
+- **Logging**: `createLogger` from `@sim/logger`; `logger.info` / `logger.warn` / `logger.error`, never `console.log`. Messages are static text; ids go in metadata (`logger.info('Sync started', { requestId, documentId })`), never a `[${requestId}]` tag or an interpolated request id, so lines group and filter by field (`check:source-conventions` rule `log-message-tag`). Inside `withRouteHandler` every line already carries the request ID, so a `generateRequestId()` id there needs no field and no manual `withMetadata({ requestId })`.
 - **Comments**: name things so the code explains itself. TSDoc documents exported APIs and non-obvious modules. An inline `//` is only for a terse, non-obvious *why*, or for a script-enforced `// <tag>: <reason>` annotation (`boundary-raw-fetch`, `double-cast-allowed`, `boundary-raw-json`, `untyped-response`, `rq-lint-allow`, `client-boundary-allow`, `utils-lint-allow`, …). History belongs in the commit message. No `====` separators, commented-out code, or ESLint directives (`eslint-disable`/`eslint-enable`; nothing runs ESLint; `check:comment-hygiene` enforces all three). The `/you-might-not-need-a-comment` skill applies this to a diff.
 - **ID generation**: `generateId()` (UUID v4, the default) or `generateShortId(size?)` (URL-safe, 21 chars by default) from `@sim/utils/id` — never `crypto.randomUUID()`, `nanoid`, or `uuid`. Both use `crypto.getRandomValues()`, so they also work in non-secure (HTTP) browsers. For other randomness, `@sim/utils/random` (`randomInt`, `randomFloat`, `randomItem`, `generateRandomBytes`, `generateRandomHex`) — never `Math.random()` or `crypto.randomBytes()`.
 - **Common utilities**: use the shared helpers from the `@sim/utils/<module>` subpaths instead of inline implementations (`check:utils` bans most of the inline forms below):
 
@@ -426,6 +426,7 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   fireflies_v2: FirefliesIcon,
   fivetran: FivetranIcon,
   flint: FlintIcon,
+  flow: ApiIcon,
   function: CodeIcon,
   gamma: GammaIcon,
   generic: WebhookIcon,
@@ -490,6 +491,7 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   intercom: IntercomIcon,
   intercom_v2: IntercomIcon,
   intune: IntuneIcon,
+  jama: ApiIcon,
   jina: JinaAIIcon,
   jira: JiraIcon,
   jira_service_management: JiraServiceManagementIcon,
 
@@ -168,6 +168,7 @@ sim credentials update <credentialId> [options]
 | `--service-account-json <value>` | No | Write-only provider service-account JSON configuration, including Oracle Database connection fields. |
 | `--api-token <value>` | No | Write-only provider API token. |
 | `--domain <value>` | No | Provider account domain. |
+| `--provider-workspace-id <value>` | No | Provider workspace identifier, separate from the Sim workspace. |
 | `--atlassian-product <value>` | No | Atlassian product to verify; defaults to Jira on create and preserves the saved product on reconnect. Accepted values: `jira`, `confluence`. |
 | `--signing-secret <value>` | No | Write-only webhook signing secret. |
 | `--bot-token <value>` | No | Write-only bot token. |
Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ export const {service}PollingHandler: PollingProviderHandler = {`
`411`	`411`	`await markWebhookSuccess(webhookId, logger)`
`412`	`412`	`return 'success'`
`413`	`413`	`} catch (error) {`
`414`		- logger.error(`[${requestId}] Error processing {service} webhook ${webhookId}:`, error)
	`414`	`+ logger.error('Error processing {service} webhook:', error)`
`415`	`415`	`await markWebhookFailed(webhookId, logger)`
`416`	`416`	`return 'failure'`
`417`	`417`	`}`