chore(sync): absorb upstream main through 82b8a9380 (v0.0.33 cycle)

.agents/skills/test-t3-mobile/SKILL.md

@@ -125,31 +125,29 @@ Do not start, stop, erase, or reconfigure an emulator owned by another task. Tra
 
 ## Pair each client once
 
-Issue a fresh credential against the running backend's exact base directory:
+Use the bundled helper from the repository root. It issues a fresh credential against the running backend's exact base directory, opens the existing Add Environment route with the credential in an encoded query parameter, and asks that route to connect once:
 
 ```bash
-T3CODE_PORT=<server-port> node apps/server/src/bin.ts auth pairing create \
-  --base-dir <base-dir> \
-  --base-url <mobile-origin> \
-  --ttl 15m \
-  --label agent-mobile-<short-device-id>
+.agents/skills/test-t3-mobile/scripts/pair-client.sh \
+  ios <simulator-udid> <server-port> <base-dir>
+
+.agents/skills/test-t3-mobile/scripts/pair-client.sh \
+  android <emulator-serial> <server-port> <base-dir>
 ```
 
-In PowerShell, set `$env:T3CODE_PORT = "<server-port>"` first and run the `node ... auth pairing create` command without the leading assignment.
+Run only the command for the selected platform. The helper uses `http://127.0.0.1:<server-port>` for iOS and `http://10.0.2.2:<server-port>` for Android. Pass a fifth argument only when testing a non-development URL scheme.
 
-If the visible Add Environment action is not exposed as a semantic target, open the app's registered route instead of guessing coordinates:
+The helper opens this registered route:
 
