V1004 fixes#253
Closed
AdamKershner wants to merge 363 commits into
Closed
Conversation
merge upstream
Naveen updates
- Resolved conflicts in privacy.inc.xhtml and search.inc.xhtml - Kept Firefox Oasis custom data collection toggles - Merged 614 commits from upstream with latest Firefox updates
merge upstream
Fixed Graph recursion
merge upstream
… keeping upstream online toggle and retaining Oasis data-collection toggle
… SidebarController; add BUILD_GUIDE.md; include custom branding Assets.car; update assistant bundle and lockfile for reproducible builds
merge upstream
merge upstream
merge upstream
merge upstream
Merge upstream
merge upstream
…build-guide Assistant sidebar: load bootstrap in browser.xhtml and integrate with…
splitview, hubs integration with firefox bookmarks
Merge upstream
…om assistant UI - Updated all branding assets (tab icons, new tab logos, app icon) with Kahana logo - Regenerated firefox.icns from kahana_logo.svg - Updated assistant UI to remove 'Check authentication' button - Added convert_logo.sh script for generating branding assets from SVG
Update branding with Kahana logo and remove 'Check authentication' fr…
- Base limit from plans/map/default, not Lambda quota.daily_limit - Daily used from llm_usage when query succeeds; else max(API, DB) - TokenUsageBar: plan source note; rebuild bundles Co-authored-by: Cursor <cursoragent@cursor.com>
…lish - Embed daily token bar in composer; empty-state and thread field styling - Onboarding checklist above chat scroll; typewriter and chip UX fixes - Sunlight-style invite glows; flat textarea after first message; smaller toolbar - Rebuilt assistant.ui.bundle Co-authored-by: Cursor <cursoragent@cursor.com>
…-up copy Co-authored-by: Cursor <cursoragent@cursor.com>
Add deterministic capabilities markdown (sections, examples, support links), shared constants, ChatTimeline markdown rendering with legacy delimiter fallback, scoped styles, and encouragement copy for feedback and thumbs training. Regenerate assistant.bundle.js and assistant.ui bundles. Co-authored-by: Cursor <cursoragent@cursor.com>
Two-pill train row with help icon; promo earn chip and subtle post-dismiss hover text; rebuild assistant bundles. Adds training metrics helper and training progress migration. Co-authored-by: Cursor <cursoragent@cursor.com>
- ui-preact: declare supabase.rpc on SupabaseAuthLike - assistant build: runtime types, commands buckets, transcribe options, knownSites Map typing, voiceAgent localStorage, embedding-worker entry - browser-sidebar: gate overlay messages on source/origin; dedupe listener - embedding: load chrome embedding-worker.html; frame script relays only; rebuild embedding-worker.bundle.js and assistant.bundle.js Co-authored-by: Cursor <cursoragent@cursor.com>
Add embedding-assets (ORT jsep wasm/mjs + Xenova all-MiniLM-L6-v2 q8 ONNX and tokenizers), package in jar.mn, configure worker env to forbid remote hub and point wasmPaths/localModelPath at chrome resources. Add sync-embedding-assets script, build:embedding-worker npm script, and BUILD_GUIDE note for upgrades. Co-authored-by: Cursor <cursoragent@cursor.com>
…popover
- Store AssistantSession turns as plain {type, content} in JSM for overlay reload safety
- Add oasisSyncSessionFromPlainTurns; wire session controller sync
- IndexedDB chat store (conversations, messages) scoped by user
- useAssistantRuntime: load/save chats, new/open conversation, debounced persist
- useAuthSync: drop history event replacing UI (IDB is source of truth)
- Header clock popover: search, recency groups, on-brand search focus styling
- Rebuild assistant.bundle.js and assistant.ui.bundle.js
Co-authored-by: Cursor <cursoragent@cursor.com>
- ui-preact: platform @esbuild bins, typescript devDependency, tsc shims - lambda/voice-runtime: node_modules from local npm install Tracked ui-preact vendor deps (esbuild win32, preact) unchanged. Chat history code was already on feature/beta-fixes. Co-authored-by: Cursor <cursoragent@cursor.com>
Add embedding-assets (ORT jsep wasm/mjs + Xenova all-MiniLM-L6-v2 q8 ONNX and tokenizers), package in jar.mn, configure worker env to forbid remote hub and point wasmPaths/localModelPath at chrome resources. Add sync-embedding-assets script, build:embedding-worker npm script, and BUILD_GUIDE note for upgrades. Co-authored-by: Cursor <cursoragent@cursor.com> Amends cherry-pick: add embedding-worker.html and embedding-frame-script.js from parent 03265cc (referenced by jar.mn entries in this change). Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
- Replace LangGraph with explicit streamAgentLoop driver (smaller bundle). - native-assist: multi-turn Gemini route_command loop with optional refine and inner_rounds; client assistRemote options + build env wiring. - Integrate railroad-memory (IndexedDB) with pruned prompt injection for router and chat; record turns via addRawSession; UI sets session key. - esbuild aliases stub Node fs/path for railroad-memory FileStorage chunk. Co-authored-by: Cursor <cursoragent@cursor.com>
Parity with Lambda native-assist: inner route_command loop, inner_rounds, max_inner_rounds / refine_after_route body fields, ASSIST_MAX_INNER_ROUNDS secret, and client generation_config merge. README notes deploy slug vs URL. Co-authored-by: Cursor <cursoragent@cursor.com>
Restore Supabase anon/service clients, JWT user resolution, daily token limits (user_plans / llm_daily_usage), and record_llm_usage RPC. Sum token usage across multi-turn Gemini rounds before recording. Keep max_inner_rounds, refine_after_route, and generation_config merge. Co-authored-by: Cursor <cursoragent@cursor.com>
- native-assist: aggregate GenAI usageMetadata across inner rounds; attach usage_metadata - messageUtils: extractTokenCountsFromUsageMetadata / extractTokenCountsFromAssistPayload - subscription: updateFromAssistUsageStats (Edge usage_stats), recordAssistRoutingTokens (llm_usage, no monthly unit bump) - supervisorAssist: sync subscription after assist routing - proxyClient: document usage_metadata / usage_stats on AssistResponse - Track build/tests/*.test.ts; ignore only tests/tmp*.mjs; add test:assist-usage Co-authored-by: Cursor <cursoragent@cursor.com>
- agentGraphSupport: splitInternalArgs, ambiguity helpers; constants INTERNAL_CHAIN_NOTICE_ARG - agentSteps: createCommandToolAgent (tool nodes); graph.ts slimmer - Railroad: optional structured extraction (Railroad.getExtractionPrompt + assistRemote JSON + processExtraction) every N turns via OASIS_RAILROAD_EXTRACTION_INTERVAL (esbuild define; default 4, 0 disables) - npm run eval:agent-loop — streamAgentLoop ordering and maxSteps cap checks - .env.defaults comment for extraction interval Co-authored-by: Cursor <cursoragent@cursor.com>
… updates - Drop Settings menu item from Header (avoids alert in chrome UI); rebuild Preact bundle. - Subscription service and TokenUsageBar/Feedback/types adjustments. - Regenerate assistant.bundle.js; add docs/windows-build-icu-warnings.md for Windows ICU warnings. Co-authored-by: Cursor <cursoragent@cursor.com>
- Header: ResizeObserver compact mode (<380px), hide Beta, shorten title; left overflow hidden; Beta can shrink when shown. - ChatHistoryPopover: position fixed to assistant container right edge, rAF-coalesced resize, deduped layout state. - Rebuild assistant.ui.bundle.js. Co-authored-by: Cursor <cursoragent@cursor.com>
When auth transitions from signed-in to signed-out, set view to auth so the OAuth/email screen appears instead of the guest chat layout. Co-authored-by: Cursor <cursoragent@cursor.com>
Wire chatStore deleteConversation through the runtime with correct active-thread and empty-list handling. Add trash + inline confirm in the chat history popover and Header/App props. Also style the chat history trigger focus ring with primary green tokens and rebuild dist bundles. Co-authored-by: Cursor <cursoragent@cursor.com>
- Horizontal compact training stepper and full-width info popover - Smaller category chips, textarea hierarchy, submit button spacing - Char meter and motion prefers-reduced-motion tweaks Co-authored-by: Cursor <cursoragent@cursor.com>
- Add SidebarController._switchOasisAssistantLayout with swapDocShells and legacy hide/show fallback on failure or inconsistent state - Extract _installOasisOverlayPresentation and _applyOasisDockedLayoutSwitch - FLIP-style shell transition from sidebar when prefers-reduced-motion allows - Wire postMessage toggle and assistantBridge.runOasisAssistantLayoutToggle - Skip Mixpanel fetches under Cu.isInAutomation for test harness safety Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
- Move pill visuals to toolbarbuttons.css (toolbar tokens, squircle). - Remove legacy lime urlbar .oasis-chat-button rules from urlbar-searchbar.css. - Use oasis-assistant-launcher.svg; center pill in toolbaritem for VPN row alignment. - Match .toolbarbutton-icon hit target size (16px icon cell). Co-authored-by: Cursor <cursoragent@cursor.com>
No Taskcluster jobs started for this pull requestThe |
Contributor
|
(Automated Close) Please do not file pull requests here, see https://firefox-source-docs.mozilla.org/contributing/how_to_submit_a_patch.html |
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
10 participants
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.
No description provided.