Skip to content

Enable non-contiguous glyph layout for NSTextView-backed code views#26242

Merged
vex-assistant-bot[bot] merged 1 commit into
mainfrom
devin/1776465144-lum-999-noncontiguous-layout
Apr 17, 2026
Merged

Enable non-contiguous glyph layout for NSTextView-backed code views#26242
vex-assistant-bot[bot] merged 1 commit into
mainfrom
devin/1776465144-lum-999-noncontiguous-layout

Conversation

@devin-ai-integration
Copy link
Copy Markdown
Contributor

@devin-ai-integration devin-ai-integration Bot commented Apr 17, 2026

Fixes LUM-999 / Sentry VELLUM-ASSISTANT-MACOS-J2 — 2s+ main-thread hang attributed to VCodeTextView.makeNSView during code block rendering.

Root cause

NSLayoutManager.allowsNonContiguousLayout defaults to false. With contiguous layout, any glyph range query forces full-document glyph generation from character 0 on the main thread. Attaching an NSTextView to its hosting view triggers exactly such a query:

setDocumentView:  →  _setSuperview:  →  setNeedsDisplayInRect:  →  _glyphRangeForBoundingRect:
                                                                       └─ _fillLayoutHoleForCharacterRange:  (hang)

For large code blocks this runs for multiple seconds before makeNSView returns. The Sentry stack attributed the hang to VCodeTextView.makeNSView only because that's the single app frame on the stack — the real work is deep inside AppKit. Syntax highlighting (the ticket's suspected cause) already runs off the main thread and is not involved in this hang.

Four NSViewRepresentables in the app construct a TextKit 1 stack directly and share this exposure:

  • VCodeView.VCodeTextView (code blocks in chat) — the site Sentry pointed at
  • HighlightedTextView.CodeTextView (editable code panel)
  • VSelectableTextView (selectable read-only text)
  • ComposerTextEditor (chat composer)

Changes

  1. Opt in to non-contiguous layout on every NSLayoutManager we construct for a hosted NSTextView. One line per call site, per Apple's allowsNonContiguousLayout docs.

  2. Replace ensureLayout(for:) in sizeThatFits for VCodeView.VCodeTextView and HighlightedTextView.CodeTextView with direct lineCount * lineHeight + insets math. Both stacks use an unbounded-width NSTextContainer (no line wrapping) and pin paragraphStyle.minimumLineHeight == maximumLineHeight to NSLayoutManager.defaultLineHeight(for:), so the geometry is exact and avoids a second O(glyph count) main-thread path. lineCount is maintained on the coordinator (seeded in makeNSView/applyText, updated on updateNSView/textDidChange).

  3. Remove the now-unused measurement cache (lastMeasuredLength / lastMeasuredWidth / lastMeasuredHeight + invalidateMeasurementCache()) from VCodeTextView.Coordinator and CodeTextView.Coordinator. The direct math replaces the path the cache was protecting.

  4. clients/AGENTS.md — add two bullets under "Performance and Resource Management" plus a new row in the anti-pattern table, linking to the Apple docs.

VSelectableTextView and ComposerTextEditor keep their existing measurement paths (selectable text wraps; composer uses intrinsic sizing) — only the non-contiguous flag changes there.

Alternatives considered & rejected

  • Defer applyText / highlighting to updateNSView — doesn't address the root cause. The hang is in AppKit's contiguous-layout fill on setDocumentView:, not in our text application path.
  • Migrate to TextKit 2 — far larger change; would regress the gutter / syntax-highlight pipeline; not needed to fix this hang.
  • Keep the cache and also skip ensureLayout — the cache only mitigated the repeated-call cost. With exact math, the first call is also free, so the cache is redundant.

