Skip to content

Commit a1ffdf1

Browse files
longtngoclaude
andcommitted
Merge origin/main into personal (21st reconcile, 32 commits)
Range f035a0f..a3a8cbd. 60 files touched by both sides; 12 conflicted (24 hunks) plus 3 modify/delete. Conflicts and how they were resolved - Migrations.ts — invariant 1. Upstream's new 042_ProjectionThreadLinkedPullRequest and 043_ProjectionThreadsUnsettledAt take the next free applied ids 49 and 50, filenames unchanged. 49 entries, ids unique and monotonic, 34 still burned. Upstream's 042 test ran `toMigrationInclusive: 41` then `42` (its filename numbers), which here runs neither migration; retargeted to 48 then 49 and given a control asserting the column is absent at 48. - ChatMarkdown.tsx — reset to the fork's file and upstream's four commits re-applied one at a time, because pingdotgg#7140 (reveal in the system file manager) needed rejecting in part while pingdotgg#8081, pingdotgg#8098 and pingdotgg#8160 did not. The chip stays the fork's superset (a <span> wrapping the tooltip AND an in-DOM <Menu>, the only options surface reachable on web and mobile) with upstream's hasPrimaryAction / useBrowserPrimaryAction gating, repositioned native context menu and no-primary-action <button> fallback grafted in. pingdotgg#8098's shouldOpenMarkdownFileLinkInBrowserByDefault is subsumed by upstream's shouldUseMarkdownFileBrowserPrimaryAction, so the latter is what survives. The fork's `fileEnvironmentId` prop is replaced by upstream's `environmentId`, which is the superset: besides "Open in new tab" it drives remote-open resolution, the editor hook, server config and the workspace basename lookup — the exact narrowness the fork's own comment recorded as a known gap. TrustedFileView passes the new name. New invariant 11. - ContextWindowMeter.{tsx,test.tsx} — deleted (invariant 4; the Vitals gauge replaced the meter). ContextWindowMeter.logic.ts is NOT: pingdotgg#8144 put the Claude resume-compaction helpers there and ChatView's compaction banner uses them, so it is kept under upstream's name, trimmed to the compaction helpers, with its test trimmed to match. New invariant 10. - ChatView.tsx — one hunk was two unrelated imports spliced onto a shared `import {` opener; both survive as separate complete imports. - ChatComposer.tsx — the fork's VitalsGaugeConnected and its own activeThreadModelDisplayName win over upstream's meter render and duplicate computation. compactDisabled / compactDisabledReason / onCompactContext are adopted and live (compactThreadContext consumes them), not vestigial. - ClaudeDriver.ts — upstream's background model-manifest refresh (pingdotgg#8227) taken whole, with the fork's getCachedCapabilitiesDroppingMisses substituted for Cache.get so a failed probe is still not pinned for the full TTL. - contracts/settings.ts — field order keeps both the fork's configDirPath and upstream's autoCompactWindow. - ServerEnvironment.{ts,test.ts}, ProjectionSnapshotQuery.ts — additive, both sides kept. Two upstream deletions the merge honoured while the fork still referenced them Both broke typecheck rather than anything subtler, which is the good case: - pingdotgg#8144 renamed ChatView's `composerHasDraftContent` to `composerHasUnsentContent` (hoisting the predicate into composerDraftHasUserContent). The fork's five references now follow the rename. - pingdotgg#8144 replaced ChatComposer's `activeThreadActivities` prop with a precomputed `activeContextWindow`. The fork derives both the snapshot and the account-usage view the Vitals gauge needs, so `activeThreadActivities` is restored as the prop and ChatView passes it again. This is a fourth sweep direction scripts/sweep-merge.py cannot see — a line in the merge-base AND the fork, deleted by upstream. It is documented in docs/fork/README.md along with the probe. Two upstream tests retargeted, not deleted - ProviderSettingsForm.test.ts asserted Claude's exact field order without the fork's configDirPath. - serverSettings.test.ts's fork-owned auth guard asserted the settings file stays empty. pingdotgg#8176 deliberately persists explicit providers.*.enabled flags so an upgrade cannot silently disable a provider the user had on, so the assertion now targets its real subject — disableAuthentication never reaching disk — with a control proving the file was written. Verified by mutation: making the flag patchable and neutralizing the two earlier assertions turns that line red. Invariants All nine re-probed against the merged tree and holding. Migration ids unique and monotonic (49 entries, max 50, 34 burned); the fork-only @effect/platform-node patch still pinned at beta.103 (upstream's bump was Clerk-only and did not touch patchedDependencies); both sidebars present with legacySidebarEnabled intact; deliberate deletions still deleted; isSendBlocked at four call sites; the Claude steering test still absent; footer panels still inside SidebarUtilityMenu; reconcileProviderSessions still gone with BootTurnReconciler owning the binding; the interrupt/stop ladder intact including ClaudeQueryRuntime.interrupt and .stopTask; the live-session interrupt gate and recoverInterruptFailure both present; entrypoint.test.ts still realpaths its temp dir. Invariants 10 and 11 added. Sweeps resurrected 6, dropped 19, fork-loss 16, every entry named. Both "resurrected" lines are new upstream constructs that reuse the same text, not restorations: the fork's deletion sites still carry their comments and remain empty. The fourth direction found 167 lines, all legitimate (version bumps, Clerk pins, upstream refactoring its own code) once the two above were fixed. Gate pnpm run verify, whole script: fmt:check, typecheck, lint, test — 10,083 tests passed across 959 files, 8 skipped, 0 failed, EXIT=0. Full pnpm install first; pnpm-lock.yaml unchanged by it. Not deployed. Co-Authored-By: Claude Opus 5 (1M context) <[email protected]>
2 parents 5efd6d2 + a3a8cbd commit a1ffdf1

162 files changed

Lines changed: 7785 additions & 665 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
name: Desktop macOS Preview
2+
3+
on:
4+
pull_request:
5+
types: [labeled, synchronize, reopened]
6+
7+
permissions:
8+
contents: read
9+
pull-requests: write
10+
11+
concurrency:
12+
group: desktop-macos-preview-${{ github.event.pull_request.number }}
13+
cancel-in-progress: true
14+
15+
jobs:
16+
build:
17+
name: Build macOS Apple Silicon preview
18+
if: >-
19+
github.event.pull_request.head.repo.full_name == github.repository &&
20+
contains(github.event.pull_request.labels.*.name, 'preview:mac') &&
21+
(github.event.action != 'labeled' || github.event.label.name == 'preview:mac')
22+
runs-on: blacksmith-12vcpu-macos-26
23+
timeout-minutes: 30
24+
steps:
25+
- name: Checkout
26+
uses: actions/checkout@v6
27+
with:
28+
ref: ${{ github.event.pull_request.head.sha }}
29+
sparse-checkout: |
30+
/*
31+
!/.repos/
32+
sparse-checkout-cone-mode: false
33+
34+
- name: Setup Vite+
35+
uses: voidzero-dev/setup-vp@v1
36+
with:
37+
node-version-file: package.json
38+
cache: true
39+
run-install: false
40+
41+
- name: Install desktop dependencies
42+
run: vp install --filter=@t3tools/desktop... --filter=t3... --filter=@t3tools/scripts...
43+
44+
- name: Cache resource monitor
45+
id: resource_monitor_cache
46+
uses: actions/cache@v6
47+
with:
48+
path: native/resource-monitor/target/aarch64-apple-darwin/release/t3-resource-monitor
49+
key: resource-monitor-aarch64-apple-darwin-${{ hashFiles('native/resource-monitor/Cargo.lock', 'native/resource-monitor/Cargo.toml', 'native/resource-monitor/src/**') }}
50+
51+
- name: Setup Rust
52+
if: steps.resource_monitor_cache.outputs.cache-hit != 'true'
53+
uses: dtolnay/rust-toolchain@stable
54+
with:
55+
targets: aarch64-apple-darwin
56+
57+
- id: version
58+
name: Set preview version and public configuration
59+
shell: bash
60+
env:
61+
PR_NUMBER: ${{ github.event.pull_request.number }}
62+
run: |
63+
set -euo pipefail
64+
65+
base_version="$(node -p "require('./apps/desktop/package.json').version")"
66+
preview_version="${base_version}-pr.${PR_NUMBER}.${GITHUB_RUN_NUMBER}"
67+
node scripts/update-release-package-versions.ts "$preview_version"
68+
cp .env.example .env
69+
70+
echo "version=$preview_version" >> "$GITHUB_OUTPUT"
71+
72+
- id: build
73+
name: Build unsigned macOS DMG
74+
shell: bash
75+
env:
76+
T3CODE_DESKTOP_REUSE_RESOURCE_MONITOR: ${{ steps.resource_monitor_cache.outputs.cache-hit == 'true' }}
77+
PREVIEW_VERSION: ${{ steps.version.outputs.version }}
78+
run: |
79+
set -euo pipefail
80+
81+
vp run dist:desktop:artifact \
82+
--platform mac \
83+
--target dmg \
84+
--arch arm64 \
85+
--build-version "$PREVIEW_VERSION" \
86+
--verbose
87+
88+
shopt -s nullglob
89+
dmg_files=(release/*.dmg)
90+
if (( ${#dmg_files[@]} != 1 )); then
91+
printf 'Expected one DMG, found %s.\n' "${#dmg_files[@]}" >&2
92+
exit 1
93+
fi
94+
printf 'dmg_name=%s\n' "$(basename "${dmg_files[0]}")" >> "$GITHUB_OUTPUT"
95+
96+
- id: upload
97+
name: Upload macOS DMG
98+
uses: actions/upload-artifact@v7
99+
with:
100+
path: release/*.dmg
101+
if-no-files-found: error
102+
archive: false
103+
overwrite: true
104+
retention-days: 7
105+
106+
- name: Comment download link
107+
uses: actions/github-script@v8
108+
env:
109+
ARTIFACT_URL: ${{ steps.upload.outputs.artifact-url }}
110+
DMG_NAME: ${{ steps.build.outputs.dmg_name }}
111+
HEAD_SHA: ${{ github.event.pull_request.head.sha }}
112+
PREVIEW_VERSION: ${{ steps.version.outputs.version }}
113+
with:
114+
script: |
115+
const { data: pullRequest } = await github.rest.pulls.get({
116+
owner: context.repo.owner,
117+
repo: context.repo.repo,
118+
pull_number: context.payload.pull_request.number,
119+
});
120+
if (pullRequest.head.sha !== process.env.HEAD_SHA) {
121+
core.info("Skipping the outdated macOS preview comment.");
122+
return;
123+
}
124+
125+
const marker = "<!-- desktop-macos-preview -->";
126+
const body = [
127+
marker,
128+
"### macOS preview",
129+
"",
130+
`[Download Apple Silicon DMG](${process.env.ARTIFACT_URL})`,
131+
"",
132+
`Version: ${process.env.PREVIEW_VERSION}`,
133+
`Commit: ${process.env.HEAD_SHA.slice(0, 7)}`,
134+
"",
135+
"Unsigned build. Clear quarantine before opening:",
136+
"```sh",
137+
`xattr -d com.apple.quarantine ~/Downloads/${process.env.DMG_NAME}`,
138+
"```",
139+
"",
140+
"The download requires GitHub access and expires after 7 days.",
141+
].join("\n");
142+
143+
const { data: comments } = await github.rest.issues.listComments({
144+
owner: context.repo.owner,
145+
repo: context.repo.repo,
146+
issue_number: context.payload.pull_request.number,
147+
per_page: 100,
148+
});
149+
const existing = comments.find((comment) => comment.body?.includes(marker));
150+
151+
if (existing) {
152+
await github.rest.issues.updateComment({
153+
owner: context.repo.owner,
154+
repo: context.repo.repo,
155+
comment_id: existing.id,
156+
body,
157+
});
158+
} else {
159+
await github.rest.issues.createComment({
160+
owner: context.repo.owner,
161+
repo: context.repo.repo,
162+
issue_number: context.payload.pull_request.number,
163+
body,
164+
});
165+
}

‎.github/workflows/release.yml‎

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ on:
66
- "v*.*.*"
77
- "!v*-nightly.*"
88
schedule:
9-
- cron: "0 */3 * * *"
9+
# Off minute zero: GitHub delays scheduled runs most at the top of the hour.
10+
- cron: "7 */3 * * *"
1011
workflow_dispatch:
1112
inputs:
1213
channel:
@@ -22,6 +23,17 @@ on:
2223
required: false
2324
type: string
2425

26+
# Serialize nightlies (scheduled and manual) so overlapping runs cannot build
27+
# the same commit twice or publish out of order. Stable tag releases get their
28+
# own group so a nightly never blocks them. Running publishers are never
29+
# canceled, and queue: max keeps every pending run instead of the default
30+
# newest-wins single slot, so a queued stable tag can never be silently
31+
# dropped. Queued nightlies with no new commits skip via check_changes.
32+
concurrency:
33+
group: release-${{ (github.event_name == 'schedule' || inputs.channel == 'nightly') && 'nightly' || 'stable' }}
34+
cancel-in-progress: false
35+
queue: max
36+
2537
permissions:
2638
contents: read
2739
id-token: none
@@ -199,8 +211,14 @@ jobs:
199211

200212
relay_public_config:
201213
name: Resolve T3 Connect public config
202-
needs: preflight
203-
if: ${{ !failure() && !cancelled() && needs.preflight.result == 'success' }}
214+
# Consumes only the commit SHA, not preflight's resolved version, so it runs
215+
# alongside preflight instead of after it. The condition mirrors preflight's:
216+
# check_changes is skipped on non-schedule events (skipped is neither failure
217+
# nor success, so success() would be wrong here).
218+
needs: [check_changes]
219+
if: |
220+
!failure() && !cancelled() &&
221+
(github.event_name != 'schedule' || needs.check_changes.outputs.has_changes == 'true')
204222
runs-on: blacksmith-8vcpu-ubuntu-2404
205223
timeout-minutes: 5
206224
environment:
@@ -222,7 +240,7 @@ jobs:
222240
- name: Checkout
223241
uses: actions/checkout@v6
224242
with:
225-
ref: ${{ needs.preflight.outputs.ref }}
243+
ref: ${{ github.sha }}
226244
sparse-checkout: |
227245
/*
228246
!/.repos/
@@ -295,15 +313,19 @@ jobs:
295313
# machine. node-pty is N-API, so one binary works across all WSL Node versions.
296314
build_wsl_node_pty:
297315
name: Build WSL node-pty (linux-x64)
298-
needs: [preflight]
299-
if: ${{ !failure() && !cancelled() && needs.preflight.result == 'success' }}
316+
# Same gating as relay_public_config: only the commit SHA is needed, so this
317+
# runs alongside preflight. See the condition comment there.
318+
needs: [check_changes]
319+
if: |
320+
!failure() && !cancelled() &&
321+
(github.event_name != 'schedule' || needs.check_changes.outputs.has_changes == 'true')
300322
runs-on: blacksmith-8vcpu-ubuntu-2404
301323
timeout-minutes: 15
302324
steps:
303325
- name: Checkout
304326
uses: actions/checkout@v6
305327
with:
306-
ref: ${{ needs.preflight.outputs.ref }}
328+
ref: ${{ github.sha }}
307329
sparse-checkout: |
308330
/*
309331
!/.repos/
@@ -758,9 +780,8 @@ jobs:
758780
- name: Align package versions to release version
759781
run: node scripts/update-release-package-versions.ts "${{ needs.preflight.outputs.version }}"
760782

761-
- name: Build web package
762-
run: vp run --filter @t3tools/web build
763-
783+
# The t3 build task depends on @t3tools/web#build, so the web client is
784+
# built (once) as part of this step.
764785
- name: Build CLI package
765786
run: vp run --filter t3 build
766787

‎.macroscope/check-run-agents/ui-consistency.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,13 @@ The goal is not to minimize CSS or class counts at any cost. The goal is to put
7070
- Do not treat a screenshot as proof of keyboard, overflow, scrollbar, responsive, or runtime-theme behavior. Pair visual evidence with source, computed-style, emitted-CSS, or interaction checks as appropriate.
7171
- Be alert to shared primitive color indirection. When a primitive routes icon color through a CSS variable, ensure migrated contextual icons retain their intended tone, including pressed and disabled states.
7272

73+
## Environment routing in shared renderers
74+
75+
- A shared renderer that performs an environment-scoped action — a server RPC such as opening or revealing a file, an environment-gated capability check, or an OS-derived label — must resolve its target environment from explicit scope: the bound thread's `environmentId`, or an `environmentId` prop threaded from the owning surface. Never let it silently fall back to the globally active environment. Multi-environment surfaces (pull request panels, review annotations, cross-environment listings) can render content from environment B while environment A is active; a silent fallback sends B's paths to A's server and presents A's platform wording.
76+
- When a call site cannot supply an explicit environment scope, suppress the environment-scoped actions at that call site rather than guessing. A hidden menu item is correct; an item that targets the wrong server is a concrete finding.
77+
- Capability gating, action dispatch, and user-facing labels must all read from the same environment's server config that the action will execute against. Flag a renderer whose label derives from one environment while its RPC targets another.
78+
- Flag new call sites of shared markdown, chip, or menu renderers that trigger environment actions without passing explicit scope, and flag new environment-action props whose default reintroduces an active-environment fallback.
79+
7380
## Change discipline
7481

7582
- Review the pull request's changed scope and directly affected consumers. Do not turn a focused PR into a demand for unrelated legacy cleanup.

‎apps/desktop/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@t3tools/desktop",
3-
"version": "0.0.33",
3+
"version": "0.0.34",
44
"private": true,
55
"type": "module",
66
"main": "dist-electron/main.cjs",

‎apps/mobile/modules/t3-markdown-text/src/markdownLinks.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ import type { MARKDOWN_FILE_ICON_SOURCES } from "./markdownFileIcons.generated";
33
const WINDOWS_DRIVE_PATH_PATTERN = /^[A-Za-z]:[\\/]/;
44
const WINDOWS_UNC_PATH_PATTERN = /^\\\\/;
55
const RELATIVE_PATH_PREFIX_PATTERN = /^(~\/|\.{1,2}\/)/;
6-
const RELATIVE_FILE_PATH_PATTERN = /^[A-Za-z0-9._-]+(?:\/[A-Za-z0-9._-]+)+(?::\d+){0,2}$/;
7-
const RELATIVE_FILE_NAME_PATTERN = /^[A-Za-z0-9._-]+\.[A-Za-z0-9_-]+(?::\d+){0,2}$/;
6+
const RELATIVE_FILE_PATH_PATTERN =
7+
/^(?:[A-Za-z0-9._-]+(?: +[A-Za-z0-9._-]+)*\/)+[A-Za-z0-9._-]+(?: +[A-Za-z0-9._-]+)*(?::\d+){0,2}$/;
8+
const RELATIVE_FILE_NAME_PATTERN =
9+
/^[A-Za-z0-9._-]+(?: +[A-Za-z0-9._-]+)*\.[A-Za-z0-9_-]+(?::\d+){0,2}$/;
810
const POSITION_SUFFIX_PATTERN = /:\d+(?::\d+)?$/;
911
const POSIX_FILE_ROOT_PREFIXES = [
1012
"/Users/",

‎apps/mobile/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
"expo-constants": "~56.0.18",
8282
"expo-crypto": "~56.0.4",
8383
"expo-dev-client": "~56.0.20",
84+
"expo-device": "~56.0.4",
8485
"expo-file-system": "~56.0.8",
8586
"expo-font": "~56.0.7",
8687
"expo-glass-effect": "~56.0.4",

‎apps/mobile/src/features/cloud/linkEnvironment.test.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ vi.mock("expo-constants", () => ({
3333
},
3434
}));
3535

36+
vi.mock("expo-device", () => ({
37+
osVersion: "18.4.1",
38+
modelName: "iPhone 15 Pro",
39+
}));
40+
3641
vi.mock("react-native", () => ({
3742
Platform: {
3843
OS: "ios",

‎apps/mobile/src/features/home/HomeScreen.tsx‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import {
1212
type EnvironmentThreadSearchMatch,
1313
} from "@t3tools/client-runtime/state/thread-search";
1414
import { sortPinnedThreadsByOrderKey } from "@t3tools/client-runtime/state/thread-sort";
15-
import type { ChangeRequestSettleSource } from "@t3tools/client-runtime/state/thread-settled";
1615
import type {
1716
EnvironmentId,
1817
SidebarProjectGroupingMode,
@@ -54,6 +53,7 @@ import {
5453
buildThreadListV2ListItems,
5554
THREAD_LIST_V2_SETTLED_INITIAL_COUNT,
5655
THREAD_LIST_V2_SETTLED_PAGE_COUNT,
56+
type ThreadListV2ChangeRequestState,
5757
type ThreadListV2ListItem,
5858
} from "../threads/threadListV2";
5959
import { useThreadListV2ShelfPreferences } from "../threads/use-thread-list-v2-shelf-preferences";
@@ -491,15 +491,16 @@ export function HomeScreen(props: HomeScreenProps) {
491491
// PR states stream in per-row. The next partition applies the configured
492492
// merge rule and the always-on close rule, matching web.
493493
const [changeRequestByKey, setChangeRequestByKey] = useState<
494-
ReadonlyMap<string, ChangeRequestSettleSource>
494+
ReadonlyMap<string, ThreadListV2ChangeRequestState>
495495
>(() => new Map());
496496
const handleChangeRequestState = useCallback(
497-
(threadKey: string, changeRequest: ChangeRequestSettleSource | null) => {
497+
(threadKey: string, changeRequest: ThreadListV2ChangeRequestState | null) => {
498498
setChangeRequestByKey((current) => {
499499
const existing = current.get(threadKey) ?? null;
500500
if (
501501
(existing?.state ?? null) === (changeRequest?.state ?? null) &&
502-
(existing?.updatedAt ?? null) === (changeRequest?.updatedAt ?? null)
502+
(existing?.updatedAt ?? null) === (changeRequest?.updatedAt ?? null) &&
503+
(existing?.linkedPullRequestKey ?? null) === (changeRequest?.linkedPullRequestKey ?? null)
503504
) {
504505
return current;
505506
}

‎apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import { useAtomValue } from "@effect/atom-react";
1212
import { AsyncResult } from "effect/unstable/reactivity";
1313
import type { EnvironmentId } from "@t3tools/contracts";
1414
import { sortPinnedThreadsByOrderKey } from "@t3tools/client-runtime/state/thread-sort";
15-
import type { ChangeRequestSettleSource } from "@t3tools/client-runtime/state/thread-settled";
1615
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
1716
import type { LayoutChangeEvent } from "react-native";
1817
import { Platform, Pressable, StyleSheet, TextInput, View } from "react-native";
@@ -84,6 +83,7 @@ import {
8483
buildThreadListV2ListItems,
8584
THREAD_LIST_V2_SETTLED_INITIAL_COUNT,
8685
THREAD_LIST_V2_SETTLED_PAGE_COUNT,
86+
type ThreadListV2ChangeRequestState,
8787
type ThreadListV2ListItem,
8888
} from "./threadListV2";
8989

@@ -377,15 +377,16 @@ function ThreadNavigationSidebarPane(
377377
// PR states stream in per-row. The next partition applies the configured
378378
// merge rule and the always-on close rule.
379379
const [changeRequestByKey, setChangeRequestByKey] = useState<
380-
ReadonlyMap<string, ChangeRequestSettleSource>
380+
ReadonlyMap<string, ThreadListV2ChangeRequestState>
381381
>(() => new Map());
382382
const handleChangeRequestState = useCallback(
383-
(threadKey: string, changeRequest: ChangeRequestSettleSource | null) => {
383+
(threadKey: string, changeRequest: ThreadListV2ChangeRequestState | null) => {
384384
setChangeRequestByKey((current) => {
385385
const existing = current.get(threadKey) ?? null;
386386
if (
387387
(existing?.state ?? null) === (changeRequest?.state ?? null) &&
388-
(existing?.updatedAt ?? null) === (changeRequest?.updatedAt ?? null)
388+
(existing?.updatedAt ?? null) === (changeRequest?.updatedAt ?? null) &&
389+
(existing?.linkedPullRequestKey ?? null) === (changeRequest?.linkedPullRequestKey ?? null)
389390
) {
390391
return current;
391392
}

0 commit comments

Comments
 (0)