Skip to content

Name CollabCraft shares with deckcraft - #869

Closed
wdunn001 wants to merge 13 commits into
storytold:mainfrom
wdunn001:fix/collabcraft-share-app
Closed

wdunn001 wants to merge 13 commits into
storytold:mainfrom
wdunn001:fix/collabcraft-share-app

Conversation

@wdunn001

Copy link
Copy Markdown

Wire for_app so CollabCraft mints invite links into this app. Pin collabcraft to 3c77c3e.

Server-side cookie fallback already covers live web hosts; this makes the request body explicit for desktop and rebuilds.


Related to storytold/craft-libs#123 (Add collab-craft repo and accept transfer).

wdunn001 and others added 13 commits October 14, 2026 01:26
File > Open gains a Cloud section with the user's own files beside what other
people shared with them. Save As offers the same account beside This Computer.
The title bar gains three things. An account badge signs in and says who. A
presence row shows whoever else is in the presentation. Share becomes a split
button whose chevron offers Work together and DeckCraft's own Save a Copy
formats. Each cloud presentation carries an overflow menu holding Open, Share
and Work together.

None of that is written here. The pages, the menus, the badge, the browsing,
the conflict modal and every string a user reads are craft_ui::cloud. Every
Craft app shares those. This commit answers the half only DeckCraft can
answer. A document is a presentation, opened from six extensions and four
content types and written back in DeckCraft's own format. Bytes become one
through file.openBytes and go back through save_bytes.

crates/ui-egui/src/cloud.rs is that half. apps/deckcraft/src/cloud.rs is the
transport. It runs a worker thread, signs in through the device flow in the
user's browser, keeps the session file beside the application's own settings,
and maps a client error onto the shapes the interface acts on. DeckCraft holds
no provider credential and speaks no provider protocol. Every call goes to the
CollabCraft service. That service is the one place a provider is configured.

A save goes out under the version the presentation was read at. A stored copy
that moved on refuses the write. The refusal becomes a modal offering a
reload, a copy, or going back to editing. Nothing is retried and nothing is
forced.

Nine cloud commands join the UI set. An agent therefore reaches all of it
through the control channel. Sixty behaviour tests drive the real interface
against a service that lives inside the test.

Without DECKCRAFT_CLOUD_URL there is no worker and the interface offers
nothing cloud-shaped.
ui-parity.md gains the real answers in the shell, Open, Save As, Share and
Account rows. gaps.md loses cloud places from the File tab entry and gains
three cloud gaps. Nobody feeds the presence row. DeckCraft has no shared editing
session. A cloud save always writes DeckCraft's own format. A .pptx
opened from the cloud therefore goes back as .deckcraft bytes under its own
name. Co-editing a deck through the relay is not here at all.

control-protocol.md documents the nine cloud commands. NOTICE names the four
crates the feature is built from and where they come from. One of those
repositories ships MIT and Apache licence files while its Cargo metadata
declares AGPL-3.0-or-later. NOTICE says so.
A column inside a horizontal row is offered the window's width. That is wider
than the page. The two cloud lists could therefore run past the right edge. The
right-hand column now takes what is left of the page beside the places column.

The review renders are drawn at the window size the desktop application opens
with. The File tab's page is 1180 points wide. A narrower window clips it.
A software renderer caps a texture side at 2048. The window is one texture.
1440 points at 1.4 device pixels per point is as large as both constraints
allow.
The browser build connects the shared cloud pages and share dialog to
craft-cloud-client on the same origin, matching GridCraft. Desktop device
flow and session files stay in the desktop worker only.
The browser build connects the shared cloud pages and share dialog to
craft-cloud-client on the same origin, matching GridCraft. Desktop device
flow and session files stay in the desktop worker only.
Match craft-ui CloudApp trait so wasm cloud builds compile.
Use non-overlapping responsive panel bounds and compact secondary controls while keeping account, Share and Present reachable on mobile.
Reconcile CollabCraft cloud integration with the 2026-10-14 community PR
wave from upstream main.

Conflicts resolved:
- ROADMAP.md, docs/gaps.md, docs/ui-parity.md: merge header metadata and
  progress/revision-history entries from both branches; keep cloud
  progress entries alongside upstream additions.
- apps/deckcraft-web/src/web.rs: keep both the cloud module import and the
  InboxEvent/InboxFile symbols added upstream.
- crates/ui-egui/src/lib.rs: keep pending_urls as RefCell<Vec<String>>
  (required for borrow_mut while drawing, as in cloud::pump) and add
  opened_urls from the cloud branch alongside pending_copy from upstream;
  call both cloud::pump and poll_opening in the logic loop.
- crates/ui-egui/src/ribbon.rs: keep the responsive title-bar panel-bounds
  geometry from the cloud branch (left_offset, title_bar_panel_bounds,
  is_narrow, is_compact, left_max_x, right_min_x) and replace the inline
  QAT buttons with crate::qat::show from upstream; preserve upstream new
  functions (chart_menu_types, smooth_corners_row, zoom_menu, compress_menu)
  and all test modules; reference ribbon_tests.rs as mod ribbon_tests to
  avoid collision with the upstream inline mod tests block.
std::process::id() panics unconditionally on wasm32-unknown-unknown. SystemTime was already gated; add the same cfg guard to the PID write. RandomState::new() still seeds from browser crypto on WASM, so the per-instance ID remains nonzero and unique without any process API.
@wdunn001

Copy link
Copy Markdown
Author

Closing as duplicate of #711. for_app invite naming belongs on the cloud-pages PR, not a second PR. Related to storytold/craft-libs#123.

@wdunn001 wdunn001 closed this Oct 16, 2026
anishguduru pushed a commit to anishguduru/deckcraft that referenced this pull request Oct 16, 2026
* fix(macos): close empty main window with Command-W (storytold#869)

* Run cargo fmt

---------

Co-authored-by: Brandon Thomas <echelon@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant