Merge remote-tracking branch 'origin/master' into feature/workspace-picker-composer

packages/client/ui-conversation/src/client/locales.ts

@@ -60,7 +60,7 @@ export const zh = {
   'access.confirm.acknowledge': '我已了解风险，并愿意继续',
   'access.confirm.cancel': '取消',
   'access.confirm.enable': '启用 Full access',
-  'hero.headline': '探索未知之境',
+  'hero.headline': '探索未至之境',
   'hero.preview': '预览版',
   'hero.chooseWorkspace': '选择工作区',
   'session.hierarchy': '会话层级',

packages/client/ui-conversation/src/client/skeleton/ConversationRoot.module.css

@@ -263,8 +263,9 @@
 .composerHero {
   position: relative; /* .heroGlow positioning context */
   align-self: center;
-  /* figma 75:8208: 12 between hero chrome / workspace row / card. */
-  gap: 12px;
+  /* figma 75:8208 drew 12 between all three rows; the workspace row now sits
+     8 above the card (its margin-top restores 12 under the hero chrome). */
+  gap: 8px;
   /* Foot inside the centered box floats the stack a bit above true center. */
   padding-bottom: 32px;
   /* Card cap + both clearances: the hero input card lands at exactly the same
@@ -292,7 +293,9 @@
 .heroWorkspaceRow {
   display: flex;
   align-items: center;
+  gap: 2px;
   min-width: 0;
+  margin-top: 4px;
   /* figma drew px 8; nudged +12 so the chip's folder glyph lines up closer to
      the card's inner controls below. */
   padding-left: 20px;

packages/client/ui-conversation/src/client/skeleton/HeroShell.module.css

@@ -105,7 +105,7 @@
   min-height: 28px;
   padding: 0 8px;
   border: none;
-  border-radius: 12px;
+  border-radius: 16px;
   background: transparent;
   color: var(--dsw-alias-label-primary);
   font-size: 13px;

packages/client/ui-conversation/src/client/skeleton/PermissionSelect.module.css

@@ -51,6 +51,9 @@
 }
 
 .chevron {
+  /* inline-flex, not inline: an inline seat reserves baseline descent under
+     the svg and floats the glyph off-center in the 28px trigger. */
+  display: inline-flex;
   flex: 0 0 auto;
   color: var(--dsw-alias-label-caption);
   transition: transform 120ms ease;

packages/client/ui-conversation/tests/skeleton.spec.tsx

@@ -362,7 +362,7 @@ describe('ConversationRoot resident composer', () => {
     const header = b.view.container.querySelector('header')
     expect(host).not.toBeNull()
     expect(header?.getAttribute('aria-hidden')).toBe('true')
-    expect(b.view.getByText('探索未知之境')).toBeTruthy()
+    expect(b.view.getByText('探索未至之境')).toBeTruthy()
     expect(b.view.getByText('预览版')).toBeTruthy()
     expect(b.view.queryByTestId('view-chat')).toBeNull()
     // The same machine-backed textarea is live in the hero, and the
@@ -386,7 +386,7 @@ describe('ConversationRoot resident composer', () => {
     const b = mount(conversationSnapshot({ composerPhase: 'blank', blank: true, openState: 'loading' }))
     const root = b.view.container.querySelector('[data-phase]')
     expect(root?.getAttribute('data-phase')).toBe('settling')
-    expect(b.view.queryByText('探索未知之境')).toBeNull()
+    expect(b.view.queryByText('探索未至之境')).toBeNull()
   })
 
   it('settling phase: a session the list has no row for settles conservatively', () => {
@@ -411,7 +411,7 @@ describe('ConversationRoot resident composer', () => {
     // blank the column for the history round-trip.
     const root = b.view.container.querySelector('[data-phase]')
     expect(root?.getAttribute('data-phase')).toBe('hero')
-    expect(b.view.getByText('探索未知之境')).toBeTruthy()
+    expect(b.view.getByText('探索未至之境')).toBeTruthy()
     expect(b.view.getByRole('textbox')).toBeTruthy()
   })
 
@@ -429,7 +429,7 @@ describe('ConversationRoot resident composer', () => {
     expect(after.value).toBe('kept across flip')
     expect(b.chat.store.getSnapshot().draft).toBe('kept across flip')
     expect(b.view.container.querySelector('[data-conversation-scroll]')?.contains(after)).toBe(true)
-    expect(b.view.queryByText('探索未知之境')).toBeNull()
+    expect(b.view.queryByText('探索未至之境')).toBeNull()
     expect(b.view.getByTestId('view-chat')).toBeTruthy()
   })