-```bash
-xcrun simctl openurl <simulator-udid> 't3code-dev://connections/new'
-adb -s <emulator-serial> shell am start -W \
-  -a android.intent.action.VIEW \
-  -d 't3code-dev://connections/new' \
-  com.t3tools.t3code.dev
+```text
+t3code-dev://connections/new?pairingUrl=<encoded-pairing-url>&autoConnect=1
 ```
 
-Run only the command for the selected platform.
+The Add Environment route owns the behavior: `pairingUrl` prefills its normal host and token inputs, while `autoConnect=1` submits once in development builds and returns to Home after success. Without `autoConnect`, the same route only prefills the form for manual inspection.
+
+Do not enter pairing hosts or tokens through simulator keyboard automation. Xcode's semantic typer sends HID-style key events through the simulator's active keyboard state, which can corrupt uppercase tokens and punctuation even when the host Mac uses a U.S. input source. The one-shot route is the deterministic pairing path. Use the visible form only as a fallback, and paste credentials rather than typing them character by character.
 
-In T3 Code Dev, open Add Environment and enter the complete `<mobile-origin>` and newly printed `Token`. Verify the expected seeded projects appear before exercising the affected flow.
+Verify the expected seeded projects appear before exercising the affected flow.
 
 Pairing credentials are secret, short-lived, and single-use. Create a different credential for every simulator, emulator, physical device, or browser. If an attempt fails, issue a new credential rather than retrying the old one. Do not expose tokens in screenshots, commits, or final responses.
 
@@ -183,6 +181,8 @@ Keep local verification focused. Do not turn this workflow into a full repositor
 - **Old UI or an old error appears:** verify Metro's worktree, variant, URL, and port before diagnosing the app.
 - **The environment remains empty:** verify the platform-specific HTTP origin, use a fresh token, and confirm project seeding used the identical base directory.
 - **A second client cannot pair:** pairing tokens are single-use; issue another token.
+- **The pairing form opens but does not connect:** confirm the deep link uses the existing `connections/new` route, includes `autoConnect=1`, and carries a freshly minted encoded `pairingUrl`.
+- **Pairing text changes case or punctuation:** do not retry semantic typing. Use `scripts/pair-client.sh`; the simulator keyboard layout and HID input path are not reliable for credentials.
 - **iOS semantic actions fail:** set explicit XcodeBuildMCP defaults and refresh with `snapshot_ui`.
 - **Android cannot reach Metro:** verify `adb reverse` for the exact Metro port and relaunch the development-client URL.
 - **Android cannot reach the backend:** use `10.0.2.2`, not `127.0.0.1`, for the Android Emulator.

.agents/skills/test-t3-mobile/scripts/pair-client.sh

@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+usage() {
+  echo "Usage: $0 <ios|android> <device-id> <server-port> <base-dir> [url-scheme]" >&2
+  exit 2
+}
+
+[[ $# -ge 4 && $# -le 5 ]] || usage
+
+platform="$1"
+device_id="$2"
+server_port="$3"
+base_dir="$4"
+url_scheme="${5:-t3code-dev}"
+
+case "$platform" in
+  ios)
+    mobile_origin="http://127.0.0.1:${server_port}"
+    ;;
+  android)
+    mobile_origin="http://10.0.2.2:${server_port}"
+    ;;
+  *)
+    usage
+    ;;
+esac
+
+repo_root="$(git rev-parse --show-toplevel)"
+cd "$repo_root"
+
+if ! pairing_output="$({
+  T3CODE_PORT="$server_port" node apps/server/src/bin.ts auth pairing create \
+    --base-dir "$base_dir" \
+    --base-url "$mobile_origin" \
+    --ttl 15m \
+    --label "agent-mobile-${device_id:0:8}"
+} 2>&1)"; then
+  echo "Could not mint a mobile pairing credential." >&2
+  exit 1
+fi
+
+pairing_url="$(printf '%s\n' "$pairing_output" | sed -n 's/^Pair URL: //p' | tail -n 1)"
+if [[ -z "$pairing_url" ]]; then
+  echo "Could not parse the mobile pairing URL." >&2
+  exit 1
+fi
+
+deep_link="$(PAIRING_URL="$pairing_url" URL_SCHEME="$url_scheme" node - <<'NODE'
+const query = new URLSearchParams({
+  pairingUrl: process.env.PAIRING_URL,
+  autoConnect: "1",
+});
+process.stdout.write(`${process.env.URL_SCHEME}://connections/new?${query}`);
+NODE
+)"
+
+case "$platform" in
+  ios)
+    xcrun simctl openurl "$device_id" "$deep_link"
+    ;;
+  android)
+    # adb shell re-joins its arguments and evaluates them through the device
+    # shell, so the deep link's `?`/`&` must be quoted once more for that shell.
+    adb -s "$device_id" shell \
+      "am start -W -a android.intent.action.VIEW -d '$deep_link' com.t3tools.t3code.dev" \
+      >/dev/null
+    ;;
+esac
+
+echo "Opened the existing Add Environment route with a fresh pairing credential."

.fork/customizations.yaml

@@ -293,17 +293,23 @@
     - apps/desktop/src/app/DesktopLinuxUrlHandler.ts
     - apps/desktop/src/backend/DesktopBackendConfiguration.ts
     - apps/desktop/scripts/electron-launcher.mjs
+    # Fenced icon-path assertions matching the launcher's fork art.
+    - apps/desktop/scripts/electron-launcher.test.mjs
     - apps/server/src/config.ts
     - apps/web/src/branding.ts
     - apps/web/src/branding.test.ts
+    # Fenced wordmark-visibility assertions adapted to the fork brand lockup.
+    - apps/web/src/components/threadSidebarWidth.test.ts
     - apps/web/src/components/sidebar/SidebarChrome.tsx
     - apps/web/public/apple-touch-icon.png
     - apps/web/public/favicon-16x16.png
     - apps/web/public/favicon-32x32.png
     - apps/web/public/favicon.ico
-    - apps/desktop/resources/icon.png
-    - apps/desktop/resources/icon.ico
-    - apps/desktop/resources/icon.icns
+    # Upstream retired the static desktop resource icons in the v0.0.33 cycle;
+    # source-tree icon resolution (incl. the darwin dev dock icon) moved into
+    # DesktopAssets, which the fork fences onto assets/fork.
+    - apps/desktop/src/app/DesktopAssets.ts
+    - apps/desktop/src/app/DesktopAssets.test.ts
     - packages/shared/src/devHome.ts
     - packages/shared/src/hostProcess.ts
     - scripts/build-desktop-artifact.ts
