Repository navigation
chore: merge upstream pingdotgg/t3code main - #14
Merged
Merged
Conversation
…ery (pingdotgg#14519) 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>
…ingdotgg#15000) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: SAPHID <saphid@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…ingdotgg#21527) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#21913) Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…ntents (pingdotgg#22302) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…#23230) Co-authored-by: maria-rcks <maria@kuuro.net>
…gdotgg#23414) Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: maria-rcks <maria@kuuro.net>
… runs on (pingdotgg#24833) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
… on (pingdotgg#24898) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: SAPHID <saphid@users.noreply.github.com> Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…sts (pingdotgg#25836) Co-authored-by: maria-rcks <maria@kuuro.net>
… Working shelf (pingdotgg#26195) Co-authored-by: SAPHID <saphid@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…ingdotgg#26247) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…26666) Co-authored-by: maria-rcks <maria@kuuro.net>
…gg#27032) Co-authored-by: maria-rcks <maria@kuuro.net>
…dotgg#27268) Co-authored-by: maria-rcks <maria@kuuro.net>
…dotgg#27310) Co-authored-by: maria-rcks <maria@kuuro.net>
…g#27803) Co-authored-by: maria-rcks <maria@kuuro.net>
…7925) Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: Otavio Salvador <25278+otavio@users.noreply.github.com>
…7936) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#28272) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…op (pingdotgg#28072) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…witches threads (pingdotgg#28091) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…tgg#28132) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…_capabilities reports (pingdotgg#28133) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#28169) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ironment disabled (pingdotgg#28179) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…nks (pingdotgg#28189) Co-authored-by: MarcoDotIO <20867620+MarcoDotIO@users.noreply.github.com>
…otgg#28209) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#28240) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#28243) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…ngdotgg#28267) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#28268) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…he app unreleased (pingdotgg#28269) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…rver test that reads it (pingdotgg#28273) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#28274) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#28276) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tifications guide (pingdotgg#28310) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…g#28515) Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude Opus 5.5 via Claude Code.
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
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.
The daily sync resolved a merge conflict with upstream. It lands by itself when CI passes.
Run: https://github.com/HYRMedia-LLC/t3code/actions/runs/41276671544
Agent summary
I resolved the one conflict and nothing else needed changing, but I couldn't confirm a fully clean typecheck: 4 of 17 tasks didn't succeed.
Decision:
packages/shared/src/composerTrigger.ts: kept both sides by combining them into/^\/models?(?:\s+(.*))?$/i. That keeps the fork's/modelsalias and adds upstream's case-insensitive fix (fix(shared): /Model with a query still opens the model picker pingdotgg/t3code#27837, so/Model opusalso opens the model picker).Checks:
pnpm-lock.yamlwasn't conflicted, so I didn't runvp i.vp run typecheckfinished with 13 of 17 tasks successful. It printed one error:scripts/tsconfig.tsbuildinfocouldn't be written because this sandbox's filesystem is read-only. The output didn't name the other three tasks that didn't succeed. I tried to get the details withvp run --last-details, but it needs approval here. Someone should rerun the typecheck on a writable checkout before relying on it.vp test run src/composerTrigger.test.tsinpackages/sharedpassed all 27 tests, including upstream's new/Model opusand/MODEL opuscases. Vitest also printed a read-only-filesystem error, but only when writing its run summary, after the tests had passed.git apply --checkbecause it needs approval. The patch doesn't mentioncomposerTrigger, so this change shouldn't affect it.The conflict markers are gone, but the file still shows as unmerged in git because I didn't stage anything, as instructed.
A bare
/modelswith no space after it still opens the slash-command list, not the model picker; only exactly/modeldoes that. The fork behaved the same way before this merge, so I left it alone.Files that differ from the automatic merge
packages/shared/src/composerTrigger.tsClaude Opus 5.5 via Claude Code.
Need help on this PR? Tag
@codesmith-botwith what you need.