mirror of
https://github.com/unslothai/unsloth.git
synced 2026-11-01 19:50:16 +00:00
14 commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
|
|
50b9deacb0
|
Trim comments in tests (#13844)
Comment and docstring changes only, in test files, split out of #12968 so the test-only part can merge first. |
||
|
|
3bf6002c69
|
Studio: list at most the 12 most recently active projects and sections in Move to (#12155)
* Studio: list at most the 12 most recent projects and sections in Move to Move to rendered every project and every section, so a long list made the submenu slow to open. Each group now lists the 12 most recent: projects by last update, sections newest first as the store keeps them. The one the chat is already in is still left out. * Studio: rank Move to projects and sections by activity, not edit time or drag order A project's updatedAt only moves when it is edited, so a project with the newest chat could miss the 12. Rank by its newest chat, the same activity the sidebar's folder order uses, now one shared projectActivityAt. Section order follows drags, so the first 12 were not the most recent. New sections record createdAt, and a section ranks by the newest of that, its chats and its projects. * Apply required pre-commit formatting to merged main tests --------- Co-authored-by: wasimysaid <wasimysdev@gmail.com> |
||
|
|
be9e6afd92
|
Tests: stop Windows tests tripping Bitdefender and the 16-bit application dialog on real machines (#12167)
* Keep Windows test runs free of AV hits and 16-bit dialogs The console-less output-encoding probe detached itself with a kernel32 FreeConsole P/Invoke written into the .ps1, which Bitdefender quarantines. Spawn the child with DETACHED_PROCESS instead so it never has a console, and have the probe report whether it can reach a console screen buffer so a run that still had one is refused rather than passing blind. The --no-rollback XPU case wrote batch text into Scripts\python.exe and let install.ps1 execute it, which raises the Unsupported 16-Bit Application dialog on Windows. Stub Invoke-BoundedPythonProbe there with the real helper's return shape, pin what it was asked, restore the extracted definition afterwards, and assert the verdict on Windows instead of skipping it. * Answer the launcher --version check without starting the MZ stubs Two restore tests left subprocess.run unpatched, so the updater ran the few-byte MZ launcher stubs for real. On a Windows desktop that can raise the 16-bit application dialog. Raise the exec format error those runs produced instead, and check which file the restore asked. * Answer non-PE launches on Windows instead of starting them The broken uv.exe in the FindInstalledUv Pester suite and the rotten llama-server.exe in the keep-install back-compat test are text files that the code under test really launched on Windows, where a .exe that is not a PE image can raise the 16-bit application dialog. On Windows only, Start-Process (Pester) and run_capture (pytest) now refuse a file without an MZ header with ERROR_BAD_EXE_FORMAT, the answer the loader gives, and never start it. Real images still launch for real and POSIX keeps the real exec. The uv suite also checks the broken file is not an image and that the finder did ask it before skipping. * Keep the in-child FreeConsole probe, since 5.1 cannot start detached, and run it only on CI or opt-in * Drop the RawUI console check; the host keeps its screen buffer handle after FreeConsole * Stand in for real .exe files with a pip-style console launcher instead of a renamed where.exe |
||
|
|
bd612c8635
|
Remove the reflection-emit apparatus and all four emitted types (#11193) | ||
|
|
4becbbd24d
|
Delete the emit apparatus that existed to colour a banner, now that measurement says it was a no-op (#10999)
* Windows installers: read the console's virtual terminal support instead of emitting a P/Invoke thunk for it install.ps1 and studio/setup.ps1 both emitted a reflection-built type declaring GetStdHandle, GetConsoleMode and SetConsoleMode for one consumer: the ANSI colour banner. That cluster (a dynamic assembly, a kernel32 P/Invoke, and in setup.ps1 a hidden child interpreter to gate it) is the densest malicious-looking region in either script and the only thing behind the one high-severity Sigma rule VirusTotal reports, and it is decoration. Windows PowerShell's console host performs that exact sequence at startup and reports the outcome through $Host.UI.SupportsVirtualTerminal. The pre-flight in PR #10984 measured 5.1.26100 attached to a real console: the property answers True, the native call answers True, and the console mode read before touching it is already 0x7, so the SetConsoleMode was re-setting a bit the host had set. The property is also the stricter of the two, because TryTurnOnVirtualTerminal re-reads the mode after setting it while the deleted code trusted SetConsoleMode's return value. The redirected case is unchanged and still decided first, by $script:StudioStdoutRedirected, before the property is read, so the Tauri pipe path and the CLI are untouched. The emit apparatus itself stays in both files. setup.ps1's Get-NvidiaLibraryProbeType emits the nvml and nvcuda imports through the same gate, so its coverage in tests/python/test_windows_installer_native_type_fallback.py stays parametrised over both scripts; only the console-helper test is install-only. Rebuilt as one commit on current main. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> |
||
|
|
95feb6979e
|
Windows installer: emit the native path helper instead of compiling it (#10540)
* Windows installer: emit the native path helper instead of compiling it
Bitdefender blocks Unsloth Desktop during the first "Get started" run on
Windows 11, including elevated. The chain it reports is
unsloth-stud... -> powershell.exe -> csc.exe -> %TEMP%\<random>.dll
and the verdict lands on the generated DLL (Gen:Variant.MSILHeracles), not
on anything we ship. Bisecting the reports: 0.1.800-beta installs fine,
0.1.803-beta and later block. In that window the installer went from one
Add-Type compile to two, the second retrying under a private TEMP after
the first failed. Every shipped exe in the range is 0/70 on VirusTotal, so
the shipped bytes are not what is being detected; the behaviour is.
Add-Type -TypeDefinition on Windows PowerShell 5.1 has no in-process
compiler, so it writes C# to %TEMP% and shells out to csc.exe to produce a
DLL it then loads. PowerShell launching a compiler that emits executable
code into %TEMP% is a generic malware pattern, and heuristics fire on it.
The only thing the installer needed from that compile was three kernel32
P/Invoke declarations used to resolve a final path across a reparse point.
Reflection.Emit builds exactly those, in memory: DefineDynamicAssembly with
AssemblyBuilderAccess::Run, then DefinePInvokeMethod per import. No
compiler process, no source file, no DLL on disk, and the assembly reports
an empty Location. Available on .NET Framework 4 and on .NET 5+, so 5.1
and 7 take the same path.
Changes:
- Initialize-StudioFinalPathNativeType emits CreateFileW,
GetFinalPathNameByHandleW and CloseHandle via DefinePInvokeMethod.
- Drop the private-TEMP retry added for the earlier compile failure. There
is no compiler to fail, and that retry is the second csc.exe launch in
the chain above.
- Get-StudioNativeFinalPath is now non-throwing end to end. DefinePInvoke
cannot request SetLastError, so Marshal.GetLastWin32Error is not
meaningful here; a failed call returns null and the caller drops to the
existing lexical answer with -Exact false, exactly as before.
- Get-StudioProcessImagePath loses its native branch. OpenProcess and
QueryFullProcessImageNameW existed only to shortcut what Get-Process and
Win32_Process already answer, and both were already the fallback.
install.ps1 now contains zero Add-Type -TypeDefinition sites.
Tests:
- tests/studio/test_native_path_resolver_degrades.ps1 runs the real
extracted resolver under pwsh on POSIX, where kernel32 does not resolve,
which is the same state as a host whose helper was taken away. It
asserts the type defines, nothing is written to the temporary directory,
the assembly is memory-only, and a native call that cannot work returns
null rather than throwing.
- test_installer_av_shapes.py learns to read imports declared through
DefinePInvokeMethod, asserts no C# compiler is invoked, and keeps
asserting the lexical fallback is still reachable.
Behaviour is unchanged on a machine where the native call works: same
exact path, same -Exact true. On a machine where it does not, the caller
already handled null and fails closed on the runtime lock as before.
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Address review: the remaining compiles, the process rung, and the code integrity gate
Review of the first commit turned up three things.
1. install.ps1 still compiled C# twice.
Add-Type -MemberDefinition reaches csc.exe exactly as -TypeDefinition does: it
wraps its argument in a class and compiles that. Two sites were left, the
virtual-terminal console thunk and the Explorer icon refresh, and the argument
for leaving them was conditional: the redirect guard keeps the desktop app off
the first, and Tauri returns before the second. A guard that holds only for the
entrypoint we happened to look at is what let this reach the field in the first
place, and the standalone `irm | iex` path reached the console compile on every
run.
Both now emit. The three emit sites share one helper,
New-StudioEmittedNativeType, and studio/setup.ps1 carries its own copy for its
own console thunk, which was compiling too.
Add-Type no longer appears in either script. -AssemblyName would be the one
acceptable form, since it loads an assembly that already exists and reaches no
compiler, but neither script uses it outside a generated launcher.
2. Dropping the native process-image rung was a regression.
The first commit removed OpenProcess and QueryFullProcessImageNameW from
Get-StudioProcessImagePath on the grounds that Get-Process and Win32_Process
already answer. They do not always. Process.Path goes through MainModule, which
needs PROCESS_VM_READ and is refused across users and across bitness, while
QueryFullProcessImageNameW needs only PROCESS_QUERY_LIMITED_INFORMATION and
Win32_Process needs a working WMI service. With neither answering,
Get-RunningStudioVenvProcesses finds nothing and the install proceeds over a
venv Unsloth still has open, which is the case its abort exists for.
The rung is back, emitted rather than compiled. The ladder is now identical to
the one on main.
3. Reflection emit has one failure mode that cannot be caught.
App Control's Dynamic Code Security (policy option 19) always blocks loading
unsigned assemblies built with System.Reflection.Emit, and Microsoft documents
the parent process as usually stopped or crashing rather than raising, so a
try/catch around the emit is not enough:
learn.microsoft.com/en-us/windows/security/application-security/application-control/app-control-for-business/design/appcontrol-and-dotnet
Test-StudioCanDefineNativeTypes is now the gate every emit site checks first. It
keeps the Constrained Language check, which is what fires in practice since a
host enforcing user-mode code integrity puts PowerShell in Constrained Language,
and adds a Win32_DeviceGuard probe for a policy that somehow left the language
mode alone. Unreadable means unrestricted: a host with no Device Guard at all is
the common case and is not a reason to refuse.
Also: stale comments describing the compile, the CS2001 failure and the private
TEMP retry, none of which exist any more.
Tests:
- tests/studio/test_native_path_resolver_degrades.ps1 now parses install.ps1
with the PowerShell parser rather than the brace-counting extractor in
tests/studio_setup_ps1, which runs past the end of any function holding a
brace inside a string; Resolve-StudioLinkTarget has one. It runs the whole
ladder, not only its top rung, and asserts the lexical answer still arrives
with Exact false, that both process-image rungs answer, that GetConsoleMode's
out parameter is emitted by-ref and SHChangeNotify still returns void, and
that defining a type twice neither throws nor corrupts the first definition.
- test_installer_av_shapes.py bans Add-Type in both scripts rather than
-TypeDefinition in one, and OpenProcess and QueryFullProcessImageNameW are
back in the allowed import inventory with the reason they cannot be replaced.
tests/studio plus the Windows installer guards: 8688 passed, 215 skipped. The
real install, setup, update and repair entrypoints under
tests/studio/test_path_probe_access_denied.ps1: all checks passed.
* Rewrite the Add-Type fallback suite for a design with no compiler in it
Staging CI caught a whole test file I never ran:
tests/python/test_windows_installer_addtype_fallback.py, 1612 lines built
entirely around the compile-and-retry path this branch removes. Five of its
tests failed. My local runs covered tests/studio, the Windows concurrency guard
and a handful of tests/test_installer_*, and none of them reach this file.
Two of the five were collateral. LOCK_CHAIN extracts the resolver chain function
by function, and the chain gained Test-StudioCanDefineNativeTypes,
New-StudioEmittedNativeType and Get-StudioNativeFinalPath, so the link-resolution
tests were calling helpers the harness never defined and reading the
CommandNotFound as "could not resolve".
The other three described the removed design and had to say something else:
- test_install_lock_is_acquired_when_the_compiler_fails is now
test_install_lock_is_acquired_when_the_native_helper_is_unavailable. The bug in
#9140 was a throwing Add-Type; the same bug now is a host that cannot define a
type at all, which is the same thing to every caller, and NO_NATIVE overrides
the gate both Constrained Language Mode and Dynamic Code Security come through.
- test_the_compiler_is_not_retried_for_every_path asserted CALLS:2, one attempt
plus one private-TEMP retry. It is now
test_the_compiler_is_never_called_however_many_paths_are_resolved and asserts
zero. The caching that count stood in for gets its own test against the emit.
- test_the_private_temp_retry_recovers_the_native_helper becomes
test_the_native_helper_is_built_with_no_usable_temp_at_all. The retry existed
because compiling wrote a source file into %TEMP%; emit writes nothing
anywhere, so the same unusable %TEMP% is simply irrelevant, and the assertions
that TMP and TEMP are handed back untouched carry over unchanged.
New: test_a_dead_compiler_is_not_something_the_installer_can_notice. Sabotaging
Add-Type has to change nothing at all now, which is the property worth pinning,
and a failure there means a compile came back.
Renamed to test_windows_installer_native_type_fallback.py, since the fallback it
guards is no longer about Add-Type. Nothing references the old name.
The file: 58 passed.
Also checked, and NOT mine. Five other failures in that staging run reproduce on
a clean worktree of origin/main at
|
||
|
|
971eb36f48
|
Trim comments in tests, scripts, CI helpers and unsloth_cli (#10113)
* Trim comments in tests, scripts and CI helpers
Comment-only pass over 453 changed files under tests/ (excluding the
studiobench harness), scripts/ and .github/scripts/.
17,749 -> 10,635 comment lines (-40.1%)
1,183,079 -> 757,190 comment characters (-36.0%)
Distinctive-fact retention against the base commit: 93.2%. A sample of 100
restoration and deletion decisions was judged by hand: 98 correct.
No comment line exceeds 120 physical characters. Nothing outside comments
changes: no code, docstrings, string literals, licence headers or pragmas.
Verified with an AST code-only signature of every file against the base.
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Put the moved comments back on the code they describe
The signal-handler rationale in launch.py had been reattached to the
handler registration loop, which has no try/finally, and its except-branch
note had been split into a fragment starting mid-sentence with the noqa
marker duplicated into the prose. The PORT_FILE launcher comments had been
reattached to the _studio_root_id caching test, which does not touch
PORT_FILE.
* Put the section banners back, and use plain dashes in comments
The trim removed the rule-line comments that index these files. Tests locate a
region by finding its banner and end it on the next one, so a missing banner is
a broken anchor rather than lost decoration. Each is restored above the code
line it preceded at
|
||
|
|
827d25931b
|
Stop 19 test files racing on one PowerShell startup cache (#9371)
* Stop 19 test files racing on one PowerShell startup cache
Backend CI run 32341628757 on `
|
||
|
|
6c124b6dd8
|
Run the repo CPU test suite on all four runner cores (#9019)
* Fix a 500 on dictation Unload before any backend is resident
stt_unload passes expected_model positionally:
_, unload_stt = _stt_lifecycle()
failed = await asyncio.to_thread(unload_stt, engines, model)
_stt_lifecycle() returns the orchestrator's unload_stt_model when a backend is
resident and stt_registry.unload when one is not. Only the first takes
expected_model positionally; on the registry it sits behind a `*`:
def unload(engines = None, *, wait = True, expected_model = None)
def unload_stt_model(self, engines = None, expected_model = None)
So with nothing loaded yet, which is what a fresh process is, Unload raises
TypeError and the route answers 500. Reproduced outside pytest:
peek_inference_backend() fresh process: None
stt_unload -> TypeError: unload() takes from 0 to 1 positional arguments
but 2 were given
Pass it by keyword, which both callables accept.
Found while profiling CI, not by the tests, and the tests are why: this file's
two unload tests passed only because an earlier test in the full suite had left
a backend resident. Standalone they failed, and in their own file they failed;
they went green only inside the full serial run. That order dependence hid a
live bug. The new test drives the no-backend path directly, so neither the
signature nor the call site can drift back.
before: 2 failed, 53 passed (file alone)
after: 56 passed
* Run the repo CPU test suite on all four runner cores
Backend CI is the most expensive workflow in the repo at 126.7 runner-minutes
per push. Install is cached at ~1.2 minutes, so almost all of it is pytest.
ubuntu-latest has 4 vCPUs and this suite is CPU-bound and GPU-free, so it was
running on one core of four.
On a real runner the step goes 17.75 minutes to 7.67, and the failure set is
unchanged: the same single pre-existing failure, serial and parallel, on the
same tree in the same staging repo. Locally, on the dependency shape the
workflow installs, 806.1s to 219.7s with an identical 2 failed / 8066 passed /
178 skipped / 40 subtests result.
The three small pytest steps in this job stay serial: the hardware-spoof step
exists because those files mutate hardware.py module globals, and all three
already measure under 0.1 minutes.
The four-interpreter matrix is deliberately left alone. It is the bigger prize
at ~79 runner-minutes, but measured under -n 4 on a real runner it fails tests
serial does not, in more than one way and not the same way twice, so it needs
its order dependencies found and fixed first rather than a flag.
* Pin the two unload signatures against the route's one call site
The bug fixed in the previous commit exists because _stt_lifecycle returns two
different callables and the route has a single call site:
def unload(engines = None, *, wait = True, expected_model = None) # stt_registry
def unload_stt_model(self, engines = None, expected_model = None) # orchestrator
A call that suits one is a TypeError on the other, and which one runs depends on
whether a backend happens to be resident, so the broken half only appears on a
fresh process. That will recur the next time either signature is edited.
This binds BOTH real signatures against the arguments the route actually passes.
It does not demand they be identical, only that one call site can serve both.
Checked against two mutations:
registry grows a keyword-only param -> passes (benign, and it should)
registry drops expected_model -> fails, "got an unexpected keyword
argument 'expected_model'"
Paired with the test beside it: that one covers the call site (route -> registry
on a cold process), this one covers the two callees staying compatible.
57 passed.
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Give each node harness run its own script file
Reported on this PR, and reproduced before changing anything. Every _run in
test_chat_preset_builtin_invariants.py wrote the same TEMP/run.mts and then
executed "node run.mts" from TEMP. Under pytest-xdist's default load
distribution two of this file's nine tests can land on different workers, so one
worker executes the script the other just wrote over the top of it.
Pinned to four cores, running the file at -n 4:
before: 5 failed / 6 failed / 5 failed / 5 failed / 6 failed (of 9)
after: 9 passed, six runs out of six
Serial is unchanged at 9 passed either way, which is why the full-suite runs
that back this PR did not show it: at ~8000 tests across four workers these nine
rarely collide, so it is a latent flake rather than a reliable failure. That is
worse, not better, and enabling -n 4 is what would have started rolling the dice.
A unique NAME rather than a per-call directory, which is what
tests/studio/_node_harness.py::run_harness does for every other node harness
here. Those scripts reach the frontend sources by a relative path counted from
TEMP, so an extra directory level breaks every import with ERR_MODULE_NOT_FOUND
(tried it: 9 failed). register.mjs and loader.mjs stay shared because their
contents are fixed, so a concurrent rewrite writes identical bytes.
Swept the other five fixed TEMP roots under tests/studio: all of them already
allocate per call through tempfile.mkdtemp, directly or via run_harness. This
file was the only one rolling its own.
* Shorten the harness comment
* Stop two more shared-state races the parallel repo job would expose
Both reported on this PR, both real, both confirmed by reading the code.
1. tests/studio/test_chat_preset_builtin_invariants.py still rewrote the shared
register.mjs and loader.mjs on every _run. Only run.mts became unique in the
previous commit. write_text truncates before it writes, so a worker rewriting
one of those while another worker's node process is importing it can hand that
process an empty or partial module. The contents are constant, which is why I
wrongly called a concurrent rewrite harmless: identical bytes still arrive
after a truncation. They are now written through a temp file and os.replace,
so every reader sees one whole version.
2. tests/python/test_no_torch_filtering.py::TestRealRequirementsFiltering had an
autouse fixture that snapshotted the requirements directory and, at teardown,
deleted every filtered file that had appeared since. Those files land in the
REAL requirements directory, not tmp_path, so under xdist one test's teardown
removes a file another worker is still reading. It now records the paths it
creates and removes only those.
test_chat_preset_builtin_invariants.py: 9 passed serial, 9 passed on four -n 4 runs
test_no_torch_filtering.py: 65 passed serial, 65 passed on four -n 4 runs
no filtered files left behind
* Run the event-loop latency tests outside the parallel invocation
Reported on this PR. tests/studio/load_freeze asserts upper bounds on real
elapsed time -- a /health burst under 250 ms while a 600 ms blocking probe runs,
and a 100-request burst under 350 ms -- and those bounds ARE the contract, so
they cannot be loosened without the tests ceasing to test anything. A pytest
worker descheduled by the other three inflates them.
Measured before changing anything, under 3x CPU oversubscription (8 spinners
pinned to the same 4 cores): 8 ms against the 250 ms bound, 38 ms against the
350 ms one, 3 runs, no failures. So the margin is wide on this box. It is not
wide enough to leave alone: a runner core is several times slower, which puts
the 350 ms bound within reach of an unlucky schedule. The directory is now
ignored from the -n 4 run and runs in its own serial step, 20s against the
~10 minutes -n 4 saves on this job.
The ignore and the step are two edits held together by nothing, and losing the
step is silent -- the job stays green while 23 tests stop running. New guard
tests/studio/test_backend_ci_parallel_isolation.py fails if an isolated path is
missing from the parallel run's ignores, or ignored with no serial step running
it, for load_freeze and for the three hardware-spoof files that were already in
this shape. Deleting either half of the load_freeze change fails it; a third
test pins the command scan so it cannot pass by matching nothing.
load_freeze: 23 passed in 20.14s serial
new guard: 9 passed, and 1 failed under each of the two mutations
test_ci_shell_suite_coverage.py + test_xpu_spoof_pipeline.py: 58 passed
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Raise the matrix hang limit past the suite it was cancelling
Not a review item; found while triaging why every PR in this stack carries a red
check. The Backend CI matrix limit was 30 minutes, set when the step measured
14.1 to 15.0. It now measures 22.5 to 29.2, and it is cancelling: across the six
open PRs on this stack, five had exactly one leg cancelled at 30m9s while its
siblings passed at 25 to 29 minutes. Which leg loses is luck, so the red says
nothing about the PR, and a cancelled leg burns the full 30 minutes for no
signal.
45, which is what the Windows UI job already uses. This is a hang guard, not a
budget, and it costs nothing until a job needs it. The real fix is running this
matrix on all four cores, worth ~79 runner-minutes a push, and it stays blocked
on the order dependencies this stack is working through one at a time.
* Give each PowerShell probe its own script path
Reported on this PR, real, and reproduced directly. _run_capturing_bytes wrote to
tests/python/_{stem}_probe_{shape}.ps1, a name several tests share, so under
xdist one case unlinks the script another has written before that one's pwsh
child opens it. pwsh is installed on ubuntu-latest, so these do not skip there.
Reverting to the shared name and running -n 4 four times: 1 failed each time.
With a uuid in the name:
35 passed, 8 skipped serial
35 passed, 8 skipped on each of four -n 4 runs
no probe scripts left behind
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Stop the pin scanner reading a generated filtered file as a second pin source
Reported on this PR and reproduced. test_no_torch_filtering.py exercises
install_python_stack._filter_requirements, which writes
`.{stem}-filtered-XXXX.txt` BESIDE the source on purpose, so relative -r/-c
includes still resolve. test_diffusers_pin.py::test_only_the_pin_file_names_diffusers
scans REQ_ROOT.rglob("*.txt"), so under xdist it can see one worker's copy of
diffusers-pin.txt and report it as a second source of the pin.
Calling _filter_requirements on diffusers-pin.txt and then running that test
fails exactly as described. It is not only an xdist problem: the function passes
delete=False, so the file also survives a real install on any machine.
The scan now skips dotfiles. That matches what it means -- no CHECKED-IN
requirements file other than the pin may name diffusers -- rather than narrowing
it: a real second source still fails it (verified with a probe file), and the
production write path is untouched, since writing beside the source is the
behaviour that makes includes resolve.
5 passed with a filtered file present, 1 failed with a real second source
* Exempt only the generated filter files, not every dotfile
Reported on this PR and right: a checked-in hidden requirements file such as
.constraints.txt is a real place the pin could be overridden from, and the
blanket dotfile skip took it out of the scan.
Matched by the shape _filter_requirements actually writes now: a dot, the source
stem, "-filtered-", and NamedTemporaryFile's 8-character suffix.
generated filtered file present: 5 passed
checked-in .constraints.txt naming diffusers: 1 failed
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
|
||
|
|
9c69529705
|
Windows: stop compiling C# for colour on hosts that already render it (#8767)
* Windows: stop compiling C# for colour on hosts that already render it Enable-StudioVirtualTerminal is called unconditionally by install.ps1 and studio/setup.ps1, and it reaches Add-Type, which runs the C# compiler and drops a source file in %TEMP% on every install. An ANY.RUN submission of the shipped 0.1.701-beta Windows build captured that as two csc.exe processes and a "Suspicious source code drop". Under Windows Terminal there is nothing to enable: it always renders VT. Ask for that case first and skip the compile. All three conjuncts are load-bearing. WT_SESSION is inherited, so the desktop app's console-less spawn carries it into a pipe, and without the redirect check the Studio log panel would fill with escape sequences. $Host.UI.SupportsVirtualTerminal reports what the host CAN render, not whether this output buffer has ENABLE_VIRTUAL_TERMINAL_PROCESSING set, so it cannot carry the decision alone either. Nothing else moves. Outside this one function both scripts are identical to main line for line, and $script:StudioVtOk is the only value the function feeds, so the same verdict means the same bytes. The other compile stays. UnslothStudioFinalPathV2 feeds Get-StudioRuntimePathHash, which Python derives the same mutex name from byte for byte, so a managed fast path differing on case or an 8.3 name would let two installers each believe they hold the install lock. Guards: test_installer_av_shapes.py fails if the compile moves back ahead of the host check or loses a conjunct, and test_windows_setup_output_encoding.py runs this function beside the one it replaces on a real Windows host, with WT_SESSION forced set and forced empty, asserting the same verdict and the same banner bytes. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Decide the redirected case without the compiler, not the Windows Terminal one Review caught that the WT_SESSION test was unsound. WT_SESSION is inherited, so a run launched from Windows Terminal into a NEW legacy console, which is what an elevated install gets, carries it with stdout not redirected and a buffer that has no ENABLE_VIRTUAL_TERMINAL_PROCESSING. SupportsVirtualTerminal reports host capability rather than the state of that buffer, so the branch would have claimed VT and printed literal escape sequences. There is no sound way to learn the current buffer's mode without GetConsoleMode, which is the compile. So decide the other direction instead: a redirected stdout is not a console, GetConsoleMode fails on a non-console handle, and the compiled path could then only return $false. Return it directly. This is provably identical rather than probably identical, and it covers the case that was actually measured: install.rs spawns install.ps1 with a pipe, so the desktop install is exactly where the compile was happening. Also drops the env plumbing from _run_console_less. It is lru_cached, so a dict argument would have raised TypeError before PowerShell was ever spawned, and the Windows parity job would have failed rather than proving anything. The parity case no longer needs it: the console-less probe IS the redirected case, so the early return is the branch under test rather than a bystander. * Reconstruct the exact merge-base function in the VT parity test The regex stripped only the guard and left the four comments above it behind, so the reconstructed predecessor was merge-base code plus comments rather than the merge-base function. Comments do not execute, so the comparison was still measuring the right thing, but a test that says it compares against the real predecessor should do that. Verified both files now reconstruct byte for byte. Also drops a stale WT_SESSION reference from an assertion message, left over from the design this PR replaced. * Tighten the comments this PR adds --------- Co-authored-by: danielhanchen <danielhanchen@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> |
||
|
|
1b48147d8e
|
Windows: stop depending on the generated unsloth.exe console script (#8592)
* Windows setup: install uv from a pinned release instead of running remote script text studio/setup.ps1 piped astral's install.ps1 straight into Invoke-Expression. That download-and-execute shape is the single construct AMSI providers and cloud ML scanners score hardest, and install.ps1 already replaced it with a pinned-SHA-256 archive download. Port the same implementation across. Progress goes to the pipeline rather than the console, so the quiet path swallows it exactly as it swallowed astral's installer output and the printed lines around the call site are unchanged. * Windows: stop pairing a hidden window with a bypassed execution policy The Studio shortcut launched launch-studio.ps1 with -WindowStyle Hidden and -ExecutionPolicy Bypass on the same command line. That pair is what Microsoft's own detections key on, and studio/src-tauri/src/install.rs already refuses it for the app's own launch of install.ps1. The installer writes launch-studio.ps1 itself, so the file carries no mark-of-the-web and RemoteSigned loads it. The hidden window is unchanged, so the shortcut behaves exactly as before. The generated launcher's own child launch moves to RemoteSigned for the same reason: it runs an inline -Command against an executable, where no script file is loaded and the two policies are equivalent. Also refresh a stale comment in studio/setup.ps1 that attributed the PSModulePath fix to astral's uv installer, which no longer runs in-process. * Installers: keep download-and-run command lines out of the shipped script text AMSI scans install.ps1 in full before a single line of it runs, and generic script classifiers read install.sh the same way inside the Linux bundle. Both headers rehearsed the piped web one-liner five times over, plus a scriptblock form and an execution-policy bypass, none of which anything in the scripts reads and all of which the README already documents. Point at the README instead and reword the in-body comments that quoted the one-liner as shorthand. Every printed line is untouched: the remediation text the installers show users still spells out the command in full. Same treatment for scripts/uninstall.ps1's header. * Windows: resolve process image paths with one Win32_Process query install.ps1's venv-holder probe opened a handle to every running PID through inline C# compiled at runtime. Opening a handle per process is a shape AV heuristics score hard, and it bought nothing: Win32_Process reports ExecutablePath for exactly the processes those handles could be opened against, and answers for all of them in a single query instead of once per PID. The remaining file-canonicalisation imports stay -- handle-based resolution of linked ancestors has no faithful Windows PowerShell 5.1 equivalent, and it runs on security-relevant paths. Falls back to the per-process .Path when the query is unavailable, so a degraded WMI repository degrades exactly as the old code did on a process it could not open. * Desktop: say who blocked the install when AMSI stops the script PowerShell hands the whole top-level script block to AMSI while compiling it, so a security product's verdict arrives as a parse error over the entire file before install.ps1 runs a statement: no [TAURI:ERROR] marker, no phase log, and a stderr tail the user cannot act on. unsloth#8523 shows what that looks like in the UI -- "Installation failed: + FullyQualifiedErrorId : ScriptContainedMaliciousContent". Recognise the two stable error ids on either stream and append what the user actually needs: nothing was installed, nothing was changed, it is a false positive, update definitions and retry, do not turn off endpoint protection. The raw id stays in the message, because the diagnostics report and any vendor submission both need it. Matches the id, never the message text, which is localized, and tolerates the cmdlet suffix the Invoke-Expression form carries. * Desktop: ship each bundle only the installer it can run resolve_install_script picks install.sh on unix and install.ps1 everywhere else, but the shared Tauri config bundled both into every target. The Linux AppImage therefore carried 280 KB of Windows PowerShell it can never execute -- and it is the largest script body a generic classifier walking the squashfs reads, which is where Microsoft's Trojan:Script/Wacatac.B!ml verdict on 0.1.701-beta landed. Move the resource map into the per-platform configs. The clean-machine job already fails when a Linux bundle ships no install.sh; it now also fails when one ships install.ps1, so the split cannot silently regress in either direction. The .deb scanned clean with the same payload, so this is surface reduction rather than a proven fix for that verdict. * POSIX installers: install uv from a pinned release before falling back install.sh downloaded astral's install.sh to a temp file, ran it and deleted the file; studio/setup.sh piped it straight into a shell. Both are, shape for shape, what a dropper does, and generic ML script classifiers score them accordingly -- the 0.1.701-beta Linux AppImage came back Trojan:Script/Wacatac.B!ml while the .deb carrying the same scripts came back clean. Fetch the pinned release archive and verify a hardcoded SHA-256 instead, matching what install.ps1 already does on Windows. Only the four mainstream targets are pinned: musl, armv7 and any host without a digest tool keep the path they have today, because guessing a target triple wrong would break the install outright and that costs far more than the heuristic score of the fallback. Destination, PATH handling and every printed line are unchanged, so a host that takes either path ends up in the same state it did before. * tests: pin the installer shapes antivirus heuristics score One file collecting what was removed, so it cannot drift back: no remote script run in-process, no encoded or base64 payload, no hidden window paired with a bypassed execution policy, no handle opened against another process, and no new runtime-compiled native import outside an allowlist that carries a reason for each entry that stays. The last test is the other half of the contract. Hardening must not change what a user sees, so the remediation lines the installers print -- which still spell out the web one-liner in full -- are asserted verbatim. Removing the one-liner from comments is the point; removing it from what the user is told to run would be a regression. Runs on the existing discovery-based pytest step, no workflow list to update. * release: emit a false-positive submission packet for whatever gets flagged The build job assembles a Microsoft submission packet, but only for the Windows -setup.exe. The detection that actually arrived on 0.1.701-beta was Trojan:Script/Wacatac.B!ml on the Linux AppImage, so nothing was produced for the one asset that needed it. The VirusTotal job already knows which assets were flagged and by which engines, so put the packet there: hash, size and both portals, for every flagged asset whatever platform it came from, with a note that clearance is per hash and per vendor. Engine names are not repeated -- they are third-party text and already appear escaped under Flagging engines. The gate stays advisory; this only makes acting on it take seconds. * Revert "Windows: resolve process image paths with one Win32_Process query" This reverts commit 7897865c9. tests/python/test_windows_installer_concurrency_guard.py bans Get-CimInstance and $process.Path from Get-RunningStudioVenvProcesses outright, and requires the native image-path lookup. That contract came out of #7764, which closed a set of races where the installer inferred "in use" from something other than a confirmed executable identity and blocked installs that should have proceeded. Win32_Process.ExecutablePath does answer the same question, but a wrongly blocked install costs far more than the heuristic weight of three native imports. Record the imports in the AV-shapes allowlist with that reasoning instead, and keep the ban on the process-memory APIs, which the installer has no use for. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Tighten the comments added by this branch Opening comment-reduction pass over the PR diff: same intent, fewer lines. Cut hardest on the prose that restated the PR description rather than explaining the code next to it. Comments and docstrings only, verified with comment_tools.py check --strip-docstrings across every Python file in the diff. * Drop an unused helper from the uv pinned-release test * Fix three review findings on the installer hardening Stray-resource check aborted the step it was meant to assert. grep exits 1 when it selects nothing, and under this step's set -o pipefail plus the runner's bash -e that kills the assignment outright, so every correctly split .deb failed clean-machine CI before reaching the check. Both lookups take || true now: no match is the passing case for the stray one, and for install.sh it was swallowing the explicit annotation in favour of a bare exit 1. studio/setup.sh skipped astral's XDG_DATA_HOME/../bin destination tier, which install.sh, install.ps1 and studio/setup.ps1 all honour. A host that configured an XDG location got uv under ~/.local/bin instead, where no later shell looks for it. The session PATH prepend hid it at install time. The AMSI guidance claimed nothing was changed even when the block landed on the nested studio/setup.ps1, which install.ps1 launches through the same inherited pipes after the venv, PyTorch and the packages are already on disk. Split the wording on whether a [TAURI:STEP] marker has been seen: a pre-start block produces none, so the reassurance is only given where it is true. * Key the submission packet on the flagged count, not the engine list stats and results are separate fields of the same VirusTotal response, so an asset can carry a flagged count with no readable results map. The summary table reports that asset and the packet skipped it, which is exactly the one that needs a packet. Select on stats.flagged and keep the engine list for the Flagging engines section, which is correctly keyed on having engines to name. * Drop the bundle stray-resource assertion from clean-machine CI That job downloads a published release, never a bundle built from the branch, so asserting the new resource split there turns every run red until a release ships with it. The split is a property of the Tauri config, and tests/studio/test_tauri_installer_resource_contract.py already enforces it at the right layer. The || true on the install.sh lookup stays: it is what lets the explicit annotation print instead of the step dying on grep's exit 1 under pipefail. * Windows: stop depending on the generated unsloth.exe console script Fixes #8490. On Windows the `unsloth` entry point is materialised as a generated, unsigned launcher .exe. AppLocker, WDAC and Smart App Control deny it, while the venv's python.exe, a copy of the signed CPython binary, still runs. The installer died at "running unsloth studio setup" with `Program 'unsloth.exe' failed to run: An Application Control policy has blocked this file`, and because the launch throws rather than returning an exit code, it escaped Install-UnslothStudio and printed a raw NativeCommandFailed dump instead of a diagnostic. The desktop updater already solved this in update.rs by reaching the CLI through the interpreter. This applies the same idea everywhere else: the setup handoff, autostart, the shortcut launcher, the Tauri backend, auth provisioning, the install health probe, the preflight probes and the `studio run` respawn. unsloth.exe is still generated, still hardlinked to the shim, and still works. Nothing depends on it any more. Also adds `python -m unsloth_cli` as a supported entry point, and a bin\unsloth.cmd companion to the shim so `unsloth.cmd` is available where the .exe is denied. The trampoline is one string shared by install.ps1, process.rs and studio.py: import sys, os; sys.path[:1] = [x for x in sys.path[:1] if x not in ('', os.getcwd())]; sys.argv[0] = 'unsloth'; from unsloth_cli import app; app() Both halves are load bearing. argv[0] is assigned before the import because unsloth_cli decides at import time whether it is the console script, which gates the UTF-8 stream setup and the -np<N> rewrite, and it keeps typer's prog_name at `unsloth`. The sys.path[:1] filter drops the working directory entry that `python -c` adds and a console script does not, which is what lets the invocation stay off -I: -I would drop it too, but also PYTHONPATH, PYTHONWARNINGS and user site-packages, which the console script honours. Behaviour on a machine with no policy is unchanged, and that is enforced rather than asserted. tests/python/test_module_entry_point.py compares stdout, stderr and exit code between the console script, `-m unsloth_cli` and the trampoline over --version, --help, `studio --help` and two error paths. The writes are idempotent: bin\unsloth.cmd, launch-studio.ps1 and the .lnk files are content compared, so a second install changes no bytes and no timestamps. tests/studio/test_application_control_cli_fallback.ps1 pins the pieces that are easy to get wrong: the failure is classified off the exception (Win32 1260), never off $LASTEXITCODE, which no process was created to set; Start-Process gets one pre-quoted command line, since -ArgumentList joins an array with spaces and quotes nothing; and bin\unsloth.cmd only counts as an ownership marker when its contents match the shim we write, so an unrelated file of that name in a custom root cannot qualify it for removal. The new windows-application-control-ci.yml leg reproduces the report: AppLocker denies only Scripts\unsloth.exe for a standard user, a negative control proves the rule is actually enforced (the job fails loudly if the stub runs), and the full installer then has to succeed. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Tighten the comments added for the Application Control fix * Add the AGPL header to the module entry point test * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Drain the shim launch probe's pipes before waiting on it * Harden the cmd shim ownership marker, updater env and launcher hints * Run the Application Control CI leg without --tauri so the pinned root applies * Stub the runtime gate so the Windows launcher tests run on Windows * Isolate the advertised module route from the working directory * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Fix the contradictory updater env assertion and the user-site fallback * Treat a quarantined stub as a managed install on Windows * Tighten the duplicated trampoline rationale to one authoritative copy * Windows: keep a quarantined launcher and a partial migration recoverable Two follow-ups on the Application Control work. An antivirus quarantine deletes the unsigned unsloth.exe rather than denying it. The updater then found no launcher, no copy to restore, and reported a broken update, rolling back a package that was in fact fine. Absence is now excused the same way a policy denial is, but only after every recovery copy has been tried, so a launcher that could be put back still is. find_unsloth_binary_in_studio_dir accepted a bare python.exe in layout order, so an interrupted migration leaving a partial new environment beside a working legacy .venv targeted the broken one. A launcher anywhere now outranks an interpreter on its own. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Windows: let studio run start a venv whose console script was quarantined The Windows respawn goes through the interpreter and never launches Scripts\unsloth.exe, but the gate before it still required that file, so an install whose stub antivirus had taken aborted with "Unsloth venv missing 'unsloth' entry point" despite being able to run. The installed package now answers for the deleted stub, one layer down and just as cheap. POSIX still proves a CLI with the console script it execs. * CI: apply the AppLocker policy before AppIDSvc reads it The negative control watched the denied user start the stub. The job started AppIDSvc and set the policy afterwards, and the service loads the effective policy when it starts, so it was enforcing nothing; gpupdate does not make it re-read a local policy. Restart the service once the policy is in place, and retry the control while enforcement goes live, which is asynchronous and unsignalled. * Cover the uv host matrix and repeat application in the pinned-release test The pinned path picks an archive per host triple, and a wrong pick installs a binary that cannot execute, which is worse than not installing at all. Drive _uv_pinned_asset over 20 host combinations and require each one to return its own triple or decline to the fallback. Also run the installer three times over one HOME and require an identical tree, and require a stale uv at the destination to be replaced rather than joined by a second copy: the installer is re-run on every upgrade and every repair. * Windows: close the parity and old-install gaps found by the idempotency audit Five independent audits of the before/after parity bar, plus local simulations, turned up six things worth fixing. Parity, on machines with no policy at all: - Under PYTHONSAFEPATH or -P there is no implicit -c working-directory entry to strip, so sys.path[0] is whatever PYTHONPATH put there and the console script honours it. The filter removed it anyway; a PYTHONPATH starting at the working directory was measured selecting a different package through the trampoline than through the console script. - The backend start log went from a joined argument string to Rust's debug list on every platform. It is what users paste into issues. Idempotency: - The .cmd shim and launch-studio.ps1 compared decoded text, which drops a BOM and ignores case, so a BOM-prefixed shim was called unchanged and left with cmd.exe reading the BOM as part of @echo off. Both compare bytes now, launcher preamble included. - A run killed between the temp write and the rename left a temp file no later run would collect, since each names its own after its PID. Swept, skipping any whose owner is still alive. - The Application Control probe cached its verdict in :, which under irm | iex is the caller's session, so a second run in one console answered from the first run's machine state. Old installs: - An installer older than the shim directory never created one, and unsloth studio update is the only route those installs take back into install.ps1, so they never gained the .cmd. Created there now. - A migration interrupted by an open handle can split either layout. The finder now prefers a launcher with its interpreter beside it in either base, then an interpreter alone, then a launcher alone, so neither half of a split tree wins by layout order. * Pick the pinned uv archive off a positive libc check, not the absence of musl An independent audit pass found the Linux selector accepts any host whose ldd output does not say musl. That is not the same question astral's installer asks: it checks a minimum glibc and drops to its musl-static archive below it, so three hosts that worked before this branch now get a GNU binary that cannot exec, and the helper reports success so the fallback never runs. aarch64 with glibc below 2.28 (Ubuntu 18.04) x86_64 with glibc below 2.17 (RHEL 6) a musl image with no ldd at all, where the probe simply finds nothing Read the version instead, from ldd or getconf, and require it to clear astral's floor for the triple. Anything unreadable declines to the fallback. Also ask the userland for its bitness rather than trusting uname on a 64-bit kernel running a 32-bit userland, and follow astral in reading hw.optional.arm64 so a translated shell under Rosetta 2 still gets the native macOS build. Three more from the same pass: Report success only when the destination uv is executable. A copy onto a busy or read-only destination could leave a file that is not, and reporting success there skipped the fallback. Nothing is unwound on the failure path on purpose: the fallback installs over whatever is at the destination, and deleting there would take out a working uv the host already had. Clear the mark of the web on the launcher we author. WriteAllText replaces the unnamed data stream and leaves other NTFS streams alone, so a launch-studio.ps1 that somehow carried one would keep it across the rewrite, and RemoteSigned refuses a marked unsigned script. Store the security-block kind and resolve its wording in message(). stdout and stderr are read by independent threads, so a [TAURI:STEP] written before a block can be observed after it, and freezing the wording at observation time could tell a user nothing was changed on a run that had already installed PyTorch. Also require the error id to appear as the value of a FullyQualifiedErrorId field, so a scanner log that merely names it cannot attach antivirus guidance to whatever fails next. The host matrix in the shell test grows to 28 rows covering every case above, and removing the new gate fails 8 of them. install.rs gains two tests: 37 pass. * Replace a symlinked uv destination instead of writing through it Three from the review on the previous head. cp onto a destination that is a symlink follows the link, so installing over `~/.local/bin/uv -> /opt/homebrew/bin/uv` rewrote the Homebrew binary in place and left the link pointing at a file another package manager owns. Stage next to the destination and rename over it: rename replaces the link itself, and it is atomic, so a concurrent reader never sees a half-written uv either. The staging file is removed when the rename fails, so a failed run leaves no debris. Verify the Windows copy the same way the shell scripts now do. Copy-Item is non-terminating under the caller's ErrorActionPreference, so a locked or ACL-denied destination let execution reach `$haveUv = $true` and the function reported success over whatever was already there. Compare the destination against the archive we just verified, so a stale uv.exe cannot pass for the one we meant to install. install.ps1 carried the same shape and gets the same treatment. Point the header links at the heading that exists. The README has no "Install Unsloth Studio"; it is "Unsloth Studio (web UI)", whose anchor is #unsloth-studio-web-ui. Three test cases cover the symlink: the file behind the link is untouched, the link itself is replaced, and no staging file survives. Reverting the fix fails two of them. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * CI: keep one Application Control negative-control log per attempt Enforcement went live on the fourth try on the hosted runner, and a single overwritten log left the evidence artifact showing a pre-enforcement attempt's output beside a passing step. * Fail the build when the uv pin drifts from a version floor Before the pin, astral's endpoint always delivered the newest uv, so raising UV_MIN_VERSION was safe on its own. It is not any more: a floor above the pin means a host with no uv gets 0.12.1 installed and then judged too old by the same script that installed it, on the one path where the pin is what runs. Two checks. All four installers must name the same uv, or which version a machine ends up with depends on which script reached it first. And the pin must clear every floor in the tree (UV_MIN_VERSION, UV_OFFLINE_MIN_VERSION, $UvMinVersion). Raising a floor past the pin fails the first, bumping one installer's pin alone fails the second. * Fix two Windows-only test failures that predate this branch test_path_identity_failure_is_reported_as_unknown failed on both shells, on main as much as here. Test-StudioPathEqual reports an unresolvable path identity through Write-StudioLine, the harness extracts the mutex helpers but not that, and these scripts run under -ErrorActionPreference Stop, so the catch path died with CommandNotFound before the test could measure anything. Extracted rather than stubbed: it is self-contained, and a stub would keep passing if the real call ever went wrong. A new check asserts every installer function the extracted helpers call is in the harness, and it runs on every platform, so the next drift cannot hide where only a Windows runner would see it. Measured on a Windows runner: main fails 24 of these, this branch fails 2, and both of those 2 are in main's set. With this, 0. * Write the shell profile entry the pinned uv path no longer gets for free The P1 here is a real regression and it took a second look to see why. install.sh decides whether to add ~/.local/bin to the user's shell profile with `case ":$PATH:"`, near the end of the run. By then this process has prepended that directory twice, once for the uv bootstrap and once for the venv, so the guard answers yes for a login shell that would answer no and the profile line is never written. That was survivable while astral's installer ran, because it wrote its own profile line and its env file. The pinned path writes neither, so on a fresh account whose login PATH lacks ~/.local/bin the install succeeds, the current shell works, and the next terminal cannot find `unsloth` or `uv`. Snapshot the inherited PATH before anything prepends to it and test the guard against that. Two more from the same review. Honour a configured uv mirror exclusively. UV_INSTALLER_GHE_BASE_URL and UV_INSTALLER_GITHUB_BASE_URL already win outright in both PowerShell installers and in astral's own; the shell path ignored them and tried the public hosts first. A restricted network sets one precisely because those hosts are unreachable, and download() has no timeout, so it would hang rather than reach the fallback. Do not let the twin of an earlier clear erase a later AMSI verdict. Clear-TauriInstallError writes one logical clear to BOTH streams (install.ps1:198) and independent threads read them, so a block observed between a clear and its own twin was discarded by the twin. Ignore a clear identical to the one just processed; a genuine later recovery carries different text and still clears. Two tests cover both directions, 39 install tests pass. * Stage the uv copy under a per-process name An audit pass reproduced a race I introduced with the symlink fix. Both POSIX helpers staged through a fixed destination-side name, so two installers targeting one directory shared it: A finishes copying the staging file B opens the same path with truncation A renames that inode into place as uv B keeps writing through its open descriptor, which is now the published uv The published uv was observable at zero bytes until B resumed, which makes the claim in the comment about a concurrent reader flatly wrong. install.ps1 is covered by its named mutex, but nothing serialises the POSIX helpers, and studio/setup.sh runs standalone on every studio update. mktemp in the destination directory instead. Each rename then publishes a file no other process can still be writing, which is what the atomicity argument needed all along. The loser cleans up its own staging file and declines, so the caller falls back rather than reporting a success it did not achieve. * Keep a default install as quiet as it was when a uv mirror misbehaves Two console regressions from the audit pass, both on paths the install still recovers from. download() runs curl -LsSf, and -S deliberately prints its own errors. The fallback ran under run_maybe_quiet, so a failed download printed nothing before; the pinned attempts run outside that wrapper, so an unreachable mirror now put two curl: (N) lines on the console of a default install that then succeeded. Redirect stderr on the speculative attempts only, leaving download() untouched for every other caller. [TAURI:WARN] is a marker level install.sh has never emitted, and the app forwards unknown markers to its progress UI verbatim (install.rs:639), so a digest mismatch would have surfaced as raw text in the desktop window. Make it a verbose only stderr line: the next mirror or the fallback still runs, so a default install has nothing to say here. Printed-string diff against the merge base is back to additions inside $(...) capture plus that one verbose-gated line, with nothing removed or changed. * Ask the installed uv whether it runs before skipping the fallback The libc gate reads a glibc version from ldd or getconf and treats that as proof a GNU binary will execute. It is not. A stripped NixOS-derived image without nix-ld reports a glibc version through getconf while its loader lives in the Nix store, so the pinned x86_64 uv asks for /lib64/ld-linux-x86-64.so.2 and gets nothing. Every static check passed, so the helper reported success, the astral fallback was skipped, and the first real uv call failed with No such file or directory. astral's installer fails its own glibc probe on that host and ships the fully static musl archive, which runs. The user went from a working uv to none. The archive is digest-verified astral uv by the time it is placed, so ask it: run --version and require it to succeed. One exec closes the whole class rather than this one host, covering a wrong triple, a loader that is not where the binary looks, and a destination we could not really write. A test drives an archive whose uv cannot execute and requires the helper to decline; removing the exec check fails it. * Pair every clear with its twin, not just the previous one install.ps1 clears after each recovered step, so a lagging reader can be several clears behind when a block lands. With clears A then B on one stream and A's twin arriving on the other after the verdict, asking only whether this is the message just seen answers no, and the delayed twin discarded the verdict the guidance exists to explain. Each logical clear emits exactly two markers, so count unpaired ones by message: the first sighting is the clear, the next pairs with it. A test drives the A, B, verdict, A', B' ordering; 40 install tests pass. * Close the exactness gaps found by ten adversarial audits Ten independent audits, each asked to falsify the claim that this is pure hardening. Six things were worth changing. - The desktop updater is isolated again. It shipped with -I, it is the one managed invocation nobody types by hand, and it decides which install gets rewritten, so a user-site unsloth_cli must not answer `from unsloth_cli import app` there. Every other call site inherits, because the console script does. - The trampoline ends in sys.exit(app()), like the generated console script, so a returned value becomes the exit status. Typer raises SystemExit itself today, but the two routes have to agree. - A launcher that could not be restored keeps its recovery copies. Judged healthy through the interpreter is not the same as repaired, and deleting the copies threw away what a later run needed. - `unsloth studio update` puts the shim directory on PATH. An installer older than that directory put the venv Scripts dir there instead, so the .cmd was written where nothing would look for it. - The console script reconfigured its streams twice off Windows, once through the import gate and once through the module-entry path. - Replacing a bin\unsloth.cmd that carries neither our marker nor our trampoline now says so. Also states the scope plainly: this answers EXE-and-DLL enforcement of the unsigned console script. A machine that also enforces AppLocker's Script collection denies .cmd and .ps1 alike, and install.ps1 would not have run there either. The two test harnesses that extract functions out of install.ps1 now assert they define everything those functions call; both had already shipped a gap that made a check pass for the wrong reason. * Ask the interpreter, not site-packages, whether the managed CLI is there The quarantine fallback accepted an unsloth-*.dist-info or an unsloth_cli/ directory as proof of a runnable CLI. Neither is: an interrupted install, or an editable install whose checkout has moved, leaves metadata with nothing to import. This gate sits in front of the headless-public strip of .bootstrap_password, so a false yes lands the exact lockout its placement exists to prevent -- a public Studio with no login page and no plaintext recovery credential. find_spec through the managed interpreter answers the question the trampoline will actually ask, with the same sys.path[0] scrub so a checkout in the caller's cwd cannot stand in for the venv. A probe that produces no verdict at all falls back to the old on-disk layout, so a half-quarantined install still starts. * Hide the import probe's console window, as every other managed probe does * Validate the staged uv before it replaces a working one My own exec check was on the wrong side of the rename. The sequence that bites: a host has a uv good enough for UV_OFFLINE_MIN_VERSION but below UV_MIN_VERSION, so the block runs with _uv_present_before true; the pinned path renames over that working binary; the --version check then fails because the loader is missing or the destination is mounted noexec; the fallback download also fails. The installer neither restores the old uv nor reports that none is available, and every later command runs the broken one. Test the staging file instead, before the rename. It sits on the destination filesystem, so it answers the noexec question too, and a binary that cannot run here never gets to replace one that could. Two tests: a working incumbent uv survives an archive whose uv cannot execute, and the rejected staging file is cleaned up. Moving the check back after the rename fails the first. * Make each managed CLI probe ask the question its launch will answer Three findings from the latest review round, one theme: a probe that stands in for a launch has to run under the same conditions as that launch, or it can pass where the launch then fails. * The quarantine gate in `studio run` asked find_spec whether unsloth_cli resolves. It resolves for an emptied unsloth_cli/ directory (find_spec calls that a namespace package), for a package whose __init__ raises, and for one whose dependencies an interrupted install never fetched, and the trampoline's `from unsloth_cli import app` fails on all three. Verified: an empty package directory in a bare venv gives find_spec True and ImportError on the import. This gate stands in front of the headless-public strip of .bootstrap_password, so a false pass there is a public Studio with no login page and no plaintext recovery credential. The probe now performs that exact import. * The updater's interpreter health check ran without isolation while the launch it predicts, build_update_command in studio/src-tauri/src/update.rs, runs under Isolation::Isolated with PYTHONHOME/PYTHONPATH cleared. A foreign checkout on PYTHONPATH could answer --version for a managed package the update had broken, and validate_launcher would keep an update the next desktop launch cannot start. _managed_cli_argv now takes the same isolated flag the Rust Isolation enum carries; the health probe is the only caller that sets it, and a test pins that it stays the only one. Every other invocation keeps PYTHON* parity with the console script. * Binary resolution, second pass. With an interrupted migration leaving an interpreter in both layouts and a launcher in neither, layout order handed back the new base even when its site-packages was empty and the legacy base still held the package. A directory test rather than an import probe: this runs on the launch path and from the capability checks, so it stays a stat. Tests: the four unimportable package shapes, the isolated/inherited argv split and its single caller, and both directions of the two-interpreter tie-break. The old whole-file "no -I anywhere" assertion is now read off the ternary, since one deliberate -I exists. * Stop the AMSI guidance claiming more than it knows Two of these are honesty defects in text a blocked user reads. "nothing was changed on this machine" is false. Rust starts a diagnostics attempt and its phase log before PowerShell is ever spawned, and spawn_script can create ~/.unsloth first, so a pre-start block has already written to disk. The honest claim is that no installation step ran. "This is a false positive" is not something the classifier can know. It proves the output carries a PowerShell error id and nothing about the script's integrity, and install.ps1 can sit in a user-writable directory, so a locally modified copy can earn a genuine verdict. Telling someone to report a correct detection to their vendor is worse than telling them to reinstall from an official package first and only escalate if an unmodified copy is still blocked. Two smaller ones from the same pass. The matcher tested for the field name and the id independently, so a line naming both in prose qualified; it now requires the id to follow the colon and end at a comma or whitespace, which is what the comment always claimed. And the clear-pairing map is bounded: legitimate producers use a small fixed label set, and child output must not be able to grow it without limit. 42 install tests pass. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Honour astral's download override, and stop Unblock-File asking Three from the second audit round. Unblock-File declares SupportsShouldProcess at the default Medium impact, so a profile that sets $ConfirmPreference to Medium or Low gets a prompt from the line I added, even for a launcher that never carried the stream. -ErrorAction does not suppress a ShouldProcess prompt, and a noninteractive host turns it into an error that skips shortcut setup entirely. -Confirm:$false. UV_DOWNLOAD_URL and its older alias INSTALLER_DOWNLOAD_URL outrank the mirror variables in astral's installer, and the merge-base path inherited that because it ran astral's script. All four implementations now honour them first and exclusively. My earlier comment argued they point at a version the pin would reject, but that reasoning had it backwards: a host sets one because it cannot reach the public endpoints, so ignoring it meant public egress first and, with no timeout on the download, a hang instead of a fallback. The pin still applies, so a source serving a different build fails the digest and the caller falls back to astral's installer, which honours the same variable. chmod 0755 on the staging file rather than +x. cp gives it the umask default and +x then adds execute only where the umask allowed read, so a umask of 077 left uv unusable for every other account on a shared machine. astral ships them 0755. Four checks pin the override precedence across all four installers and the mode across both shell ones, with the behaviour verified against a stubbed downloader. * Validate uv before it replaces an incumbent on Windows, and bound the probe install.ps1 and studio/setup.ps1 copied the extracted uv.exe straight over the destination and only asked whether it ran afterwards. A host with a working older uv and a policy (AppLocker, WDAC, endpoint protection) that refuses the new one was left with neither. Run the extracted binary where it landed first, then keep a copy of the incumbent across the publish and restore it if the published copy will not run, since Windows has no atomic replace for a file that may be open. The probe itself is bounded: Start-Process with a 20s WaitForExit and redirected streams, and on POSIX no stdin plus a 20s ceiling where timeout exists. A binary this installer just downloaded must not be able to hang an unattended install by prompting or by never exiting. install.sh and studio/setup.sh also published the pinned uvx after rejecting the pinned uv, leaving a pairing that is never built or tested. A uv that fails to stage, copy or run now abandons the whole placement. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Verify each uv mirror, and persist PATH when the account has no rc file Both PowerShell installers checked the archive digest once, after the download loop had already broken out. A captive portal or a proxy answering 200 with its own body is a successful download by every measure Invoke-WebRequest has, so the first mirror consumed the only attempt and the second, healthy one was never tried. The digest now decides whether a mirror counts as served. install.sh picked a shell profile from .zshrc, .bashrc or .profile and did nothing when none existed. A fresh account has none: astral's installer used to create its own PATH setup there, the pinned path does not, so the next terminal resolved neither unsloth nor uv. Fall back to creating ~/.profile, which every POSIX login shell reads. The existing content guard keeps it written once. * Remove the install.sh a Windows upgrade would otherwise keep forever Windows bundles now carry only install.ps1, but NSIS writes the current resource manifest and deletes nothing, and the uninstaller deletes only what is in that manifest. An in-place upgrade from a release that bundled both installers left install.sh in $INSTDIR permanently, which also made the non-recursive RMDir "$INSTDIR" fail at uninstall. The pre-install and pre-uninstall hooks now delete it, so the population most likely to upgrade actually gets the split. Also silence the speculative mktemp -d in the pinned uv path: its failure falls back to astral's installer, so an unusable TMPDIR printed a line the user could not act on and that the merge base did not print. * Remove the pinned uv temporaries when an install is interrupted The pinned path unpacks a 40 MB archive into a work directory and stages the binary next to the destination, but only cleaned both up when the helper returned normally. A Ctrl-C in between left the archive behind and left a staging file inside a directory that is on PATH. Both paths are now published to the exit and signal traps as they are created and cleared when the helper releases them. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Persist the PATH the way each shell actually reads it, and fail a half-published pair Four follow-ups from review: A uvx that the archive carried but that could not be staged or renamed left uv published next to a stale or missing uvx and still reported success, skipping the fallback that would have installed both. Either half failing now fails the placement, in install.sh and studio/setup.sh. studio/setup.sh had none of the interrupt cleanup install.sh gained: a Ctrl-C left the unpacked archive behind and a staging file inside a directory on PATH. It now owns HUP, INT, TERM and EXIT for the duration of the pinned install and hands them back on the way out. fish sources none of the POSIX rc files, so the ~/.profile fallback was a no-op for a fish user. The persistence helper writes a conf.d drop-in with fish_add_path there, and honours ZDOTDIR for zsh. UV_INSTALL_DIR, UV_UNMANAGED_INSTALL, XDG_BIN_HOME and XDG_DATA_HOME can put uv somewhere other than ~/.local/bin, and astral's installer wrote a PATH line for whichever it picked. The pinned path now persists its own destination too, with UV_NO_MODIFY_PATH honoured as astral honours it. * Make the Windows uv publish a real transaction, and quote persisted paths The companion copies ran bare: under install.ps1's Stop preference a locked or ACL-denied destination threw past the rollback and left a mismatched set with the backups still on disk, and under setup.ps1's Continue preference it kept a stale companion and reported success. Both now copy under -ErrorAction Stop inside the transaction, so any failure unwinds like the others. A failed restore also used to delete the backup anyway, which is the one path in this block that could leave the host with less than it started with: the two things that make a restore fail, an open incumbent and a denied ACL, are the same two that made the replace risky. The backup is now kept and named. fish takes an unquoted path with a space as two directories, neither of which exists, so the drop-in single-quotes it; and the rc line is written inside double quotes, so a uv directory holding a dollar or a backtick is escaped. The second test caught a doubled backslash in the escaper itself. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Tighten the comments added by this branch Comments only, no code touched: 161 comment lines become 106 across install.sh, install.ps1, studio/setup.sh, studio/setup.ps1 and the NSIS hooks. Each one keeps the reason it was written for, said once. Verified with the PowerShell AST parser, sh -n and bash -n, the 50-check uv pinned release suite and 114 installer tests, and by confirming the diff contains no non-comment line. * Tighten the install.rs comments too Comments only: 35 lines become 27, each keeping the reason it was written for. 42 install tests pass and the diff contains no non-comment line. * Abort on a companion that cannot be backed up, and pair clears by stream A uvx.exe that could not be copied aside, because it is locked or its ACL denies reads, was skipped and the new uv.exe published anyway, so the function reported success with a mismatched pair and the fallback never ran. Any backup failure now fails the placement and runs the rollback, in install.ps1 and studio/setup.ps1. The ERROR_CLEAR pairing keyed only on the message, so two real clears of one label on one stream were taken for a clear and its twin. That happens: _install_torch_default_index emits its recovery during the install and again during the ROCm repair. A verdict landing between them was then erased by the genuinely later clear arriving on the other stream. The map is keyed by stream as well, so only the opposite stream's copy can consume a pending marker. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Do not fail an install because the uv probe could not get an answer Three clean-machine CI legs that pass on main failed on this branch: arm64 and two Windows containers, all three with winget unavailable, which is the only condition under which the pinned fallback runs. Each downloaded the right asset, passed the digest, and then failed the probe. Start-Process -NoNewWindow with redirected streams does not behave in a container or on the arm64 image the way it does in a desktop session, and a boolean probe reported that as a broken binary and aborted the install. The probe is now tri-state. Only the binary answering non-zero is a failure. A launch that throws or a wait that times out is inconclusive, and since the digest already proved the bytes are astral's pinned release, an inconclusive probe publishes as the pre-pin code did. Every path prints why, with the captured stderr and the exit code, so the next occurrence is not opaque. Also from review: the POSIX path now stages both binaries and publishes them together with the incumbents saved aside, so a failed uvx rename restores the uv it replaced instead of leaving a new uv beside a stale uvx; the Windows rollback records the destination before the copy that can truncate it; and UV_UNMANAGED_INSTALL suppresses the profile write, as it does for astral. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Give setup.sh the same pair publish and PATH persistence as install.sh studio/setup.sh published uv and then uvx one after the other, so a failed uvx rename left a new uv beside the host's stale one, and the remote fallback can be unavailable. It now stages both, validates uv, and publishes the two renames back to back with the incumbents saved aside, restoring them if the second fails. setup.sh is also run directly for local and Colab setup, where astral's installer used to write the profile line for whichever destination it chose. Without one the PATH export died with that shell and every later run reinstalled uv. It now persists its own destination, with fish handled on its own terms and both of astral's opt-outs honoured. * Treat an empty uv exit code as no verdict, not as a failure The arm64 clean-machine leg still failed on the tri-state probe, and the diagnostic that came with it said why: "uv --version exited ." with no number. WaitForExit(ms) can return before the exit code is cached, so ExitCode was empty and an empty value is not 0, which read a working uv as broken. The parameterless WaitForExit settles it and returns at once because the process has already exited, and a code that is still missing is inconclusive rather than a failure, which is the same rule the launch and timeout paths already follow. Verified against pwsh that a real non-zero exit and a real launch failure still classify as failed and unknown respectively. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Eight review fixes across the uv publish and PATH persistence The fish escaper in studio/setup.sh reached sed as an invalid expression, so a fish user running setup directly would have had setup killed under set -e right after uv was published. It now matches the one in install.sh, and the test runs both escapers rather than reading them. An incumbent that cannot be hard-linked or copied cannot be restored either, so publishing over it would be a one-way move. Both shells now decline. Writing that test turned up that my own rollback deleted both incumbents when nothing had been published, since the no-predecessor branch cannot tell the two cases apart; the rollback is now reached only after a publish was attempted. A rollback with no predecessor removes the binary it published, rather than leaving half a pair the host never had. A signal between the two renames left the undo copy as the only reference to the incumbent, and the handler deleted it. It restores it now, in both shells. setup.sh prepended ~/.local/bin unconditionally after a successful pinned install, so a stale uv there could shadow a custom UV_INSTALL_DIR destination and the rest of setup would run the wrong one. That prepend is now only for astral's installer, which is what writes there. PATH entries are compared literally rather than as case patterns, so a destination holding *, ? or [ is not mistaken for an unrelated entry. On Windows, a .unsloth-old left behind by a failed restore is the only copy of a working uv, and the next run reused that exact name. It takes a distinct one. * Keep the pinned uv first on PATH, and only count an active profile entry install.sh prepends ~/.local/bin after the uv bootstrap, and astral's env file does too, so a custom UV_INSTALL_DIR destination was pushed behind a stale uv sitting in the home directory and every bare uv below picked the wrong one. The pinned destination goes back in front. setup.sh had the same shape and was fixed in defd2292a. The profile check treated any occurrence of the destination text as proof the PATH entry was already there, so a commented-out old export, or /opt/uv-old when the destination is /opt/uv, suppressed the write and left the next shell without uv. Comments are stripped and the directory has to appear as a whole entry. * Close five review findings on the quarantine and stubless paths * The installer still required Scripts\unsloth.exe to exist, and aborted the whole install when it did not. That reasoning held for a policy, which denies the file and leaves it on disk, but not for antivirus, which quarantines it out of a venv that still runs, and nothing past that point executes it: the setup handoff, the shortcuts and bin\unsloth.cmd all go through the interpreter. It refused to install or repair Studio for exactly the machines this change is for. Absence now asks the interpreter for --version through the trampoline, and only a venv that cannot answer fails, with the same older-unsloth guidance. * The import probe's no-verdict fallback is now split by cause. A timeout keeps the on-disk layout, because slow is not broken: a cold venv under an antivirus scan is exactly that, and the re-exec has no timeout of its own. A failure to START the interpreter fails closed, because the re-exec runs that same interpreter and will fail the same way, and the caller strips .bootstrap_password before re-execing on a headless public launch. * The updater's interpreter fallback used the launcher's 10s timeout for a call that has to import the entire CLI package. That is the work the import probe's 60s ceiling is deliberately generous for, and under the antivirus scan this path exists to survive the short one would call a healthy update broken and roll it back, once per recovery candidate. * Binary resolution now accepts an unsloth-*.dist-info alongside the package directory when ranking stubless venvs, matching _managed_cli_site_packages_ layout. A PEP 660 editable install leaves a .pth and a dist-info and no unsloth_cli/ at all, so the directory test alone ranked a working legacy venv below an empty new one. * managed_bin_fingerprint required fs::metadata on the launcher, which the stubless layout deliberately reports as a path that does not exist, so the capability cache could be neither read nor written and every preflight paid both probe subprocesses again. It falls back to python.exe, which is what starts the CLI there, while the cache key stays the launcher path. Tests: the fail-closed/fallback split in both directions, the timeout contract and that the two constants differ, the editable-install ranking with an unrelated dist-info as the negative control, the stubless fingerprint and its invalidation, and the installer gate through the extracted AST harness. * Gate the NSIS tidy-up, and remove an orphan uv on signal The pre-install hook runs before the user can still cancel, and $INSTDIR can be a directory they picked in the GUI, so deleting install.sh there could take a file that was never ours. Both hooks now only act where our own executable already is. A signal between the two renames restored a predecessor but did nothing when there was none, leaving a 0.12.1 uv beside whatever uvx the machine had. It now removes what it published, which is what the ordinary rollback already does. * Write the uv PATH entry to every startup file astral's installer wired astral's uv installer wires ~/.profile, each of .bashrc, .bash_profile and .bash_login that exists, .zshrc or .zshenv under ZDOTDIR, and a fish drop-in under ~/.config. Replacing that installer with a pinned archive meant the PATH entry only reached the one file for whichever shell happened to be running, so a bash user whose .bash_profile does not source .bashrc, a /bin/sh login, or anyone who later switched shells would have no uv on PATH where they used to. Both POSIX installers now write the same set, once each, with the existing whole-entry check keeping a re-run idempotent. Files that do not exist are not created, apart from ~/.profile, which astral creates too. * Cut the uv publish back to what the common case needs The rollback machinery that grew over the review rounds covered cases a user is very unlikely to meet: an incumbent that cannot be hard-linked, a signal landing between two renames, a restore that itself fails, a second installer racing the first. It was 281 net lines, and every finding in the last two rounds was in it rather than in the hardening. What stays is what the common case needs. POSIX stages both binaries, runs the staged uv, and publishes the pair with two renames; a failure anywhere before them leaves the destination untouched, and the caller falls back to astral's installer exactly as before. Windows probes the extracted uv.exe before touching the destination, then copies the three under -ErrorAction Stop and re-checks the digest at the destination. The staging files are still removed on a signal, since they live in a directory that is on PATH. 64 shell checks and 114 installer tests cover the rest. * Match the exact fish entry, and let a UNC launcher load The fish drop-in is the only thing that puts uv on a fish user's PATH, since fish reads none of the POSIX files, and its check treated any occurrence of the directory as proof: /opt/uv-old suppressed /opt/uv. It now matches the exact fish_add_path line it would write. A launcher on a UNC share is a remote script to PowerShell, and RemoteSigned refuses an unsigned one, so a roaming profile got a shortcut that exits without starting Studio. That case, and only that case, uses Bypass, and drops -WindowStyle Hidden with it so the pair the detections key on never appears. * Wire every startup file on a DEFAULT install too, and give setup.ps1 a fallback The all-profile PATH write was gated on the uv destination differing from ~/.local/bin, which is exactly where a normal install puts it, so every ordinary machine still got the single-file write the shim path has always done. Three independent audits found this. The gate is gone, and the idempotency check now also matches the $HOME-relative spelling the shim block writes, so the default case does not end up with two lines for one directory. studio/setup.ps1 replaced astral's installer with the pinned archive and had nothing to fall back to. A failed pinned install therefore left UseUv false and silently ran torch, bitsandbytes, Triton and the rest through pip: a different resolver, not just a different download. winget is the fallback, as install.ps1 already does, rather than the remote script this branch exists to remove. * Make the quarantine case survive root inference, PATH and the reset hint Three more from review, all the same shape: a Windows path that still treats the generated unsloth.exe as the only evidence of an install. * Root inference. _looks_like_installer_managed_studio_home accepted share/studio.conf or bin\unsloth.exe, and only install.sh writes studio.conf, so on a custom-root Windows install the quarantinable launcher was the only sentinel there was. Once antivirus took it, STUDIO_HOME fell back to ~/.unsloth/studio and every studio subcommand read and wrote the wrong tree while reporting success. bin\unsloth.cmd now counts, validated against the same marker pair and 8 KB ceiling Test-UnslothCmdShimFile and the uninstaller's recursive-delete guard use, because this decides which installation the CLI manages and the directory is on PATH. * The PATH gate took any leaf named unsloth.cmd as a usable launcher. Write-UnslothCmdShim warns and leaves an unwritable file alone, so a foreign shim in a custom root survives the run, and counting it put its directory on PATH and advertised someone else's command as the policy-safe way in. It goes through Test-UnslothCmdShimFile now. * The reset-password hint always advertised `-I -m unsloth_cli` on Windows. -I implies -s, so a pip install --user install was handed a command that cannot find its own package, and the person reading it is by definition already locked out. It now checks whether the package is inside the interpreter's prefix and otherwise prints the bootstrap unsloth_cli/__main__.py documents for exactly this case, which carries no double quote and so wraps identically for cmd and PowerShell. Tests: root inference through a validated .cmd with four rejected impostors, an oversized shim, POSIX unchanged; the PATH gate as a source contract; and a new studio/backend/tests/test_reset_password_command.py covering both interpreter shapes, the spaced-path fallback, the prefix check, and drift between the bootstrap here and _WINDOWS_CLI_ENTRYPOINT. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: danielhanchen <danielhanchen@users.noreply.github.com> Co-authored-by: danielhanchen <unslothshared@gmail.com> |
||
|
|
f567ae8f39
|
Studio: skip redundant packaged frontend rebuilds (#8326)
* Desktop: skip frontend rebuild during updates * Tests: tolerate rustfmt in updater UTF-8 contract * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Studio: use packaged frontend for PyPI installs * Studio: keep the packaged frontend skip off source checkouts STUDIO_LOCAL_INSTALL records where the Python package came from, not which tree setup runs out of. An editable overlay separates the two: with UNSLOTH_CI_SOURCE_OVERLAY, or in a venv left editable by an earlier --local run, the mode stays 0 while SCRIPT_DIR is a checkout whose dist is a stale build artifact rather than a release one. The skip then serves that stale dist and a source change silently never reaches the browser, which is the outcome the overlay legs of clean-machine-install-ci exist to catch. A wheel ships no top-level files, so a pyproject.toml next to studio/ marks the tree as source. Require its absence before trusting the packaged dist; site-packages installs are unaffected and still skip. Also check the Tauri branch before the packaged one in setup.ps1 so a desktop update reports the same reason it reports on POSIX. Covered by new cases in tests/sh/test_packaged_frontend_skip.sh and tests/studio/test_node_decision.ps1. --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: danielhanchen <danielhanchen@gmail.com> |
||
|
|
07df95079e
|
Studio: route every Windows installer line through the UTF-8 stdout sink (#8148)
* Studio: route every Windows setup line through the UTF-8 stdout sink The desktop setup log rendered "?? Unsloth Studio Setup" over a rule of replacement characters. Tauri spawns Windows PowerShell 5.1 with CREATE_NO_WINDOW (install.rs), so the [Console]::OutputEncoding setter throws and both entry scripts rebind [Console]::Out to a UTF-8 writer. step/substep already write only through that writer when stdout is redirected, so they came out right. Every other line did not: Write-Host is written by 5.1's console host with its own writer on the OEM code page, and U+1F9A5 has no OEM form while U+2500 becomes a bare 0xC4, which from_utf8_lossy turns into U+FFFD. The banner and the footer are not steps, so they kept arriving as mojibake, and install.ps1 had neither the IsOutputRedirected probe nor a mirror at all. Add Write-StudioLine above the first write in studio/setup.ps1 and install.ps1: console handle when redirected, Write-Host when interactive, since it is the only writer that colorizes. Rewrite 164 call sites in setup.ps1 and 155 in install.ps1 onto it, including install.ps1's own step/substep. Write-Host now survives only inside helpers that have already ruled out the redirected sink, and the launcher script install.ps1 generates keeps its own, since it runs as a separate process. No behaviour change for an interactive console user: same text, same colors, same single record per line. test_windows_setup_output_encoding.py gains byte-level coverage that the real banner and footer, sliced out of setup.ps1, survive both launch shapes as valid UTF-8 exactly once, plus a source contract that runs on Linux and names any file:line that reaches for Write-Host outside the allow-list. Studio.Setup.Output.Tests.ps1 covers Write-StudioLine in both modes and pins install.ps1's copy to setup.ps1's. Harnesses that splice these scripts apart now stub or dot-source Write-StudioLine: two PowerShell harnesses, one Python harness, and the VC++ redist leg of studio-windows-inference-smoke. pytest tests/python tests/test_installer_*.py: 1077 passed (2 pre-existing sandbox failures unrelated to this change). All 16 tests/studio harnesses and 57 Pester cases pass. Both scripts parse clean. * CI: spawn install.ps1 as a child process so its lines reach install.log * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Stub the output sink in the llama.cpp backend PowerShell harness * Guard the console-less spawn on a Windows runner The byte-level cases in this file run with a console attached, and a GitHub runner gives a CREATE_NO_WINDOW child one, so the UTF-8 setter succeeds there and every version of these scripts emits a clean banner. Those cases cannot tell this fix from what preceded it. Add cases that call FreeConsole() in the child first, which is the state install.rs's own comment assumes CREATE_NO_WINDOW produces. There Write-Host has no screen buffer to query, throws, and takes the script down: 2 bytes of stdout and exit 1 rather than the banner. The probe is assembled entirely out of text sliced from the script under test and spawned with install.rs's own interpreter, flags and creation flags. No Windows job ran this file, so its byte-level half was only ever exercised under pwsh 7 on the Linux Backend CI leg, which is UTF-8 by default. Add it to the cross-platform parity matrix, which already has a windows-latest row and already triggers on install.ps1 and studio/setup.ps1. * Report skips in the parity step A platform-gated case that stopped running on the row it exists for still reports green with -q alone. * Slice the error preference too It is what turns the Write-Host throw into a dead script rather than a skipped line, so restating it would be assuming the result. * Say what the comments actually mean * Make the console-less cases fail on a lost banner, not just a mangled one * Stub the output sink in every harness that splices these scripts The Write-Host rewrite left four spliced-source harnesses reaching Write-StudioLine without defining it. An undefined command is a terminating error, so each one either aborted or was swallowed by the harness's own catch, and the test kept passing while no longer testing anything. - test_windows_python_venv_hardening.py, partial-rollback case: the five-line split-move warning was lost. The assertion that "both halves are named" only stayed green because $existing is a prefix of the rollback dir, so it matched the dir= line instead. Pin it to the warning text. - test_path_probe_access_denied.ps1, ownership guard: the catch scored the command-not-found as the intended failure and never reached Exit-SetupFailure. Pin the check to the EXIT-SETUP message. - test_windows_installer_concurrency_guard.py: the decision block prints before Exit-InstallFailure, so on Windows the active case aborted at exit 1 and never produced RESULT:blocked. - Studio.Setup.Vs2026.Tests.ps1: on a host without cmake, Ensure-BuildToolsForLlamaSourceBuild hits the sink first and the no-op case fails on the throw. Also stub the three remaining harnesses that splice sink-calling helpers but do not reach the sink on the paths they exercise today, so the next case added to them cannot reintroduce this. --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> |
||
|
|
d8effae0d5
|
Studio: fix the Windows desktop setup log mojibake and double-printed steps (#8083)
* Studio: fix the Windows desktop setup log mojibake and double-printed steps
The desktop 'Getting things ready...' log rendered as:
?? Unsloth Studio Setup
<52 replacement chars>
gpu
none (chat-only / GGUF)
gpu none (chat-only / GGUF)
Encoding. studio/setup.ps1 never set [Console]::OutputEncoding, so Windows
PowerShell 5.1 encoded redirected output with the OEM code page while the
desktop app decodes the pipe as UTF-8 (String::from_utf8_lossy in
src-tauri/src/install.rs). That corrupts two different ways: the sloth U+1F9A5
has no OEM representation so PowerShell substitutes one '?' per UTF-16
surrogate, and the rule U+2500 does have one, so it becomes a bare 0xC4 byte
that is invalid UTF-8 and surfaces as U+FFFD. Both entry scripts now set the
console encoding, $OutputEncoding, PYTHONUTF8 and PYTHONIOENCODING before the
first write, and Refresh-Environment can no longer reload the two Python vars
back over ours mid-run. The patch is ASCII-only: these files are UTF-8 without
a BOM and 5.1 parses those as ANSI.
Duplication. step/substep wrote through Write-Host AND a console-handle mirror.
The mirror's comment assumed Write-Host does not survive the process chain; it
does, because the CLI spawns setup.ps1 as -Command "& '...' *>&1"
(unsloth_cli/commands/studio.py), which merges the Information stream into
stdout deliberately. The sink is now resolved once and exactly one is used:
redirected writes to the console handle, interactive writes to Write-Host.
Splitting. step composed one logical line from two Write-Host calls using
-NoNewline, and a redirected consumer turns each Information record boundary
into a line break. Both scripts now emit one composed record; install.ps1 needs
this most, having no mirror to fall back on.
Rust children on Windows get PYTHONUTF8/PYTHONIOENCODING too, since install.rs,
update.rs and process.rs all decode their output as UTF-8. The readers stay
lossy on purpose -- strict decoding would turn display corruption into an
installation failure.
Tests: a Pester suite auto-discovered by the existing pester job, and a pytest
byte-level probe that runs real PowerShell in both the -File and -Command
launch shapes and asserts on raw bytes. Verified to fail against the unfixed
tree (9 Pester and 13 pytest failures) rather than merely passing.
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Bind a UTF-8 writer with no console, and pass -X utf8 to the isolated child
Two holes in the previous commit, both on the exact path the desktop app takes.
[Console]::OutputEncoding P/Invokes SetConsoleOutputCP, which needs a console
handle. Under CREATE_NO_WINDOW there is none, so it throws, and it drops the
cached writer BEFORE throwing while assigning OutputEncoding only after. Console
.Out therefore rebuilt on the old code page. Swallowing the exception was not
enough once redirected step/substep use Console.Out as their only sink, so the
catch path now binds an explicit UTF-8 StreamWriter over OpenStandardOutput.
build_update_command launches Python with -I, which implies -E, so that process
ignores every PYTHON* variable and PYTHONUTF8/PYTHONIOENCODING never reached it.
Pass -X utf8 as a switch instead. The env vars stay for its descendants.
https://docs.python.org/3/using/cmdline.html#cmdoption-I
* Bind the UTF-8 writer to stderr as well when there is no console
The no-console fallback repaired Console.Out only. Tauri pipes stderr through
the same lossy UTF-8 decode (install.rs) and emits it to the same UI log, and
InstallFailureContext builds the user-facing failure message from those lines,
so a PowerShell error carrying a non-ASCII path still arrived as U+FFFD.
install.ps1 also writes its Clear-TauriInstallError markers there.
* Tighten the comments added by this PR
Comments only, no code change. Verified with the PowerShell AST tokenizer for
both .ps1 files and the Pester suite (token streams identical with Comment and
NewLine excluded), comment_tools.py for the Python test, and a code-only diff
for update.rs.
* Update the Windows command assertion for the added UTF-8 flags
windows_update_command_uses_python_not_replaceable_console_stub asserts the
exact argument vector, so adding -X utf8 broke it. The Windows cargo test job
in studio-tauri-smoke.yml runs it; the Linux job skips it under cfg(windows),
and cargo check type-checks tests without running them, so neither the org
Linux run nor the staging check caught it.
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
|