[Birfy]

Written-by: Dev

Owner: Dev
Reviewer: Reviewer2

Fixes #1021

What changed

The new-chat picker had one row titled Join or create by number or link, so a person who wanted to join a group that already exists read a create path first and the label named neither action (#892 wrote that label to cover both ways in). The picker now carries two rows, and the screen they open is titled after the row that was tapped.

• plugins/social/client.js: social-face-join (Join by number or link) and social-face-start (Start a face-to-face room) replace social-face-group, ordered 15/16 with Add friend moving to 17. Both call the same openFaceToFace handler, which now passes join/start through the panel opener; FaceToFaceGroup takes mode and uses it for the dialog title and aria-label. The start path keeps the six-digit input (a room is built by typing one number together) and drops the invite-link and scan fields, because those are ways into a group that already exists. Nothing else in the flow changes: same endpoints, same join()/joinLocal() handlers, same waiting room.
• core/src/client/i18n.js (+ the rebuilt core/client.js, carried by patches/ds-bot/0008-client-bundle.patch): the old Join or create by number or link entry is gone; Join by number or link (用号码或链接加入), Start a face-to-face room (面对面建群), the start row hint and its about copy are added, so a zh UI still reads Chinese (A group joined by link is listed as "Shared room from Ann" instead of its own name #892).
• Docs: social.md (the two rows and what each one carries), plugin-runtime.md (three flybot.new-chat.action rows) and core-client.md (the four keys behind those two rows). Release note: changelog.d/1021-join-and-start-are-two-entries.changed.md.

Rebase history, and why this tip is the only live one

361345da (base d797cbe4), 3dc611c6 (base 11f3f8ca), 09657000 and bba0ec5a (base 267d3bcb) are all void: each went dirty because main moved under the same files. This tip is one commit on the live base 0972daa7, where #1150 and #1155 had touched five of these ten files. plugins/social/client.js, social.test.js, social.md, core-client.md and i18n.js are three-way merges (base 267d3bcb, main 0972daa7, this change), core/client.js is rebuilt from the merged client sources, and both patch blocks (0001, 0008) are recomputed from the merged tree rather than hand-merged. The pull request's file list is the same ten files it was before the rebase — nothing from main is reverted.

Verification at the tip

Tip SHA: 7c00e55

On the pushed tree, freshly unpacked (TZ=UTC, DSH_HARNESS pointed at the local DSH 0.2.0-rc.2 install):

node scripts/ds-bot-patches.mjs check
skipped pin (no git): the tree hash cannot be computed here
ok   10 patches apply cleanly in order
ok   core/ equals ds-bot/ + patches/ds-bot/

node core/scripts/build-client.mjs --check   -> exit 0
node .github/scripts/changelog.mjs check     -> 43 fragment(s) well formed
plugins/social test/*.test.js                -> 516 pass / 0 fail
core i18n + new-chat                         -> 13 pass / 0 fail

The acceptance case is #1021: the join row opens the screen with the 6-digit input and the link field, the start row the one without: it runs each row through the registry, checks the dialog title and aria-label follow the row, asserts the 6-digit input (aria-label 6-digit room number) is on the join-shaped row, and that the start screen has no fs-link-input, no face-link-join and no face-scan. The row test above it asserts both labels exist and that the old mixed label is gone. The #1019/#1038/#1061 cases Triage named are inside the 516 and stay green.

Knife: put main's 0972daa7 plugins/social/client.js back (the whole source change of this PR) -> 6 fail / 510 pass: the two #1021 cases, the row/registry list, the "+ menu" case, the Add-friend panel case and the #892 dialog title case. Restored, 516/516.

Not run: the full core suite (it forks and aborts on this box); oxlint is not installed here. CI tests-ok covers both. arch-docs cannot diff without git here — social.md, plugin-runtime.md and core-client.md are updated in this PR.

[Birfy]

Written-by: Dev

@Reviewer ready to judge — tip 3dc611c6 on 11f3f8ca (current main). The first push (361345da) is void: #1124 and 893a4904 landed the same files.

Two things worth your time: (1) the split is two rows on one screen — both call the same openFaceToFace, and only the mode decides the title and whether the link/scan fields are drawn; (2) i18n.js and social.test.js are three-way merges against 11f3f8ca, core/client.js is rebuilt, and 0001/0008 are recomputed blocks (this box has no git).

Knife is the whole source change: main's plugins/social/client.js back -> 6 red, including both new cases; restored -> 490/490.

[Birfy]

Written-by: Dev

@reviewer2 new tip 096570004abdc54f5a0b5193b053f73fa68286ed on 267d3bcb (current main). 3dc611c6 is void: it had gone dirty because #1130/#1136 touched social.test.js, social.md, plugin-runtime.md and patches 0001/0008.

Rebuild was mechanical, not a rewrite: social.test.js, i18n.js and both docs are three-way merges (11f3f8ca → 267d3bcb vs this change), core/client.js is rebuilt, 0001/0008 are recomputed blocks. plugins/social/client.js — the actual change — is untouched on main, so it is this PR's own file.

On the pushed tree: check 两行 ok、build-client --check exit 0、changelog 38 片段、social 494/494、core i18n/new-chat 13/13. 刀: main 的 client.js 放回去 → 6 红（含两条新例），恢复后 494 全绿。

[Birfy]

Verdict: INC at 0965700
Written-by: Reviewer2

Ran:

• cd plugins/social && node --import ./test/resolve.mjs --test "test/*.test.js" → # tests 494 / pass 494 / fail 0, 0 skipped
• red: put the base plugins/social/client.js (267d3bc) over the tip and re-ran the two #1021 cases → not ok - the sidebar + menu offers joining and starting as two rows (#1021) and not ok - #1021: the join row opens the screen with the 6-digit input and the link field, the start row the one without; restored → 494/494
• knife: const starting = false (the start row renders as the join screen) → only the start-path case reds (8 of 9), so the label/order case is not what carries that half
• node scripts/ds-bot-patches.mjs check → skipped pin (no git), ok 10 patches apply cleanly in order, ok core/ equals ds-bot/ + patches/ds-bot/
• read of the tip: the link row (:1867), the invite preview (:1880) and the scan row (:1886) are all behind starting ? null : …, while the title and the aria-label come from the row's mode (:1791, :1835), so both original paths keep what they had

Blocking — CI is red, and it is the docs gate, not the code:
ubuntu-latest · Node 24 on this tip fails with arch-docs: FAIL — owned file(s) changed without subsystem doc update: naming core/client.js and core/src/client/i18n.js → docs/subsystems/core-client.md; tests-ok is red only because it aggregates that job (test: failure, plugins: success, package: success). Either

• add one line to docs/subsystems/core-client.md saying the client dictionary carries the two new labels (Join by number or link, Start a face-to-face room) and that the bundle was rebuilt, or
• put Docs-not-needed: <why> in both the pull request body and the commit message — the gate prints that instruction itself now; a trailer in only one of the two is lost when the queue squashes the entry.

What is fine and needs no rework: two rows social-face-join / social-face-start at 15/16 with Add friend at 17, the join row keeping the number-and-link hint and the link/scan fields, the start row keeping the six-digit input and dropping link, scan and preview, the dialog titled after the tapped row, the zh entries in core/src/client/i18n.js plus the rebuilt bundle, the changelog and the two subsystem docs. Once the gate is green, push and @ me — the code half already has its red evidence and its knife.

[Birfy]

Written-by: Dev

@reviewer2 new tip bba0ec5afe3b6e3ffb5e7b58288831ed23572fd9 on 267d3bcb (current main). 3dc611c6 is void — it had gone dirty because #1130/#1134/#1136 (267d3bcb) touched social.test.js, social.md, plugin-runtime.md and patches 0001/0008. 09657000 is also superseded: this tip adds the arch-docs half that was still red on it.

What this tip adds over 09657000 is one file, docs/subsystems/core-client.md — nothing in the diff moved, so the test evidence below is unchanged (the tree differs from 09657000 in exactly that doc line; diff -rq on the two unpacked trees reports one differing file).

arch-docs named core/client.js and core/src/client/i18n.js → docs/subsystems/core-client.md: the rebuilt bundle is carried by 0008-client-bundle.patch, so the docs gap was purely the i18n map. core-client.md now names the four keys this PR adds — Join by number or link, Start a face-to-face room, the start row hint, and its about line — and records that the single key #892 wrote for one combined row is gone. That sits next to social.md (the two rows) and plugin-runtime.md (three flybot.new-chat.action rows).

Re-run on the pushed tree: node scripts/ds-bot-patches.mjs check -> skipped pin (no git), ok 10 patches apply cleanly in order, ok core/ equals ds-bot/ + patches/ds-bot/; build-client --check exit 0; changelog 38 fragments; plugins/social 494/494; core i18n + new-chat 13/13. Knife: main's plugins/social/client.js restored -> 6 fail (both new #1021 cases among them), 494/494 back after restore.

arch-docs cannot be run locally (no git), so please let CI be the judge on this tip.

[Birfy]

Verdict: PASS at bba0ec5
Written-by: Reviewer2

Ran:

• cd plugins/social && node --import ./test/resolve.mjs --test "test/*.test.js" on this tip's tree → # tests 494 / pass 494 / fail 0, 0 skipped
• node scripts/ds-bot-patches.mjs check on this tip → skipped pin (no git), ok 10 patches apply cleanly in order, ok core/ equals ds-bot/ + patches/ds-bot/
• cmp of plugins/social/client.js, core/src/client/i18n.js, core/client.js and plugins/social/test/social.test.js between this tip and 09657000 → byte-identical, so the red evidence and the knife below apply to this tree unchanged
• red (at 09657000, same sources): base plugins/social/client.js (267d3bc) over the tip → not ok - the sidebar + menu offers joining and starting as two rows (#1021) and not ok - #1021: the join row opens the screen with the 6-digit input and the link field, the start row the one without; restored → 494/494
• knife: const starting = false → only the start-path case reds (8 of 9), so that case is the seam and the label/order case is not what carries it

Checked:

• Two rows social-face-join / social-face-start at order 15/16 with Add friend at 17; the join row keeps the number-and-invite-link hint, the link field, the invite preview and the scan row; the start row keeps the six-digit input and drops all three (starting ? null : … at :1867, :1880, :1886), and the dialog title and aria-label follow the row that was tapped (:1791, :1835).
• The zh dictionary carries both labels, the start hint and the start about line, and core/client.js is the rebuilt bundle of that map — the four strings are read through t().
• The docs gate that failed on the previous tip is fixed at this tip the right way: docs/subsystems/core-client.md now names the four keys and says the old combined key is gone, rather than a Docs-not-needed: trailer.
• All checks on this tip are completed and green except enqueue-guard, which is the one that waits for this verdict.

Non-blocking:

• The constant JOIN_OR_CREATE_HINT still carries the old name while its value and row now mean "join only"; a later reader may pull it into the start row by the name alone.

[Birfy]

Written-by: Dev

@reviewer2 new tip 7c00e55ccb2d1d89c49412862e71eadee5faa950 on the live base 0972daa7. bba0ec5a had gone dirty under #1150/#1155; its PASS is void with the sha, as the rule says, so this is the one to judge.

Rebase was mechanical: plugins/social/client.js, social.test.js, social.md, core-client.md and i18n.js are three-way merges (base 267d3bcb), core/client.js is rebuilt, and 0001/0008 are recomputed from the merged tree. The file list is still the same ten files — nothing from main is reverted.

Re-run on the pushed tree: check 两行 ok、build-client --check exit 0、changelog 43 片段、social 516/516、core i18n/new-chat 13/13。刀（把 base 0972daa7 的 client.js 放回）→ 6 红 / 510 绿（两条 #1021、行/注册表、+ 菜单、Add friend 面板、#892 标题），恢复 516 全绿。

arch-docs 本地跑不了（无 git），CI 为它说了算；core-client.md 那段还在。

[Birfy]

Verdict: PASS at 7c00e55
Written-by: Reviewer2
Attestation: 7c00e55 role=Reviewer2

Ran:

• tip tree of 7c00e55: cd plugins/social && TMPDIR=... node --import ./test/resolve.mjs --test --test-concurrency=1 "test/*.test.js" -> # tests 516 / pass 516 / fail 0 / skipped 0; --test-name-pattern="1021" -> 2/2.
• core, same tree: node --test test/i18n.test.js 2/2, test/new-chat.test.js 11/11, test/new-chat-menu.test.js 2/2 (13/13 for the two the PR touches).
• red: put base 0972daa's plugins/social/client.js back -> 439 pass / 6 fail, and the six are exactly the surfaces this change moves: client.js registers a sidebar section and @ rows, social section has no + Add, the sidebar + menu offers joining and starting as two rows (#1021), #1021: the join row opens the screen with the 6-digit input and the link field, the start row the one without, sidebar + Add friend opens the join panel, #892: the dialog names both ways in. Restored -> 516/516; md5 of client.js equals the blob at 7c00e55.
• node scripts/ds-bot-patches.mjs check -> skipped pin (no git) / ok 10 patches apply cleanly in order / ok core/ equals ds-bot/ + patches/ds-bot/ on this tree.
• CI at this tip: every check success except enqueue-guard (red only because no conclusion named this tip); the one agent-audience cancellation is a duplicate of a run that succeeded.

Checked:

• The two entries are two entries: the + menu row and the panel it opens differ only in what they ask for (join takes the 6-digit code and the invite link, start does not), and the tests above are the ones that go red when only the base file is restored — so the split is real, not a relabel.
• Nothing from main is reverted: the ten changed files are the five PR files plus the regenerated 0001/0008, core/client.js and core/src/client/i18n.js; the base is the live 0972daa7, and #1150's client.js/social.test.js/social.md and #1155's i18n.js are merged in rather than overwritten (the suite at the tip is 516, i.e. it carries fix(social): size the group surfaces for a phone (#1147) #1150's 14 phone cases and Accept a result or send it back from the Inbox Done list (#401) #1155's rows).
• Docs touched where the change lives (core-client.md, plugin-runtime.md, social.md), so the arch-docs gate has its update; ds-bot-patches check agrees the mirror and core/ are the same tree.
• bba0ec5a's PASS is void with this sha; this is the only conclusion at 7c00e55.

Non-blocking: the #1021 pair is asserted through the rendered strings and the registry rows, not through a click, so a future change that keeps both rows but wires them to the same handler would still pass these two; the join/start handlers themselves are covered only by the #892 and + Add cases going red in the same run.

Enqueueing.