Merge branch 'wip/fx23-copy' into wip/platform-org-wiring

Author: waleedlatif1

.claude/rules/sim-platform-views.md

@@ -19,6 +19,7 @@ like that" is not one.
 
 | Job | Use | Never |
 | --- | --- | --- |
+| Explain a field, dialog or row | Its label, placeholder and options (`Access keys (long-lived)`); `error` for validation, `disabledReason` for a locked control, the dialog's Setup guide for steps | A `hint`, form `Modal` `description`, written `SettingsRow`/`DetailHeader` subtitle or data `hint` (`check:platform-design` `helper-copy`; a line that must stay is named in `HELPER_COPY_OWNERS`) |
 | First read of a view | Render nothing for data-backed content while pending (static chrome renders at once), `FailureNotice` when the read fails, `EmptyState` when it settles empty. Read the query's `status`, not an empty list. An action's own pending label (`pendingLabel`, a Load action's `Loading…`) is feedback, not loading copy | A skeleton, shimmer, placeholder rows or loading copy (`check:platform-design` `loading-copy`); a pending hint, placeholder or detail line; treating empty as loading |
 | Failed read | `FailureNotice`, labelled Retry. `intent='warning'` where the read partly answered | A hand-built retry button or `InlineNotice` + `Button` |
 | Failed background refresh | `FailureNotice` above the content it keeps | Replacing content already on screen |

.claude/rules/sim-ui-copy.md

@@ -13,7 +13,7 @@ paths:
 
 **Do not add subtitles, helper text, or descriptive copy beneath headings, labels, cards, or settings by default.** Prefer one concise, self-explanatory heading or label. Only add supporting copy when the user explicitly asks for it, or when it is necessary to prevent misunderstanding or error — and never use it to restate the heading.
 
-This applies to app UI outside the Platform: settings rows, modals, panels, cards, list rows, empty states, form fields, and section headers. Platform views (`app/(product)`, `platform`) follow `apps/sim/platform/AGENTS.md`; marketing surfaces (`app/(landing)`, docs) follow `constitution.md`.
+This applies to app UI outside the Platform: settings rows, modals, panels, cards, list rows, empty states, form fields, and section headers. Platform views (`app/(product)`, `platform`) follow the stricter one-line-per-control rule in `apps/sim/platform/AGENTS.md`, which `check:platform-design` enforces (`helper-copy`); marketing surfaces (`app/(landing)`, docs) follow `constitution.md`.
 
 **Carve-out — settings section metadata.** `SettingsNavigationItem.description` in `components/settings/navigation.ts` stays required, and `SettingsPanel` keeps rendering it as the page subtitle. Settings sections are reached through a nav list where the description is the only thing distinguishing adjacent sections, so it earns its place by the "prevents misunderstanding" test. Keep those descriptions verb-first and one line, per `sim-settings-pages.md`. Everything else on a settings page — inline `<p>` blurbs under section headings, field hints, modal bodies, row subtitles — follows the default rule above.
 
@@ -32,14 +32,14 @@ This applies to app UI outside the Platform: settings rows, modals, panels, card
 <ChipModalField title='Workspace name' />
 ```
 
-If a heading needs a subtitle to be understood, the heading is wrong. Fix the heading — don't append a second line.
+If a heading needs a subtitle to be understood, the heading is wrong. Fix the heading — don't append a second line. For a field, bake the meaning into the line itself first: a format into the placeholder (`us-gov-west-1`), a bound or scope into the label (`Idle timeout (hours, min 1)`), a trade-off into the option (`Access keys (long-lived)`), or point to the dialog's setup guide.
 
 ## When supporting copy earns its place
 
 Keep (or add) a description only when it carries information the label cannot, and its absence would cause a mistake:
 
 - **Irreversible or destructive consequences** — "Deleting this workspace removes every workflow and log. This cannot be undone."
-- **A non-obvious format, unit, or bound** — "Comma-separated. Max 50 domains.", "Cost per 1M input tokens."
+- **A non-obvious format, unit, or bound the label, placeholder and options cannot hold** — "Comma-separated. Max 50 domains.", "Cost per 1M input tokens."
 - **A security or access implication** — "This key is shown once and grants full workspace access."
 - **A state the user cannot otherwise see** — "Inherited from your organization's policy."
 - **Instructional copy that advances a flow** — "We sent a 6-digit code to you@example.com."

.cursor/rules/sim-platform-views.mdc

@@ -17,6 +17,7 @@ like that" is not one.
 
 | Job | Use | Never |
 | --- | --- | --- |
+| Explain a field, dialog or row | Its label, placeholder and options (`Access keys (long-lived)`); `error` for validation, `disabledReason` for a locked control, the dialog's Setup guide for steps | A `hint`, form `Modal` `description`, written `SettingsRow`/`DetailHeader` subtitle or data `hint` (`check:platform-design` `helper-copy`; a line that must stay is named in `HELPER_COPY_OWNERS`) |
 | First read of a view | Render nothing for data-backed content while pending (static chrome renders at once), `FailureNotice` when the read fails, `EmptyState` when it settles empty. Read the query's `status`, not an empty list. An action's own pending label (`pendingLabel`, a Load action's `Loading…`) is feedback, not loading copy | A skeleton, shimmer, placeholder rows or loading copy (`check:platform-design` `loading-copy`); a pending hint, placeholder or detail line; treating empty as loading |
 | Failed read | `FailureNotice`, labelled Retry. `intent='warning'` where the read partly answered | A hand-built retry button or `InlineNotice` + `Button` |
 | Failed background refresh | `FailureNotice` above the content it keeps | Replacing content already on screen |

.cursor/rules/sim-ui-copy.mdc

@@ -9,7 +9,7 @@ globs: ["apps/sim/components/**/*.tsx","apps/sim/ee/**/*.tsx","apps/sim/app/_she
 
 **Do not add subtitles, helper text, or descriptive copy beneath headings, labels, cards, or settings by default.** Prefer one concise, self-explanatory heading or label. Only add supporting copy when the user explicitly asks for it, or when it is necessary to prevent misunderstanding or error — and never use it to restate the heading.
 
-This applies to app UI outside the Platform: settings rows, modals, panels, cards, list rows, empty states, form fields, and section headers. Platform views (`app/(product)`, `platform`) follow `apps/sim/platform/AGENTS.md`; marketing surfaces (`app/(landing)`, docs) follow `constitution.md`.
+This applies to app UI outside the Platform: settings rows, modals, panels, cards, list rows, empty states, form fields, and section headers. Platform views (`app/(product)`, `platform`) follow the stricter one-line-per-control rule in `apps/sim/platform/AGENTS.md`, which `check:platform-design` enforces (`helper-copy`); marketing surfaces (`app/(landing)`, docs) follow `constitution.md`.
 
 **Carve-out — settings section metadata.** `SettingsNavigationItem.description` in `components/settings/navigation.ts` stays required, and `SettingsPanel` keeps rendering it as the page subtitle. Settings sections are reached through a nav list where the description is the only thing distinguishing adjacent sections, so it earns its place by the "prevents misunderstanding" test. Keep those descriptions verb-first and one line, per `sim-settings-pages.md`. Everything else on a settings page — inline `<p>` blurbs under section headings, field hints, modal bodies, row subtitles — follows the default rule above.
 
@@ -28,14 +28,14 @@ This applies to app UI outside the Platform: settings rows, modals, panels, card
 <ChipModalField title='Workspace name' />
 ```
 
-If a heading needs a subtitle to be understood, the heading is wrong. Fix the heading — don't append a second line.
+If a heading needs a subtitle to be understood, the heading is wrong. Fix the heading — don't append a second line. For a field, bake the meaning into the line itself first: a format into the placeholder (`us-gov-west-1`), a bound or scope into the label (`Idle timeout (hours, min 1)`), a trade-off into the option (`Access keys (long-lived)`), or point to the dialog's setup guide.
 
 ## When supporting copy earns its place
 
 Keep (or add) a description only when it carries information the label cannot, and its absence would cause a mistake:
 
 - **Irreversible or destructive consequences** — "Deleting this workspace removes every workflow and log. This cannot be undone."
-- **A non-obvious format, unit, or bound** — "Comma-separated. Max 50 domains.", "Cost per 1M input tokens."
+- **A non-obvious format, unit, or bound the label, placeholder and options cannot hold** — "Comma-separated. Max 50 domains.", "Cost per 1M input tokens."
 - **A security or access implication** — "This key is shown once and grants full workspace access."
 - **A state the user cannot otherwise see** — "Inherited from your organization's policy."
 - **Instructional copy that advances a flow** — "We sent a 6-digit code to you@example.com."

apps/sim/app/(product)/_components/access-requests/review-modal.tsx

@@ -138,7 +138,11 @@ export function ReviewModal({ organizationId, requestId, onClose }: ReviewModalP
                   inputMode='numeric'
                   value={newLimit}
                   onChange={setNewLimit}
-                  hint='Enter a whole number above the current limit.'
+                  error={
+                    newLimit.trim() && !review.isValidLimit(parsedLimit)
+                      ? 'Enter a whole number above the current limit.'
+                      : undefined
+                  }
                 />
               )}
             </>

