* craft-suite-account: the suite account list and keychain token store
Carries crates/suite-account over from the cut-down craft-libs#160 branch. This follows RFC-0025 (storytold/craft-contrib#35).
service.rs is removed. It was the CollabCraft device-flow client. Its Service, Flow, Identity, Polled and SignedOut types went with it. Store::sign_out is also gone. The provider adapter now owns ending a session at the deployment. Store::discard and Store::forget cover the local half that stays here.
Every remaining CollabCraft-specific word is reworded to a provider-neutral description. The one serde alias and the one test fixture name that spelled the old provider out are gone too.
Adds a generation field to Account, per RFC-0025's cross-app lifecycle guarantees. A sign-in bumps it. Store::update_token refuses a write made against a stale generation. A fuller tombstone for the removal case is left as a TODO referencing the RFC, documented on Accounts::remove.
Also drops one unused restrict() function found while verifying clippy -D warnings on Linux. It was pre-existing dead code. The unix write path already sets the file mode at creation.
* craft-suite-account: lock list mutations, make generations monotonic across removal
Fixes the three review gates on PR #665 (rev 2e9c84f).
Every mutation of accounts.json now goes through an OS-level file lock. The
lock is a sibling .lock file taken with std::fs::File::try_lock and a
bounded retry, matching the mechanism craft-ai-integrations' store already
uses for the same problem. Two processes each completing 100 sign-ins into
one folder used to leave 101 rows on file. Both the real two-process and
two-thread conformance tests now land all 200 rows.
A removed account now leaves a tombstone holding its last generation. A
re-add continues past that tombstone. It never restarts at 0.
update_token checks the generation twice. The first check runs before the
keychain is touched at all. An already-stale caller never overwrites a
newer token. The second check runs under the lock, after the keychain
write. It catches a removal that landed in the window that write opened. A
tombstoned account answers StaleGeneration. It never answers Unknown. The
second check also removes the token it just wrote, under the same lock,
when the account turns out to be gone. A refresh racing a discard can then
resurrect neither the row nor the keychain entry. discard itself now
removes the keychain entry inside the same lock hold as the list write.
The module docs now name the chosen keychain-versus-list write order for
each operation. They also name the state a crash in that window leaves
behind for the next reader to repair, per RFC-0025 guarantee 1. A new test
simulates the window update_token opens between its keychain write and its
generation commit.
The conformance tests are adapted from the maintainer's review-reproduction
gist for this crate. Forget racing a refresh is the one gist case left out.
forget is deliberately generation-agnostic and local, per RFC-0025
guarantee 4. That fix would be a separate, broader change than these three
gates.
* craft-suite-account: close the review gaps CodeRabbit found in the rebase
Six fixes. Generation bumps in sign_in, update_token and remove_with_tombstone
now use checked_add. A bump at the maximum refuses with GenerationExhausted.
It never wraps back to a small number a stale caller could pass again.
accounts::write now refuses a list that would serialize
past MAX_BYTES before touching disk. An oversized display name can then
never brick the list for every later reader. NewAccount.linked now persists
onto Account. It used to be silently dropped at sign_in. update_token's
stale-write cleanup now only removes a keychain token that still matches the
token it wrote itself. A concurrent sign-in's token for the same handle
survives that cleanup now. Store::forget and Store::has_token now return
Error::Isolated before touching the keychain, matching every other mutator.
migrate::adopt re-reads the legacy file right before deleting it and skips
the delete when something rewrote it since. The read buffers are wrapped in
Zeroizing too. A parsed-but-unused token copy no longer outlives the one
Secret already covers.
Three findings were not valid against this code and are not changed. The
torn-state window CodeRabbit flagged in update_token's generation commit is
the same crash recovery the module docs already describe. The existing
torn-state test already exercises it. Forcing the keychain write under the
same lock as two concurrent sign-ins for one handle would reintroduce the
cross-process deadlock the lock module exists to avoid. A failed discard
already reports its own error. A refresh that re-establishes a full session
afterward is recovery. It is never a silent mismatch.
* craft-suite-account: apply cargo fmt to the review-gap fixes
cargo fmt wraps the long struct literals and assert calls the previous
commit added. The content is unchanged.
* craft-suite-account: factor the race test's join-handle type out
clippy::type_complexity flagged the four-deep generic on handle_slot in the
stale-refresh-vs-re-sign-in test. A type alias clears it without changing
the test.
* craft-suite-account: flush before the rename, re-check the token under the lock
Two review findings. The temporary file is now flushed with sync_all before the rename, keeping the crash story the doc tells. A discard racing a sign-in could delete the token the sign-in had just written and the sign-in still reported Ok. The lock closure re-checks the keychain right before committing the row and writes the token again when something else changed it.
* craft-suite-account: sync the parent directory after the rename
The temp-file flush persists the bytes. The rename changes a directory entry with its own durability on Linux. Power loss after write returned could otherwise resurrect the older list and lose a tombstone a discard already reported written. A sync failure now reports an error, never success. Unix only, since directories do not open for sync elsewhere.
* craft-suite-account: keep activation out of refresh, require an explicit format marker, stop logging paths
Three fixes. update_token no longer calls Accounts::put for its row commit.
That call always makes the written row active. Refreshing an account in
the background used to silently steal the selection from whatever account
the person had actually picked. A new Accounts::refresh_in_place replaces
the row without touching active. put stays exactly as it was for sign_in
and set_active, the two calls meant to change it.
Accounts::format no longer carries #[serde(default)]. Every other field
still does. A missing format key used to default through Accounts's own
Default impl. That impl answers FORMAT. A file that never declared a
format therefore read as exactly the one format this build understands.
read now also rejects any parsed format that is not exactly FORMAT. The
old check only rejected a newer one; format 0 passed it the same way a
missing key did.
accounts::read's error messages now name only the file, never the full
path. Store::shared logs a read failure at warn. The path sits under the
user's profile folder.
restrict on Windows stays a no-op. Its comment now states the guarantee's
real scope. The default per-user config folder gives it. A portable
install or an ARTCRAFT_SUITE_DIR override does not. A real fix needs the
Win32 authorization API. Every binding for it is an unsafe fn. This
workspace forbids unsafe_code outright. That part of the finding is
refused in part. Closing it for real needs a maintainer-approved exception
for this one call site, or a vetted dependency wrapping that API safely.
Either is a decision for its own PR.
* craft-suite-account: move update_token's keychain write inside the lock
skylartaylor's finding. update_token used to write the keychain, then take
the list lock. A newer sign-in, or a discard followed by a re-add, could
land for the same handle in between. The second check under the lock
already answered StaleGeneration in that case, but the earlier write had
already landed over the newer session's token. shared() then served the
new session's row with the stale refresh's bytes. Deleting the stale token
on its own was never going to fix this; that still loses the newer
session, it only changes which bytes go missing.
The keychain write now happens only inside the lock, in the second
generation check's own success arm, immediately before the row commits.
The first, unlocked check still exists, purely to reject an already-stale
caller before it ever takes the lock; it writes nothing. Every losing
path, a newer sign-in, a discard, a discard followed by a re-add, now
answers with an error having never touched the keychain at all. There is
nothing stale left in it to clean up or weigh against a winner's own
token. Store::remove_token_if_still is gone. Its two call sites in the
losing branches never write a token to begin with now. Nothing is left
for it to conditionally remove.
This keeps the lock discipline the module docs describe: the write is
conditional on the row commit going ahead, the same shape as discard's own
keychain call inside its lock hold and sign_in's existing re-check, never
an unconditional call made regardless.
Two deterministic tests reproduce both orderings skylartaylor named, each
proving the fix against the pre-fix code before passing against the fix:
a_refresh_racing_a_newer_sign_in_for_the_same_handle_never_overwrites_its_token
and a_refresh_racing_a_discard_and_re_add_for_the_same_handle_never_overwrites_its_token.
Both hold the real accounts lock on a background thread standing in for
the winning operation. They release it only after the refresh's own
unlocked first check has had the chance to read the pre-race state. Both
then assert shared() serves the winning session's own token afterward.
The crate's own pre-existing hook-based race tests could no longer reach
the window they were built for, since that window no longer has a
keychain call in it to hook. tests/review_repro.rs's two Hooked-based
tests are rewritten onto real threads racing on a Barrier instead, the
same device the file's own two-thread sign-in test already uses. The lock
makes their outcomes hold for either ordering now. A hook could only ever
force one. The now-unused Hooked harness is removed along with them.
src/tests.rs's own matching hook-based test is replaced outright by the
two new ones above. That covers its ground and the newly found gap
together.
* craft-suite-account: pin the race tests' second-check window
skylartaylor's review note on PR 665: the two update_token race tests in
src/tests.rs send their release signal and then immediately call
update_token, so the competing sign-in or discard-and-re-add can finish
before the refresh's first, unlocked check ever runs. A pre-fix build
could then pass the same assertions by rejecting early at that first
check, never reaching the second, locked one the tests are named for.
Adds race_hook, a test-only pause point inside update_token between its
two checks. A test arms it, starts the refresh, waits for the refresh to
signal that its first check has read the pre-race generation, runs the
competing operation to completion, then releases the refresh into its
second check. Both race tests are rewritten onto this instead of holding
the real accounts lock on a background thread, which left the same gap
skylartaylor found: the lock never blocked the refresh's unlocked first
read, only its second, locked one.
* craft-suite-account: make the race test hook per store instead of process wide
CI runs this crate's suite with the default, parallel test runner. The
hook update_token pauses on between its two generation checks lived
behind one process wide slot, so when the Workspace gate's parallel run
landed both race tests at the same time, one test's release on that
slot answered the other test's pause: the pinned ordering collapsed,
the refresh ran ahead of the competing write, its second check legitimately
matched, and update_token returned Ok where the test expected
StaleGeneration. Reproduced on the lab build host with the crate's
default threaded test run; failed on the first attempt, matching the
CI failure exactly.
The hook now lives on the Store instance, one per store, armed only on
the exact store a given test built. A concurrent test's own store keeps
its own hook, so there is nothing left for two tests to cross no matter
how the runner schedules them. Checked the rest of the suite for the
same kind of shared state: every other test builds its own tempdir and
its own in-memory keychain, and the two-process test spawns its own
child with --test-threads=1 for that child's own run, so none of them
depend on the parent suite running single threaded.
This branch added craft-cloud to [workspace.dependencies] for the e-sign dialog's vocabulary. #160 added the same entry beside craft-cloud-local while this branch waited, in a different place in the list, so the rebase kept both and cargo refused the manifest. Main's entry stays. Cargo.lock is regenerated on the new base.
The ArtCraft Launcher's switch (AgentSwitch, mcp_flag, launcher_allows),
the agent settings, the connection file (agent-connection.json) and the
<id>-cli mcp side that finds the open window (Live: window while the app
accepts agents, otherwise headless or the closed-app choice; launcher
starts the app beside the CLI), behind the new feature agents. No UI
toolkit and no async runtime. Same formats as craft_automation::agents
on next, which can re-export these once the branches meet.
* sourcemap: Craft Anything
Port parser/model/lookup core from Craft Anything f64ae3bf3c8863a982af1304e06de20653803968. Annotation and data URL helpers stay app-owned.
* sourcemap: Format parsers refuse or flag input they used to half-read (#652)
Port parser/model/lookup core from Craft Anything 15de36614b2d1039ed68bffcc36e0e92053b3f12. Annotation and data URL helpers stay app-owned.
* sourcemap: Keep source lookups inside their declared index map section (R3.12) (#1130)
Port parser/model/lookup core from Craft Anything a205f1d1571cbce001c546f4753943a569d7a7fe. Annotation and data URL helpers stay app-owned.
* sourcemap: Decode source map position deltas within the format's 32-bit range (R3.12) (#1133)
Port parser/model/lookup core from Craft Anything f5aad102b048cb6f01a8a7b90dcf2d7a7a395567. Annotation and data URL helpers stay app-owned.
* sourcemap: Look up source mappings without scanning every segment on a generated line (R3.12) (#1139)
Port parser/model/lookup core from Craft Anything 1fab01712915e744ea042154ff81013a19c9bfc5. Annotation and data URL helpers stay app-owned.
* sourcemap: Preserve source map URL roots when joining relative sources (R3.12) (#1332)
Port parser/model/lookup core from Craft Anything 7fd244005da7a37a6389ac09643fb759420f72a2. Annotation and data URL helpers stay app-owned.
* sourcemap: Bound generated source-map lines across inline sections (R3.12) (#1533)
Port parser/model/lookup core from Craft Anything 68ba5239a85c7f6e842c2a7a9c0254f125eaa917. Annotation and data URL helpers stay app-owned.
* sourcemap: Reject source map mappings with missing source or name entries (R3.12) (#1526)
Port parser/model/lookup core from Craft Anything 0ba60eb4e24d1c280db93304ee53a79393f41610. Annotation and data URL helpers stay app-owned.
* sourcemap: Apply source map root prefixes before interpreting source paths (R3.12) (#1680)
Port parser/model/lookup core from Craft Anything 500a09a217b9a6ce03b2c93035167ce983a83897. Annotation and data URL helpers stay app-owned.
* sourcemap: Bound expanded source-map source lists before building them (R3.12) (#1689)
Port parser/model/lookup core from Craft Anything 22c44d01d271c49187104802459085f273f855f0. Annotation and data URL helpers stay app-owned.
* sourcemap: Refuse source maps with more entries than the parser keeps (R3.12) (#1703)
Port parser/model/lookup core from Craft Anything ba83da2bc567611d0c8aef124c2c3d1ba03ade58. Annotation and data URL helpers stay app-owned.
* sourcemap: Count source-map sections, check skipped values and keep refused maps' sources uncertain (R3.12) (#1705)
Port parser/model/lookup core from Craft Anything ab79ec87a4da58d8965b6d4f95b751464ba6e999. Annotation and data URL helpers stay app-owned.
* sourcemap: Keep the sources of a source map refused for bad mappings or section offsets (R3.12) (#1717)
Port parser/model/lookup core from Craft Anything 12aad97757d692e8dbc8af03ceb60c6b44f53339. Annotation and data URL helpers stay app-owned.
* sourcemap: Mark sources of unread external source-map sections uncertain (R3.12) (#1767) (#1767)
Port parser/model/lookup core from Craft Anything d56fa23860f1fd20249fb945e94fdf3fcfc83a2d. Annotation and data URL helpers stay app-owned.
* sourcemap: List sources from the section maps of an indexed source map (R3.12)
Port parser/model/lookup core from Craft Anything 0b1a643944e119bc4d580de94b287ab257ab91c5. Annotation and data URL helpers stay app-owned.
* sourcemap: retain entry_budgets regression coverage
Port crates/formats/tests/sourcemap_entry_budgets.rs from Craft Anything, latest source change 12aad97757d692e8dbc8af03ceb60c6b44f53339. Only crate imports adapted.
* sourcemap: retain external_sections regression coverage
Port crates/formats/tests/sourcemap_external_sections.rs from Craft Anything, latest source change d56fa23860f1fd20249fb945e94fdf3fcfc83a2d. Only crate imports adapted.
* sourcemap: retain inventory_budgets regression coverage
Port crates/formats/tests/sourcemap_inventory_budgets.rs from Craft Anything, latest source change 22c44d01d271c49187104802459085f273f855f0. Only crate imports adapted.
* sourcemap: retain line_budgets regression coverage
Port crates/formats/tests/sourcemap_line_budgets.rs from Craft Anything, latest source change 68ba5239a85c7f6e842c2a7a9c0254f125eaa917. Only crate imports adapted.
* sourcemap: retain root_prefix regression coverage
Port crates/formats/tests/sourcemap_root_prefix.rs from Craft Anything, latest source change 500a09a217b9a6ce03b2c93035167ce983a83897. Only crate imports adapted.
* sourcemap: retain section_columns regression coverage
Port crates/formats/tests/sourcemap_section_columns.rs from Craft Anything, latest source change 15de36614b2d1039ed68bffcc36e0e92053b3f12. Only crate imports adapted.
* Expose bounded Source Map v3 core with retained regression tests
---------
Co-authored-by: Brandon Thomas <echelon@gmail.com>
Co-authored-by: BFlat <bombayapirat@gmail.com>
Co-authored-by: Afloat <ShuffleMonkey@163.com>
Co-authored-by: RRFZ <247457381+Plastic-time@users.noreply.github.com>
Co-authored-by: Nicolas Bohn <dev@nicolasbohn.de>
Co-authored-by: Alex Joaquim Pereira <alexpereira1781@gmail.com>
Preserve the fixture helpers originally authored in Craft Anything testkit and extracted by FredApps for TAR. EVM and TAR now reuse craft-testkit with unchanged mutation sequences. Add sequence and stride regressions.
Co-authored-by: FredApps <153173854+FredApps@users.noreply.github.com>
Co-authored-by: Dylan M. Taylor <dylan@dylanmtaylor.com>
* har: preserve source reader history
Port Craft Anything crates/formats/src/har.rs from f64ae3bf3c8863a982af1304e06de20653803968.
* har: preserve source reader history
Port Craft Anything crates/formats/src/har.rs from cb0bb9d8fa4536ba44ef2c86f5ed759b879cc2d3.
* Expose shared HAR reader with explicit input admission
---------
Co-authored-by: Brandon Thomas <echelon@gmail.com>
Co-authored-by: BFlat <bombayapirat@gmail.com>
benandez's re-review reproduced three escapes the first confinement fix still
left open. A dangling symlink: canonicalize reported it as missing, so the
old confine_to_root walked up to root and accepted it, and write created the
symlink's target for real, outside root. A check-then-use race: confine_to_root
checked one path string and a later fs::read or fs::write resolved that same
string again, a second lookup a concurrently swapped link could land in
between. A hard link: write truncated the shared inode in place, with nothing
in a canonicalized path to show that another name pointed at the same file
outside root.
list, read, write and create now resolve every already segment-checked
relative path through a cap_std::fs::Dir capability opened on root, instead
of joining an absolute OS path and handing it to plain std::fs. cap_std
resolves one path component at a time against real, already-open directory
handles, so a symlink or a Windows junction cannot walk resolution above
root, dangling or not, and there is no separate check with a window for the
directory tree to change underneath it: the one resolution is the open. This
is the same family of guarantee craft-font-store already depends on through
cap-primitives, which cap_std is built on.
write no longer truncates its target in place either way: it writes a new
sibling file and renames it over the target, so a hard link's directory
entry is replaced rather than its shared content being overwritten.
Per that review's non-blocking notes: a name that already exists on disk
with an ordinary ':' or '\' byte (macOS stores a typed '/' as ':') stays
reachable by list and read, since neither character is a path separator on
any platform's filesystem; the stricter refusal now applies only to a name
being chosen by Create. Create also goes back to bringing a fresh root into
existence, matching its behaviour before the first confinement fix. A
Windows reserved device name (CON, COM1, CONIN$, with or without an
extension) is refused in a chosen name on every platform.
Regression tests reproduce all three escapes (dangling symlink, swapped-link
race, hard link), plus the previously missing coverage: a link in the folder
a Create targets, and a write test that actually reaches disk instead of
being refused for an unrelated reason before confinement ever ran. Verified
by hand that each of the three new write-path tests fails against the
pre-fix pattern (an absolute OS path joined by string concatenation) before
trusting them.