Repository navigation
chore(nsh): synchronize third-party/nsh to upstream 323a8663 - #6708
Merged
Merged
Conversation
Synchronize third-party/nsh from v0.4.0 to longbridge/nsh revision 323a8663f6fdb63340c634a50da9bbb820037b69 while keeping GPUI retired and retaining nsh-terminal and icy_sixel with minimal local delta: - Drop superseded fork patches (input_tokens, RetireListCell, ProjectRoot, CancelTouch, HintWatchToken, Renderer/platform.isTerminal, Environment::terminal_keyboard, TextEngine::measure_canvas, OverlayProp::FocusReturn, LayoutTree::lifetime, and the legacy software TUI compositor) in favor of upstream Idiom::Terminal, Environment::ctrl_for_command, Core::sync_kept, ProjectStates, and cell-idiom nsh-platform-tui. - Fix sibling component listener fan-out and nested emits in nsh-core, deferred length signal separation and 0-splice retained cell item updates in nsh-js, pending startup focus_requests retention and active-scope accessibility_snapshot in nsh-platform-tui, and PointerEvents::None editor sink focus/Tab handling in nsh-platform-windows and nsh-platform-macos. - Migrate Maka workbench, terminal-shell, desktop-shell, plugins, skills, CI suites, ASF source release audit, provenance metadata, dependencies, and third-party notices to the synchronized NSH baseline. Generated-by: Antigravity
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Synchronize
third-party/nshfromv0.4.0(e626a8dd8f8d8b277b9507cfd5ac74d0e67020f3+ forkde176695240d550f2b303643b8019146c7989e7f) tolongbridge/nshmain(323a8663f6fdb63340c634a50da9bbb820037b69), keeping GPUI retired (crates/gpui,third-party/gpui-wgpu,examples/embed-gpuideleted) and retainingcrates/nsh-terminalandthird-party/icy_sixelwith minimal local delta:input_tokens.rs/InputProp::Tokens/Command::ReplaceRange,RetireListCell/ListCellRetired/ProjectRoot/CancelTouch/HintWatchToken,Renderer/platform.isTerminal/Environment::terminal_keyboard,TextEngine::measure_canvas,OverlayProp::FocusReturn,LayoutTree::lifetime, and the legacy software TUI compositor) in favor of upstreamIdiom::Terminal(platform.idiom === 'terminal'),Environment::ctrl_for_command,Core::sync_kept,MountItem::TreeOrder,ProjectStates, and cell-idiomnsh-platform-tui; placeEventKind::ScrollIntentat the end ofEventKind::ALLsonsh-platform-androidJNI constants stay unmodified.nsh-core: preserve sibling component listener fan-out and nested emits inCore::deliver_component_event/take_emitted_events.nsh-js: separate deferredListStatelength signals and refresh retained keyed cellitemvalues whensplice_count == 0.nsh-platform-tui: retain pendingfocus_requestsuntil an attached target becomes focusable (cancelling on detach,blur, or user navigation), and scopeAppView::accessibility_snapshotto visible nodes in the activeinput_scope.nsh-platform-windows&nsh-platform-macos: allowViewKind::Inputcaret sinks withPointerEvents::None(Editorand upstreamRichEditor) to hold focus, publishfocus_path, exposeterminal_target, and participate inTabtraversal when editable without selecting hidden-caret sink text.products/maka/workbench,products/maka/terminal-shell,products/maka/desktop-shell,plugins/**,skills/**,DESIGN.md) and update CI suites, ASF source release audit, provenance metadata (SOURCE.md,upstream.json,docs/code-origin-audit.md),LICENSE,DEPENDENCIES.rust.tsv,THIRD_PARTY_NOTICES.txt, andnotices.json.Verification
third-party/nshportable crates (nsh-core,nsh-i18n,nsh-updater,nsh-terminal,nsh-platform-web+nsh.test.mjs,nsh-platform-android,nsh-platform-ios,nsh-base,nsh-js,nsh-dev,nsh-bundler,nsh-package,nsh-testing,nsh-engine,nsh-cli) unit, integration & doc tests with-D warnings: passed.nsh-platform-tui(50 unit + 328 integration) andnsh-tui-host(9 + 18) with-D warnings: passed.cargo checkfornsh-platform-apple,nsh-windows-app,nsh-windows-host, andnsh-platform-linux: passed.maka-ui-build(1/1),maka-workbench(27/27),maka-terminal-shell(70/70),maka-cli --bins(57/57),maka-cli --test integration terminal::(23/23),product_composition(2/2),node scripts/ci.mjs run termina: passed.node scripts/ci.mjs check format,check contracts,run tooling-tests(264/264),check licenses(2678 covered + 2932 excluded),check notices,run product(23 plugin packages + 6/6 tests), andscripts/asf-source-release.test.mjs: passed.nsh-platform-windows --features terminal(-D warnings): 223/223 unit + 2/2 doc tests passed.maka-desktop-shell: 3/3 passed.maka-terminal-shell --test native-pixels: 2/2 passed.maka-cli --no-default-features --features desktop-tests --test native-desktop desktop_new_session: 22/22 passed.nsh-platform-macoscross-checked against macOS SDK; runtime covered in CI).AI use
Select exactly one:
Tool(s) and scope: Antigravity — upstream three-way merge, platform focus fixes, Maka consumer migration, provenance/notice updates, and WSL/Windows test verification.
Checklist
Does this PR entail a change in behavior?