Repository navigation
Merge upstream 8a0b439 (14 commits) - #8
Closed
tournierjc wants to merge 15 commits into
Closed
tournierjc wants to merge 15 commits into
tournierjc wants to merge 15 commits into
Conversation
* chore: define issue triage labels and collaborator-only guidance * chore: scope issue intake to the standalone CLI * chore: retain Desktop feedback alongside CLI source support * fix: allow policy questions without a product or platform
* fix: preserve system prompts for Kimi Coding * fix: preserve system prompts for DashScope * Revert "fix: preserve system prompts for DashScope" This reverts commit d8d6061.
…x-AI#224) Adapt drowzeys/minimax-code commit 0b24a77 from issue MiniMax-AI#216. Reserve the three-column hit gutter, preserve content selection and mouse routing, and cancel scrollbar drags beneath overlays. Co-authored-by: drowzeys <drowzeys@users.noreply.github.com>
* feat(tui): add a context-meter status line item The status line can already show remaining context headroom as a bare percentage (context-remaining), but a numeric readout is easy to miss while working. Add an opt-in context-meter item that renders the same remaining-headroom value as a compact gauge, e.g. 'Context ▕██████░░▏ 77% left', so the line drains and recolors as the Session approaches its context window. - New canonical item 'context-meter' with 'context-bar' and 'context-gauge' aliases; not part of the default item order. - Renderer shares the runtime usage snapshot, model fallback, and error/warning thresholds with 'context-remaining', and shrinks to a shorter gauge before collapsing to the 'Ctx N%' minimal variant. - Settings picker gains English/Chinese descriptions; the shared status line documentation covers the item, aliases, and opt-in semantics. Validation: tsc -p tsconfig.standalone.json clean; vitest tui-status-line-items.test.ts, tui-workspace-status-line.test.ts, and status-line-picker.test.ts pass (98 tests); node scripts/source-inventory.mjs passes with no inventory changes. * fix(tui): deduplicate context meter and share headroom rendering Review and harden the opt-in contribution from drowzeys/minimax-code commit 4076c6f (issue MiniMax-AI#217). Preserve the original author commit; cover aliases, priority, fallback, thresholds, width fitting, missing data and localized settings. --------- Co-authored-by: drowzeys <drowzeys@users.noreply.github.com>
Add provider add --support-image and preserve capability metadata through create and update inputs. Cover saved configuration and actual image transport with the packaged offline BYOK fixture. Adapted the CLI declaration and capability preservation approach from smartworldarafath/minimax-code commit 6ec8ad0. Keep explicit image-input semantics without inferring vision from generic attachments or catalog fallbacks. Co-authored-by: smartworldarafath <smartworld.bd.710@gmail.com>
* fix: preserve system prompts for DashScope * fix(ai): cover official DashScope plan and workspace hosts
* fix: preserve system prompts for DashScope * fix: preserve system prompts for SiliconFlow China * fix(ai): cover official DashScope plan and workspace hosts * fix(ai): cover both official SiliconFlow API hosts
…AI#231) Allow read-only access to designated skill roots while retaining private-state and symlink guards. Cover permission modes and resource operations through the runtime facade.
# Conflicts: # docs/tui-capabilities.md # packages/local-runtime-v2/src/application/session/process-local-application-contract.ts
Collaborator
Author
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
5 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.
Merge upstream 8a0b439 (14 commits)
Source : MiniMax-AI/minimax-code @
8a0b439(base fork mainb90cfe9). 14 commits merges, 0 bloque, 0 doublon (verifie vs PR #1-#7).Commits merges (14)
8a0b439fix: preserve system prompts for Mistral Chat Completions (fix: preserve system prompts for Mistral Chat Completions MiniMax-AI/minimax-code#210)e1e9adcfix: preserve builtin and active-agent skill resource reads (fix: preserve builtin and active-agent skill resource reads MiniMax-AI/minimax-code#231)72059a6fix: bound Windows integration test cleanup and I/O waits (fix: bound Windows integration test cleanup and I/O waits MiniMax-AI/minimax-code#232)0fa4888fix: preserve system prompts for SiliconFlow (fix: preserve system prompts for SiliconFlow MiniMax-AI/minimax-code#209)71d0cbafix: preserve system prompts for DashScope (fix: preserve system prompts for DashScope MiniMax-AI/minimax-code#207)745386cfeat: support session-scoped interactive model overrides (feat: support session-scoped interactive model overrides MiniMax-AI/minimax-code#227)72a64dafix: diagnose content review failures without blaming connectivity (fix: diagnose content review failures without blaming connectivity MiniMax-AI/minimax-code#226) — revue manuelle : le preflight l'avait marque telemetrie (faux positif, cf. precedent ee8ed6c). Le nouveaucreateSafetyFailureReporter(diagnostics.ts) appelle uniquementlogger.warnlocal avec un UUID aleatoire et le hostname de l'appel ; ZERO fetch/URL externe/upload. Pas de nouveau host sortant.939121dfix: persist explicit BYOK image capabilities (fix: persist explicit BYOK image capabilities MiniMax-AI/minimax-code#225)ee8ed6cfeat(tui): add opt-in context meter status item (feat(tui): add opt-in context meter status item MiniMax-AI/minimax-code#223) — faux positif telemetrie confirme (UI status-line pure)ab0065afeat(tui): interactive fullscreen transcript scrollbar (feat(tui): add an interactive fullscreen transcript scrollbar MiniMax-AI/minimax-code#224)ab67683fix: preserve system prompts for Kimi Coding (fix: preserve system prompts for Kimi Coding MiniMax-AI/minimax-code#206)9225847chore: clarify issue triage (chore: clarify issue triage MiniMax-AI/minimax-code#208)e55e1eddocs: custom_provider headers for third-party relays (docs: document custom_provider headers for third-party relays MiniMax-AI/minimax-code#212)a20531adocs: Ghostty Option permission shortcuts (docs: explain Ghostty Option permission shortcuts MiniMax-AI/minimax-code#222)Preserves du fork (verifies apres merge)
docs/telemetry.md,packages/config/src/telemetry-policy.ts,packages/tui/src/analytics/*,packages/tui/src/cli/telemetry-command.ts: toujours supprimes (le code telemetre upstream qui reintroduisaitrequireTelemetryRunnerdans program.ts a ete ecarte par la resolution).packages/shared/src/egress-guard.ts,packages/tui/src/runtime/egress-guard.ts,scripts/check-egress-guard.mjs,docs/egress-policy.md— diff vs origin/main = vide.Conflits resolus (4)
docs/telemetry.md: UD → delete (accepte fork).packages/tui/src/cli/program.ts: hunks telemetry amont (commandetelemetry status/preview+requireTelemetryRunner) ecartes ; hunks lies (option--support-image) conserves.docs/tui-capabilities.md: phrase de regression-test amont (reference session-report/telemetry) ecartee, section fork gardee ; section amont « Interactive startup model » (feat: support session-scoped interactive model overrides MiniMax-AI/minimax-code#227) conservee.packages/local-runtime-v2/.../process-local-application-contract.ts: import union — garde les deux (UserModelInputViewfork +CopilotOAuthStatusfork PR feat: GitHub Copilot model provider connector (live catalog, context + reasoning effort) #2), tous deux exports par model-system/index.ts.release/public-source.json+test/vitest-suites.json: regeneres vianode scripts/source-inventory.mjs --write(4186 chemins) ; entrees de test du fork conservees (copilot/openrouter/deepseek presents).Gates (check_gates.sh, node via shim corepack→npx pnpm@9.12.0, --config vitest.oss.config.mjs)
Aucun push sur main. Merge via cette PR uniquement.