@@ -2027,52 +2033,33 @@
 
 - id: fork-chat-file-drop
   intent: >
-    A file dragged in from outside the app can be released anywhere over the
-    chat column — the timeline as well as the composer docked under it — and
-    attaches to the composer, instead of having to be aimed at the composer
-    box the way upstream requires. Releasing it over the timeline used to hit
-    the browser default and navigate the app away to the dropped file, so a
-    missed drop cost the whole session. The zone is the chat column and
-    nothing else: the sidebar, the header, and the right panel do not attach,
-    leaving the right panel free to claim its own file drops later.
-
-    The window listens in the bubble phase and the customization is purely
-    additive: upstream's composer-scoped drag handlers stay, see every drop
-    aimed at them first, and a drop a nested target already claimed
-    (defaultPrevented) is left alone — which is also what keeps the file
-    tree's mention-drag channel untouched. Only drags carrying files are
-    claimed. Membership is hit-tested per event against the marker attribute
-    on ChatView's chat column, so the region survives layout changes as long
-    as the marker rides the column. No drag state accumulates: every handler
-    writes whether the pointer is over the chat right now, read off the
-    element the event names, with the leave reading relatedTarget — the
-    element being entered — because a drag leaving the window is the one
-    transition no enter or over reports.
-
-    Drags outside the zone are still preventDefault-ed on both dragover and
-    drop and then discarded, because a drop that is never handled is one the
-    browser opens — the dragover half is what makes the drop event fire at
-    all. Their dropEffect is "none" so the cursor does not promise an
-    attachment that will not happen. Because the window handlers run after
-    the composer's, the two share one drag-active state without fighting: the
-    composer keeps painting its drag-over tint for as long as the pointer is
-    over the chat, so where the file will land stays obvious. Files are handed
-    to the composer's existing attachment path unfiltered, so unsupported
-    types and the attachment limit keep reporting the same way a paste does.
-    Preview panes render in a webview and swallow their own drags; that is
-    upstream behaviour and out of scope here.
+    A file drop that nothing claimed cannot navigate the app away to the
+    dropped file. Upstream's v0.0.33 chat column
+    (data-chat-workspace-drop-target + makeWorkspaceFileDropHandlers) now
+    owns attaching drops over the whole column — which was this
+    customization's original job, so the fork's parallel drop system was
+    retired at that sync. What survives is the piece upstream still lacks: a
+    window-level guard, mounted from ChatView, that preventDefaults file
+    drags on dragover and drop when no nested target claimed them
+    (defaultPrevented), with dropEffect "none" so the cursor does not promise
+    an attachment. A missed drop over the sidebar, header, or right panel is
+    discarded instead of replacing the session with the file.
+
+    The guard listens in the bubble phase and stays purely additive: every
+    real target — upstream's column, the file tree's mention-drag channel,
+    any future surface — sees the event first, and only drags carrying files
+    are touched. It holds no drag state and paints nothing; highlighting
+    belongs to upstream's own column overlay and composer tint. Mounting from
+    ChatView is the enablement gate: no chat column on screen, no guard, so
+    drops elsewhere in the app keep their usual browser behaviour.
   tier: 4
   files:
     - apps/web/src/custom/chatFileDrop.ts
     - apps/web/src/custom/chatFileDrop.test.ts
   shadows: []
   watch:
-    # Carries the useChatFileDrop call and its import. Upstream's own composer
-    # drag handlers and isDragOverComposer state live here too — the hook
-    # shares that state, so a rename of it breaks the shared highlight.
-    - apps/web/src/components/chat/ChatComposer.tsx
-    # Carries data-fork-chat-drop-zone on the chat column. An upstream rework
-    # of that column drops the marker, and with it the whole drop region.
+    # Carries the fenced useStrayFileDropGuard mount and upstream's own column
+    # drop target the guard defers to.
     - apps/web/src/components/ChatView.tsx
   verify:
     - apps/web/src/__fork_guards__/forkChatFileDrop.test.ts
@@ -2762,6 +2749,12 @@
     on ChatComposer. Dark-only true-outline Previous (and shared outline
     tokens with changed-files) keep Previous/Next at 24px; compact Previous
     is pinned to a 24×24 square.
+    Upstream's v0.0.33 disclosure header (#6773, collapse the question prompt
+    from its header) is deliberately not ported: the fork card has its own
+    Questions header and no collapse affordance, and its tests assert the
+    shared outcome — question and options visible without interaction —
+    instead of upstream's toggle markup. Revisit if long prompts start
+    crowding the fork card.
   tier: 2
   files:
     - apps/web/src/custom/useComposerPendingUserInputCard.ts
@@ -2772,6 +2765,10 @@
   watch:
     # data-fork-pending-user-input-strip on the muted vessel wrappers.
     - apps/web/src/components/chat/ChatComposer.tsx
+    # Upstream's panel tests resolve through the alias to the shadow; fenced
+    # there to assert the fork card's contract (see the declined-disclosure
+    # note in intent).
+    - apps/web/src/components/chat/ComposerPendingUserInputPanel.test.tsx
     # data-fork-pending-user-input-action on Previous and Next/Submit; the
     # outline + 24px restyle hangs off those attributes.
     - apps/web/src/components/chat/ComposerPrimaryActions.tsx
@@ -2822,20 +2819,35 @@
 
 - id: mobile-current-checkout-branch
   intent: >
-    A thread started from Mobile in Current checkout mode records the branch
-    currently checked out on the selected environment, even when the user did
-    not explicitly open the branch picker. Immediate and offline-outbox
-    creation must resolve that current ref so web and desktop thread rows can
-    render branch identity. Detached HEAD remains null rather than borrowing
-    the default-branch display fallback. New worktree mode still requires its
-    explicit base-branch flow.
+    A thread QUEUED OFFLINE from Mobile in Current checkout mode records the
+    branch checked out at compose time, so web and desktop thread rows can
+    render branch identity for outbox threads too.
+
+    Scope shrank in the v0.0.33 sync: upstream shipped the immediate-creation
+    half natively (resolveProjectThreadCreationBranch fed by
+    currentCheckoutBranchName from the live status stream), which also
+    retired the fork's own resolver — its availableBranches.find(current)
+    source was cache-served (listRefs lags an out-of-band git switch) and
+    paginated (a current branch off the loaded page silently resolved to no
+    branch), and passing its result into upstream's resolver short-circuited
+    the correct live source. The one surviving fence is the offline-outbox
+    path, which reuses upstream's resolver and live source verbatim.
+
+    Upstream deliberately leaves queued tasks unlabeled — a task drained days
+    later runs against whatever is checked out then, so a queue-time guess
+    can pin a stale label. The fork keeps the compose-time checkout anyway:
+    its users triage threads from sidebar rows where an unlabeled thread
+    costs more day-to-day than a rarely-stale label, and an explicit picker
+    choice (which upstream does record) is exactly as stale-prone. Detached
+    HEAD, non-repository projects, and an unarrived status stay null rather
+    than fabricating a branch. New worktree mode still requires its explicit
+    base-branch flow.
   tier: 4
-  files:
-    - apps/mobile/src/custom/projectThreadBranch.ts
+  files: []
   shadows: []
   watch:
     - apps/mobile/src/features/threads/new-task-flow-provider.tsx
     - apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
+    - apps/mobile/src/features/threads/projectThreadCreationValidation.ts
   verify:
-    - apps/mobile/src/custom/projectThreadBranch.test.ts
     - apps/web/src/__fork_guards__/mobileCurrentCheckoutBranch.test.ts

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -9,6 +9,7 @@ body:
     attributes:
       value: |
         Use this form for broken behavior, regressions, crashes, or reliability problems.
+        Feature requests belong in [Discussions](https://github.com/pingdotgg/t3code/discussions/categories/ideas).
         Search existing issues first and keep the report focused on one problem.
 
   - type: checkboxes

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Feature request
+    url: https://github.com/pingdotgg/t3code/discussions/categories/ideas
+    about: Suggest an improvement or new capability in Discussions.