apps/sim/app/(product)/_components/access-requests/review-requests.tsx

@@ -56,7 +56,7 @@ export function ReviewRequests({ organizationId }: ReviewRequestsProps) {
             label='Allow requests'
             description={
               settings.allowed
-                ? 'People can send requests for administrators to review.'
+                ? undefined
                 : 'New requests and approvals are paused. You can still view history and decline pending requests.'
             }
           >

apps/sim/app/(product)/_components/chat/panel/browser-session/page-prompts.tsx

@@ -130,7 +130,6 @@ interface ChoicePromptProps {
   fieldLabel: string
   placeholder: string
   options: readonly { value: string; label: string }[]
-  hintFor?: (choiceId: string) => string | undefined
   /** A refusal the page should remember, offered beside Cancel. */
   refuse?: { label: string; onSelect: () => void }
   onCancel: () => void
@@ -147,7 +146,6 @@ function ChoicePrompt({
   fieldLabel,
   placeholder,
   options,
-  hintFor,
   refuse,
   onCancel,
   onChoose,
@@ -191,7 +189,6 @@ function ChoicePrompt({
           options={options}
           value={choiceId || undefined}
           onValueChange={setChoiceId}
-          hint={choiceId ? hintFor?.(choiceId) : undefined}
         />
       </div>
     </Modal>
@@ -227,14 +224,8 @@ function ClientCertificatePrompt({ prompt, respond }: PromptModalProps<'client-c
       placeholder='Choose a certificate'
       options={prompt.certificates.map((certificate) => ({
         value: certificate.id,
-        label: certificate.subject || certificate.id,
+        label: `${certificate.subject || certificate.id} · ${certificate.issuer || 'Unknown issuer'} · Expires ${formatInstantDate(certificate.expiresAt)}`,
       }))}
-      hintFor={(choiceId) => {
-        const chosen = prompt.certificates.find((certificate) => certificate.id === choiceId)
-        return chosen
-          ? `Issued by ${chosen.issuer || 'unknown issuer'} · Expires ${formatInstantDate(chosen.expiresAt)}`
-          : undefined
-      }}
       refuse={{
         label: "Don't send",
         onSelect: () => respond({ allowed: false, remember: true }),

apps/sim/app/(product)/_components/links-page/link-editor.tsx

@@ -36,6 +36,9 @@ export function LinkEditor({
 }: LinkEditorProps) {
   const editor = useLinkEditor(organizationId, link, initialName, initialUrl)
   const { draft, errors, pending } = editor
+  const accessReason = editor.canManage
+    ? undefined
+    : 'Only the creator or an organization admin can change access.'
   return (
     <Modal
       open
@@ -65,7 +68,6 @@ export function LinkEditor({
           value={draft.defaultUrl ?? ''}
           onChange={(value) => editor.change('defaultUrl', value || null)}
           error={errors.defaultUrl}
-          hint={`Opens when no value fills ${LINK_LIMITS.variable}.`}
         />
       )}
       <TextField
@@ -87,25 +89,20 @@ export function LinkEditor({
         onChange={(value) => editor.change('description', value)}
         error={errors.description}
       />
-      <FieldFrame
-        label='Access'
-        hint={
-          editor.canManage
-            ? undefined
-            : 'Only the creator or an organization admin can change access.'
-        }
-      >
+      <FieldFrame label='Access'>
         <div className={styles.access}>
           <Checkbox
             label='Hide from the Links page'
             checked={draft.unlisted}
             disabled={!editor.canManage || pending}
+            disabledReason={accessReason}
             onCheckedChange={(checked) => editor.change('unlisted', checked)}
           />
           <Checkbox
             label='Only the creator and admins can edit'
             checked={draft.restrictEdit}
             disabled={!editor.canManage || pending}
+            disabledReason={accessReason}
             onCheckedChange={(checked) => editor.change('restrictEdit', checked)}
           />
         </div>

apps/sim/app/(product)/_components/oauth-connect-modal/oauth-connect-modal.tsx

@@ -112,7 +112,6 @@ export function OAuthConnectModal({
             value={connect.clientFieldValues[field.id] ?? ''}
             onValueChange={(value) => connect.setClientField(field.id, value)}
             options={field.options}
-            hint={field.hint}
           />
         ) : field.secret ? (
           <SecretField
@@ -123,7 +122,6 @@ export function OAuthConnectModal({
             placeholder={field.placeholder}
             autoComplete='new-password'
             required
-            hint={field.hint}
           />
         ) : (
           <TextField
@@ -134,7 +132,6 @@ export function OAuthConnectModal({
             placeholder={field.placeholder}
             autoComplete='off'
             required
-            hint={field.hint}
           />
         )
       )}

apps/sim/app/(product)/_components/service-account-modal/service-account-modal.dom.test.tsx

@@ -268,7 +268,7 @@ it('adds a keyless AWS role: shows what to paste into AWS and submits the signed
 
 it('adds AWS access keys: submits only the keys, never a subject, and requires both', async () => {
   const dialog = await open('aws-service-account', 'AWS')
-  await chooseAuthType(dialog, 'Access keys')
+  await chooseAuthType(dialog, 'Access keys (long-lived)')
 
   expect(labelled(dialog, 'Issuer')).toBeNull()
   expect(labelled(dialog, 'Role ARN')).toBeNull()
@@ -287,12 +287,12 @@ it('adds AWS access keys: submits only the keys, never a subject, and requires b
 
 it('drops a secret when the auth type that used it is left', async () => {
   const dialog = await open('aws-service-account', 'AWS')
-  await chooseAuthType(dialog, 'Access keys')
+  await chooseAuthType(dialog, 'Access keys (long-lived)')
   type(input(dialog, 'Access key ID'), 'AKIAEXAMPLEKEY12345')
   type(input(dialog, 'Secret access key'), 'first-secret')
 
   await chooseAuthType(dialog, 'IAM role (keyless, via Sim OIDC)')
-  await chooseAuthType(dialog, 'Access keys')
+  await chooseAuthType(dialog, 'Access keys (long-lived)')
 
   expect(input(dialog, 'Secret access key').value).toBe('')
   expect(input(dialog, 'Access key ID').value).toBe('AKIAEXAMPLEKEY12345')
@@ -322,7 +322,7 @@ it('offers keyless sign-in disabled, with no instructions, where the deployment
   keyless = { available: false }
   const dialog = await open('aws-service-account', 'AWS')
 
-  expect(authTypeTrigger(dialog).textContent).toContain('Access keys')
+  expect(authTypeTrigger(dialog).textContent).toContain('Access keys (long-lived)')
   expect(labelled(dialog, 'Issuer')).toBeNull()
   act(() => authTypeTrigger(dialog).click())
   await settle()
@@ -336,7 +336,7 @@ it('never offers keyless sign-in to an organization credential, and never mints
     scope: { kind: 'organization', organizationId: 'org-1' },
   })
 
-  expect(authTypeTrigger(dialog).textContent).toContain('Access keys')
+  expect(authTypeTrigger(dialog).textContent).toContain('Access keys (long-lived)')
   expect(requests.some((request) => request.path === '/api/credentials/workload-identity')).toBe(
     false
   )