Root cause analysis (per AGENTS.md)

  1. How did the code get into this state? The four call sites were written against NSTextView.layoutManager-style TextKit 1 examples that never opt into non-contiguous layout. The default silently works for small documents and only surfaces as a hang at scale.
  2. What decisions led to it? Defaulting to AppKit's out-of-the-box NSLayoutManager without reviewing performance-related properties, plus copy-pasting the same stack across four sites.
  3. Warning signs missed? LUM-947 already added ensureLayout caches to two of these views; that was treating the symptom (repeated measurement cost) rather than the disease (contiguous-layout default).
  4. Prevention: AGENTS.md now calls out the flag under "Performance and Resource Management" and lists the default as an anti-pattern with a remediation, alongside the existing ensureLayout guidance.
  5. AGENTS.md guideline? Added — see the diff in clients/AGENTS.md.

Human review checklist

  • CI skips macOS builds. Please verify a local Xcode build on the branch.
  • Confirm paragraphStyle.minimumLineHeight == maximumLineHeight stays pinned everywhere the new line-count math is used (VCodeView.swift, HighlightedTextView.swift). If a future change loosens that invariant, heights will silently drift.
  • Confirm lineCount is seeded on the coordinator before sizeThatFits can run in every path — makeNSView, updateNSView, textDidChange, and the async highlight completion (highlight completion does not change glyph count, so it's intentionally not touched).
  • Spot-check that non-contiguous layout doesn't regress any NSTextView behaviour we rely on: selection, find-in-buffer, scrollRangeToVisible, and the line-number gutter's defaultLineHeight computation. Apple's docs state these APIs are all non-contiguous-aware.
  • VSelectableTextView still calls ensureLayout in its wrap-aware measurement helper (measureSize) — that's intentional; non-contiguous layout does not invalidate that path.

Test plan

  • Build locally in Xcode (CI skips macOS).
  • Open a chat with a large code block (the Sentry event referenced a multi-thousand-line block on v0.6.3) and confirm the hang is gone.
  • Sanity-check the editable code panel, selectable text blocks, and the chat composer for any visual regressions in sizing or scroll behaviour.

Link to Devin session: https://app.devin.ai/sessions/71b2b1ea97d04a32abbb7b0764067711
Requested by: @ashleeradka


Open with Devin

…d code views

TextKit 1 defaults NSLayoutManager.allowsNonContiguousLayout to false,
which forces full-document glyph layout from character 0 on the main
thread whenever a glyph range is queried. Attaching an NSTextView to
its scroll view (setDocumentView: -> _setSuperview: ->
setNeedsDisplayInRect: -> _glyphRangeForBoundingRect:) triggers that
query during makeNSView, producing multi-second hangs on large code
blocks.

Opt into non-contiguous layout on every TextKit 1 stack we build via
NSViewRepresentable so glyph generation is confined to the requested
bounding rect.

Also replace NSLayoutManager.ensureLayout(for:) in the code-view
sizeThatFits paths with direct lineCount * fixedLineHeight math: the
text container is unbounded horizontally (no wrapping) and paragraph
style pins minimumLineHeight == maximumLineHeight, so the geometry is
exact and avoids a second O(glyph count) main-thread path.

Fixes VELLUM-ASSISTANT-MACOS-J2.

Co-Authored-By: ashlee@vellum.ai <ashlee@vellum.ai>
@devin-ai-integration
Copy link
Copy Markdown
Contributor Author

🤖 Devin AI Engineer

I'll be helping with this pull request! Here's what you should know:

✅ I will automatically:

  • Address comments on this PR. Add '(aside)' to your comment to have me ignore it.
  • Look at CI failures and help fix them

Note: I can only respond to comments from users who have write access to this repository.

⚙️ Control Options:

  • Disable automatic comment and CI monitoring

@linear
Copy link
Copy Markdown

linear Bot commented Apr 17, 2026

LUM-999 App Hang (2s): VCodeTextView.makeNSView — code block rendering blocks main thread (MACOS-J2)

Copy link
Copy Markdown
Contributor Author

@devin-ai-integration devin-ai-integration Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ Devin Review: No Issues Found

Devin Review analyzed this PR and found no potential bugs to report.

View in Devin Review to see 4 additional findings.

Open in Devin Review

Copy link
Copy Markdown
Contributor

@vex-assistant-bot vex-assistant-bot Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ LGTM. allowsNonContiguousLayout = true on all 4 TextKit 1 stacks is the correct Apple-documented fix for the full-document glyph layout hang. The ensureLayout → lineCount math replacement in sizeThatFits is sound given unbounded-width containers with pinned line heights. AGENTS.md anti-pattern entries look good.

Needs local build verification before merge.

@vex-assistant-bot
Copy link
Copy Markdown
Contributor

QA Passed ✅

Built branch locally (VELLUM_ENVIRONMENT=dev, clean compile). Tested with 5 large Swift code blocks (~400 lines across blocks). Scrolled through all code blocks while running sample profiler for 3 seconds.

Results:

  • Zero ensureLayout / glyphRange / layoutManager calls on main thread
  • Main thread shows only lightweight SwiftUI layout (containsGlobalPoints, sizeThatFits, explicitAlignment)
  • Smooth scrolling, no hitches or freezes
  • Fix confirmed working: allowsNonContiguousLayout = true eliminates the full-document glyph layout hang

@vex-assistant-bot vex-assistant-bot Bot merged commit 3fae752 into main Apr 17, 2026
7 checks passed
@vex-assistant-bot vex-assistant-bot Bot deleted the devin/1776465144-lum-999-noncontiguous-layout branch April 17, 2026 23:38
siddseethepalli pushed a commit that referenced this pull request Apr 17, 2026
…d code views (#26242)

TextKit 1 defaults NSLayoutManager.allowsNonContiguousLayout to false,
which forces full-document glyph layout from character 0 on the main
thread whenever a glyph range is queried. Attaching an NSTextView to
its scroll view (setDocumentView: -> _setSuperview: ->
setNeedsDisplayInRect: -> _glyphRangeForBoundingRect:) triggers that
query during makeNSView, producing multi-second hangs on large code
blocks.

Opt into non-contiguous layout on every TextKit 1 stack we build via
NSViewRepresentable so glyph generation is confined to the requested
bounding rect.

Also replace NSLayoutManager.ensureLayout(for:) in the code-view
sizeThatFits paths with direct lineCount * fixedLineHeight math: the
text container is unbounded horizontally (no wrapping) and paragraph
style pins minimumLineHeight == maximumLineHeight, so the geometry is
exact and avoids a second O(glyph count) main-thread path.

Fixes VELLUM-ASSISTANT-MACOS-J2.

Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: ashlee@vellum.ai <ashlee@vellum.ai>
siddseethepalli added a commit that referenced this pull request Apr 17, 2026
…ation gaps (#26271)

* Fix Chrome extension allowlist ID and clarify README dev setup (#26259)

Update the canonical allowlist to use the correct published CWS
extension ID (hphbdmpffeigpcdjkckleobjmhhokpne). Restructure the
Chrome extension README to clearly explain the allowlist merge
strategy, separate the macOS app (automatic) path from the manual
native messaging setup, and show how dev + prod extensions work
side-by-side.

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* fix(clients): enable non-contiguous glyph layout for NSTextView-backed code views (#26242)

TextKit 1 defaults NSLayoutManager.allowsNonContiguousLayout to false,
which forces full-document glyph layout from character 0 on the main
thread whenever a glyph range is queried. Attaching an NSTextView to
its scroll view (setDocumentView: -> _setSuperview: ->
setNeedsDisplayInRect: -> _glyphRangeForBoundingRect:) triggers that
query during makeNSView, producing multi-second hangs on large code
blocks.

Opt into non-contiguous layout on every TextKit 1 stack we build via
NSViewRepresentable so glyph generation is confined to the requested
bounding rect.

Also replace NSLayoutManager.ensureLayout(for:) in the code-view
sizeThatFits paths with direct lineCount * fixedLineHeight math: the
text container is unbounded horizontally (no wrapping) and paragraph
style pins minimumLineHeight == maximumLineHeight, so the geometry is
exact and avoids a second O(glyph count) main-thread path.

Fixes VELLUM-ASSISTANT-MACOS-J2.

Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: ashlee@vellum.ai <ashlee@vellum.ai>

* fix(contacts): show Assistant badge for assistant-type contacts (LUM-1009) (#26239)

* fix(contacts): show Assistant badge for assistant-type contacts (LUM-1009)

* Move role/contactType derivation onto Kind for valid initializer

---------

Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

* fix(llm-callsite): UI override state divergence, null-as-delete, migration gaps

- deepMergeOverwrite: null on scalar/null targets assigns null (preserves
  nullable config fields like activeHoursStart); null on object targets
  still deletes (call-site clearing). Fixes regression where PATCH with
  null for nullable fields was deleted then re-defaulted.
- InferenceServiceCard: override confirmation dialog only fires when the
  resolved provider ID actually changes, not on mode-only toggles where
  both old and new resolve to the same provider.
- CallSiteOverridesSheet: per-row Save uses replaceCallSiteOverride
  (clear-then-set) so stale daemon-side leaves are removed. The
  partial-update setCallSiteOverride would retain fields the draft nil'd.
- CallSiteOverrideRow: merge consecutive .padding modifiers into single
  EdgeInsets call per macOS AGENTS.md layout rule.
- SettingsStore: add replaceCallSiteOverride for full-entry replacement.

---------

Co-authored-by: Noa Flaherty <noa@vellum.ai>
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: devin-ai-integration[bot] <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: ashlee@vellum.ai <ashlee@vellum.ai>
siddseethepalli pushed a commit that referenced this pull request Apr 17, 2026
…d code views (#26242)

TextKit 1 defaults NSLayoutManager.allowsNonContiguousLayout to false,
which forces full-document glyph layout from character 0 on the main
thread whenever a glyph range is queried. Attaching an NSTextView to
its scroll view (setDocumentView: -> _setSuperview: ->
setNeedsDisplayInRect: -> _glyphRangeForBoundingRect:) triggers that
query during makeNSView, producing multi-second hangs on large code
blocks.

Opt into non-contiguous layout on every TextKit 1 stack we build via
NSViewRepresentable so glyph generation is confined to the requested
bounding rect.

Also replace NSLayoutManager.ensureLayout(for:) in the code-view
sizeThatFits paths with direct lineCount * fixedLineHeight math: the
text container is unbounded horizontally (no wrapping) and paragraph
style pins minimumLineHeight == maximumLineHeight, so the geometry is
exact and avoids a second O(glyph count) main-thread path.

Fixes VELLUM-ASSISTANT-MACOS-J2.

Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: ashlee@vellum.ai <ashlee@vellum.ai>
siddseethepalli added a commit that referenced this pull request Apr 18, 2026
…es} (#26159)

* config(llm): add unified llm schema with call-site enum and profile refines (#26089)

* config(llm): add unified llm schema with call-site enum and profile refines

* fix(llm-schema): replace deepPartialObject helper with explicit .partial().extend()

Zod 4's readonly shape typing tripped TS2542 in the LSP for the generic walker.
Inline the one-level expansion for ContextWindowSchema and switch the superRefine
issue code to the string literal (Zod 4 deprecated ZodIssueCode).

* config(llm): add resolveCallSiteConfig resolver with deep merge (#26094)

* config(llm): add resolveCallSiteConfig resolver with deep merge

* fix(llm-resolver): deep-clone nested objects so resolved configs are isolated snapshots

Codex flagged that the merge helper aliased nested objects from llm.default
when no override touched them, so a caller mutating the returned config
would silently corrupt the source. Recurse into plain-object sources
unconditionally and add a regression test.

* config(llm): add llm field to AssistantConfigSchema (no behavior change) (#26095)

* config(llm): add llm field to AssistantConfigSchema (no behavior change)

* fix(llm-schema): add field-level defaults so partial llm configs don't trigger full config reset

Codex flagged that requiring all LLMConfigBase fields meant the loader's
leaf-deletion recovery couldn't repair partial/invalid llm blocks — falling
through to cloneDefaultConfig() and discarding the user's other valid
settings. Add .default(...) to every leaf so LLMSchema.parse({}) returns a
fully-defaulted object, matching the pattern used by sibling config schemas.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* providers: accept callSite in per-call config; resolve via resolveCallSiteConfig (#26102)

* workspace: migrate scattered LLM config keys into unified llm structure (#26101)

* workspace: migrate scattered LLM config keys into unified llm structure

* fix(migration): preserve existing llm subtree; map notification intent to both call sites

Codex flagged two issues:
- The migration assignment replaced config.llm wholesale, destroying any
  pre-existing llm.callSites/profiles when llm.default was absent. Now
  merges into existing config.llm, preserving non-conflicting entries.
- notifications.decisionModelIntent drives both notification classification
  and preference extraction, but the migration only seeded
  notificationDecision. Now seeds both call sites.

* memory: route extraction/consolidation/retrieval through call-site IDs (#26106)

* memory: route narrative/pattern/summarization/starters through call-site IDs (#26107)

* notifications: route decision and preference extraction through call-site IDs (#26109)

* calls+watcher: route guardian copy and watch handlers through call-site IDs (#26105)

* utility: route classifier and analyzer LLM calls through call-site IDs (#26111)

* macos(settings): migrate InferenceServiceCard reads/writes to llm.default.* (#26113)

* workspace+conversation: route commit message and title through call-site IDs (#26112)

* ui: route identity intro and empty-state greeting through call-site IDs (#26108)

* daemon: thread callSite through processMessage options and adapter callbacks (#26115)

* daemon: thread callSite through processMessage options and adapter callbacks

* fix(callsite-threading): complete interface contract and server.ts symmetry

Devin flagged two gaps in PR #26115:
- ProcessConversationContext interface missing callSite in its
  runAgentLoop options type (works via structural typing but contract
  was incomplete; mocks would silently drop the field).
- DaemonServer.persistAndProcessMessage didn't thread callSite to
  conversation.runAgentLoop, while DaemonServer.processMessage did.
  Aligned.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* fix(callsite): don't default unspecified callers to 'mainAgent'

Codex flagged that defaulting to mainAgent for every turn routes them
through the new RetryProvider call-site resolver, which reads from
llm.default — but config-model.setModel still writes to services.inference
without syncing llm.default. Result: stale/incompatible model IDs after a
model switch.

Defer the cutover. agent-loop turns now keep using the legacy modelIntent
path (turnCallSite = options?.callSite, no fallback). PRs 7-11 still
explicitly pass callSite and route through the new resolver as intended.

---------

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* heartbeat: pass callSite: 'heartbeatAgent' instead of speed kwarg (#26125)

* filing: pass callSite: 'filingAgent' instead of speed kwarg (#26124)

* runtime/analyze-conversation: route through callSite: 'analyzeConversation' (#26126)

* subagent: pass callSite: 'subagentSpawn' when spawning isolated agents (#26122)

* calls: route the call agent loop through callSite: 'callAgent' (#26123)

* macos(settings): add SettingsStore APIs for per-call-site overrides (#26128)

* macos(settings): add SettingsStore APIs for per-call-site overrides

* fix(callsite-overrides): harden setCallSiteOverrides against dup-id crash and batch divergence

Devin and Codex flagged two issues:
- Dictionary(uniqueKeysWithValues:) crashes if callers pass duplicate
  CallSiteOverride.id values (external input — must be tolerant). Switch
  to Dictionary(_:uniquingKeysWith:) with last-write-wins.
- Batch updates locally cleared entries omitted from the input but only
  PATCHed entries that were present, so omitted entries appeared cleared
  in the UI but reappeared on next sync. Now the PATCH payload includes
  NSNull clears for every catalog entry not in the batch, aligning remote
  with local.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* fix(callsite-overrides): null entire entry on clear so non-UI leaves get cleared too

Codex P2 (PR #26128 cycle 2): clearCallSiteOverride only nulled
provider/model/profile, but call-site config supports additional leaves
(maxTokens, effort, speed, thinking, contextWindow). If those were set
via manual edits, the UI would report cleared while the daemon kept
applying hidden overrides.

Switch the PATCH payload from { provider: null, model: null, profile: null }
to a single null on the entry itself. The Zod fragment treats null as
absent, so the resolver falls back to llm.default. Same fix applies to the
omitted-catalog-entry clears in setCallSiteOverrides batch.

Tests updated to assert the new shape.

---------

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* macos(settings): confirm default-provider switch when call-site overrides exist (#26133)

* macos(settings): show 'N call-site overrides' badge with read-only list sheet (#26135)

* macos(settings): show 'N call-site overrides' badge with read-only list sheet

* fix(comments): drop PR-number breadcrumbs in callsite override files

Devin flagged that comments referencing PR 22/23/24 violate clients/AGENTS.md
'Comment Quality' rule (no breadcrumbs). Replaced with timeless descriptions
of code intent.

* macos(settings): make per-task override sheet editable with provider/model pickers (#26136)

* macos(settings): make per-task override sheet editable with provider/model pickers

* fix(callsite-sheet): preserve external updates and seed override from active default provider

Codex flagged two P1s:
- syncDraftsFromStore compared drafts against the NEW persisted value to
  decide 'touched', so external store updates were treated as user edits
  and got overwritten by Save All. Track the previously-persisted value
  in lastSyncedFromStore and consider a row touched only when the draft
  differs from that baseline.
- Toggling 'Override default' on initialized provider from
  providerIds.first instead of the user's actual default provider, which
  could pin the wrong provider on save. Pass the user's default provider
  into CallSiteOverrideRow and seed from it.

* fix(callsite-sheet): use entry-level null path for cleared rows in saveAll/resetAll

Devin flagged that saveAll() and resetAll() were passing all-nil entries
to setCallSiteOverrides, which routed them through the field-level null
path (provider/model/profile = null). That left advanced leaves
(maxTokens, effort, temperature, contextWindow) untouched on the daemon.

Fix:
- saveAll(): filter to entries with hasOverride == true; toggled-off rows
  fall through to the entry-level null path.
- resetAll(): pass an empty list so every catalog entry hits the
  entry-level null path.

* config(llm): remove deprecated scattered LLM keys (#26140)

* fix(config-loader): treat JSON null as key deletion in deepMergeOverwrite (#26153)

* fix(agent-loop): default user-initiated turns to callSite: 'mainAgent' (#26154)

* fix(meet-join): migrate consent-monitor + session-manager to callSite contract (#26155)

* fix(macos): atomic provider+model save via single PATCH (#26156)

* fix(cleanup): remove dead code, refresh comments, add migration test, update docs (#26157)

* fix(r2): catalog test count, skill self-knowledge doc, AGENTS.md, loader docstring (#26158)

* fix(llm-callsite): refresh stale docstring, restore overflow budget, restore SettingsStore fallback (#26252)

* fix(llm-callsite): route provider transport and field precedence through callSite (#26254)

* fix(llm-callsite): pass CI + address subagent/thinking/temperature review comments (#26258)

* test(extension-id-guard): allow CWS URL matches; mirrors main PR #26263 (#26270)

* fix(llm-callsite): UI override state divergence, null-as-delete, migration gaps (#26271)

* Fix Chrome extension allowlist ID and clarify README dev setup (#26259)

Update the canonical allowlist to use the correct published CWS
extension ID (hphbdmpffeigpcdjkckleobjmhhokpne). Restructure the
Chrome extension README to clearly explain the allowlist merge
strategy, separate the macOS app (automatic) path from the manual
native messaging setup, and show how dev + prod extensions work
side-by-side.

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* fix(clients): enable non-contiguous glyph layout for NSTextView-backed code views (#26242)

TextKit 1 defaults NSLayoutManager.allowsNonContiguousLayout to false,
which forces full-document glyph layout from character 0 on the main
thread whenever a glyph range is queried. Attaching an NSTextView to
its scroll view (setDocumentView: -> _setSuperview: ->
setNeedsDisplayInRect: -> _glyphRangeForBoundingRect:) triggers that
query during makeNSView, producing multi-second hangs on large code
blocks.

Opt into non-contiguous layout on every TextKit 1 stack we build via
NSViewRepresentable so glyph generation is confined to the requested
bounding rect.

Also replace NSLayoutManager.ensureLayout(for:) in the code-view
sizeThatFits paths with direct lineCount * fixedLineHeight math: the
text container is unbounded horizontally (no wrapping) and paragraph
style pins minimumLineHeight == maximumLineHeight, so the geometry is
exact and avoids a second O(glyph count) main-thread path.

Fixes VELLUM-ASSISTANT-MACOS-J2.

Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: ashlee@vellum.ai <ashlee@vellum.ai>

* fix(contacts): show Assistant badge for assistant-type contacts (LUM-1009) (#26239)

* fix(contacts): show Assistant badge for assistant-type contacts (LUM-1009)

* Move role/contactType derivation onto Kind for valid initializer

---------

Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

* fix(llm-callsite): UI override state divergence, null-as-delete, migration gaps

- deepMergeOverwrite: null on scalar/null targets assigns null (preserves
  nullable config fields like activeHoursStart); null on object targets
  still deletes (call-site clearing). Fixes regression where PATCH with
  null for nullable fields was deleted then re-defaulted.
- InferenceServiceCard: override confirmation dialog only fires when the
  resolved provider ID actually changes, not on mode-only toggles where
  both old and new resolve to the same provider.
- CallSiteOverridesSheet: per-row Save uses replaceCallSiteOverride
  (clear-then-set) so stale daemon-side leaves are removed. The
  partial-update setCallSiteOverride would retain fields the draft nil'd.
- CallSiteOverrideRow: merge consecutive .padding modifiers into single
  EdgeInsets call per macOS AGENTS.md layout rule.
- SettingsStore: add replaceCallSiteOverride for full-entry replacement.

---------

Co-authored-by: Noa Flaherty <noa@vellum.ai>
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: devin-ai-integration[bot] <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: ashlee@vellum.ai <ashlee@vellum.ai>

* fix(llm-callsite): seed latency-optimized defaults and fix guardian provider routing (#26275)

* fix(meet-bot): address review feedback — Docker build, scraper races, audio capture, storage writer (#26264)

* fix(meet): chat concurrency, dispose teardown, and wake adapter fidelity (#26265)

* fix: heartbeat dual-emit, analysis dedup, test hermiticity, credential executor discovery (#26266)

* fix: model default fallback, empty-response nudge scan (#26268)

- Update FALLBACK_DEFAULT_MODEL to claude-opus-4-7 + test
- Fix resolveModel to check Anthropic catalog (not just current default)
  so stale persisted defaults (e.g. claude-opus-4-6) don't get sent
  to non-Anthropic providers
- Fix priorAssistantHadVisibleText backward scan to check ALL prior
  assistant messages, not just the most recent one

Addresses review feedback from PRs #26247, #26164.

* fix(meet): TTS stream races, barge-in tracking, ffmpeg error classification (#26267)

* Fix extension-id-sync-guard test after canonical ID update (#26263)

The guard test asserts that canonical extension IDs appear only in the
allowlist config file. After updating the canonical ID to match the
published CWS extension, it now collides with CWS URLs in README and
browser-execution.ts. Fix by stripping CWS URLs before checking for
bare ID occurrences, and ignore .codex-worktrees (repo copies).
Also remove hardcoded CWS ID from README in favor of reading from
the canonical config.

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* fix(llm-callsite): seed latency-optimized defaults, fix guardian provider routing, clean stale comments

- Add LATENCY_OPTIMIZED_CALLSITE_DEFAULTS to schema for new installs
- Create migration 040 to seed latency-optimized call-site entries for existing workspaces
- Fix guardian-action-generators to use getConfiguredProvider() instead of bypassing call-site resolution
- Restore commitMessage maxTokens: 120 and temperature: 0.2 via call-site defaults
- Remove stale PR-reference comments from analyze-conversation.ts and voice-session-bridge.ts

Addresses consolidated review feedback from PRs #26101-#26140.

---------

Co-authored-by: Noa Flaherty <noa@vellum.ai>
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* fix(retry): stop forwarding contextWindow/provider to provider request body (#26280)

* chore(skills): regenerate catalog.json

---------

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Co-authored-by: Noa Flaherty <noa@vellum.ai>
Co-authored-by: devin-ai-integration[bot] <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: ashlee@vellum.ai <ashlee@vellum.ai>
siddseethepalli added a commit that referenced this pull request Apr 18, 2026
During the first LazyVStack layout pass, MessageListLayoutMetrics deliberately
reports bubbleMaxWidth = 0 until GeometryReader resolves the chat column width.
That zero flowed unchecked into MarkdownSegmentView.effectiveMaxWidth and
VSelectableTextView.measureSize(maxWidth: 0), where ensureLayout returned a
usedRect with height 0. Before the recent sizeThatFits-caching commit
(#26170), the degenerate result self-healed on the next body pass; with the
new caches, (0,0) was persisted at the attributedString + 0 + 4 key and the
MarkdownSegmentView NSCache entry keyed on effectiveMaxWidth = 0, collapsing
the cell and stacking every visible assistant message body at the same y.

Two small, orthogonal guards:

- VSelectableTextView.measureSize refuses maxWidth <= 0 or empty strings with
  an early .zero return (no cache write), and only writes non-zero heights
  into measurementSizeCache.

- MarkdownSegmentView.resolveSelectableRunMeasurementResult skips the
  measuredTextCache insertion when size.height == 0.

Both keep the perf wins from #26170 and #26242 (no revert). Adds a regression
test that measures at maxContentWidth: 0 and asserts no cache poisoning.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
siddseethepalli added a commit that referenced this pull request Apr 18, 2026
…hes (#26316)

During the first LazyVStack layout pass, MessageListLayoutMetrics deliberately
reports bubbleMaxWidth = 0 until GeometryReader resolves the chat column width.
That zero flowed unchecked into MarkdownSegmentView.effectiveMaxWidth and
VSelectableTextView.measureSize(maxWidth: 0), where ensureLayout returned a
usedRect with height 0. Before the recent sizeThatFits-caching commit
(#26170), the degenerate result self-healed on the next body pass; with the
new caches, (0,0) was persisted at the attributedString + 0 + 4 key and the
MarkdownSegmentView NSCache entry keyed on effectiveMaxWidth = 0, collapsing
the cell and stacking every visible assistant message body at the same y.

Two small, orthogonal guards:

- VSelectableTextView.measureSize refuses maxWidth <= 0 or empty strings with
  an early .zero return (no cache write), and only writes non-zero heights
  into measurementSizeCache.

- MarkdownSegmentView.resolveSelectableRunMeasurementResult skips the
  measuredTextCache insertion when size.height == 0.

Both keep the perf wins from #26170 and #26242 (no revert). Adds a regression
test that measures at maxContentWidth: 0 and asserts no cache poisoning.

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant