Repository navigation
Merge upstream cfafb4bb54d2 into atli - #22
Merged
Merged
Conversation
…dotgg#18369) Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#12474) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com> Co-authored-by: Yash Singh <saiansh2525@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#12469) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com> Co-authored-by: Yash Singh <saiansh2525@gmail.com>
…tgg#12465) Co-authored-by: Yash Singh <saiansh2525@gmail.com>
…nger drop clients (pingdotgg#19205) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#19207) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… Google group (pingdotgg#18955) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…nt finishes (pingdotgg#18996) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#19162) Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
…otgg#19160) Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
…gdotgg#15864) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…mits (pingdotgg#11368) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…hey made unnecessary (pingdotgg#19213) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#15872) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…se the child (pingdotgg#14416) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Co-authored-by: SAPHID <saphid@users.noreply.github.com>
…chip (pingdotgg#20102) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#20114) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…read (pingdotgg#19915) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#18075) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ucceeds (pingdotgg#20065) Co-authored-by: Aaron Queen <bompus@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ery child (pingdotgg#20062) Co-authored-by: Aaron Queen <bompus@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#20066) Co-authored-by: Aaron Queen <bompus@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#20070) Co-authored-by: Aaron Queen <bompus@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#20120) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gg#20147) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dows (pingdotgg#20162) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#20133) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…arent (pingdotgg#20160) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#15945) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Michel-Liao <107891771+Michel-Liao@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Resolutions: - Comment-only conflicts from upstream's comment pruning (pingdotgg#19559): take upstream's deletion; keep a short comment where it documents fork-only behavior (tracked commands hold Waiting, PR watch setting, usage-limit per provider instance, thread-bound scheduled tasks follow the thread model). - Mobile: adopt upstream's components/ui moves, NativeThemeHost and AppBar types; re-apply the fork's adaptive navigation, thread actions menu and scheduled-task "follows thread model" row. - Server cloud/update: keep both the fork's BootService.stop (t3 recover) and upstream's withStopped (t3 doctor); add withStopped to the fork's mocks. - update.test.ts: upstream moved the server to 0.1.0, so the fork's update fixtures target 0.1.x and pre-admission (0.0.46-atli.*) installs need --allow-downgrade. - ci.yml: take upstream's changes-gated jobs; keep the fork's atli triggers and GitHub-hosted runners (including the new changes job). - ThreadPullRequestsPanel: take upstream's virtualized list; keep the fork's watch toggle gating and add watchEnabled to the row inputs. - Effect bumped to 4.0.5: carry the Atom.family bound as patches/effect@4.0.5.patch (applies unchanged). - pnpm-workspace.yaml: keep both sides' patchedDependencies (upstream's bumped gesture-handler/keyboard-controller, @expo/ui; fork's image-viewing, shiki-engine). pnpm-lock.yaml: upstream's, regenerated with vp i. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
gabynevada
changed the title
Author
|
Updated to upstream
Local stand-in for Fork CI's
🤖 Generated with Claude Code |
![atli-skald[bot]](https://avatars.githubusercontent.com/in/4512341?s=60&v=4){kind=small}
There was a problem hiding this comment.
Skald review findings
Reviewed head 0ef91d55bc52fc028f5114deca418380c7fe378d against base atli (745f78d54c0750a95fd242962c880261825f39c9).
First round
Standing summary: open
Review details
Completed reviewers:
- architecture (hub-dispatch-v2:codex:gpt-6.1-sol:medium:9441865e1d0f674b)
- frontend (hub-dispatch-v2:codex:gpt-6.1-sol:medium:9441865e1d0f674b)
- security (hub-dispatch-v2:codex:gpt-6.1-sol:medium:9441865e1d0f674b)
- testing (hub-dispatch-v2:codex:gpt-6.1-sol:medium:9441865e1d0f674b)
Comment on lines
+16
to
+19
| // Never read by a build, typecheck, or test. Lint still formats them. | ||
| const INERT = [ | ||
| /^docs\//, | ||
| /^\.(agents|cursor|vscode|devcontainer|macroscope|repos)\//, |
There was a problem hiding this comment.
The INERT patterns return no owners before script-test dependencies can be considered, so decide() emits test=false and omits @t3tools/scripts.
This finding is advisory tier: a code fix is optional and it does not block the merge on one, but an answer is required before merge — addressed, disputed, deferred, or duplicate.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges upstream commit e6bbfdb (140 commits after #20). Merge with a merge commit.
Conflict resolutions:
apps/web/src/components/Sidebar.tsx: upstream's waiting row ("Waiting" with the new waiting icon). The file now matches upstream.patches/effect@4.0.2.patch: upstream moved to Effect 4.0.4 and dropped its patch. The fork'sAtom.familyfallback-cache bound is still needed, since 4.0.4 still keeps every atom alive on Hermes, so it moves topatches/effect@4.0.4.patchand is registered inpnpm-workspace.yaml.pnpm-lock.yaml: upstream's, regenerated withvp i. The only differences from upstream are the fork's patches.Fork code that needed changes for upstream APIs (these merged cleanly but broke typecheck or behavior):
crypto.randomUUIDv4is a function in Effect 4.0.4 (Claude MCP approval prompts and their test).applyFlagSettingsandbackgroundTasks.Verified locally: typecheck for web, mobile, server, client-runtime and contracts. Tests: server orchestration (subagent thread deletion, MCP elicitation, Claude adapter, thread management and settlement, agent awareness relay), web Sidebar logic and notifications, client-runtime thread execution, and the fork script tests.
Done by Claude Opus 5.5 in Claude Code (T3 Code).
🤖 Generated with Claude Code