fix: resolve issues #240, #238, #234 and sync v1.0.223#242
Merged
shuv1337 merged 13 commits intointegrationfrom Jan 1, 2026
Merged
fix: resolve issues #240, #238, #234 and sync v1.0.223#242shuv1337 merged 13 commits intointegrationfrom
shuv1337 merged 13 commits intointegrationfrom
Conversation
…nomalyco#6528)" This reverts commit 97a0fd1.
…nd safe area issues
Upstream changes: - feat(app): context window window - fix(util): checksum defensiveness - fix(app): update primitive colors - fix(tui): don't show 'Agent not found' toast for subagents Resolved conflicts: - packages/app/src/pages/session.tsx: accepted upstream refactor, preserved fork mobile features (StatusBar, keyboard visibility, mobile state) - packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx: accepted upstream fix for subagent toast
… prop Upstream v1.0.223 changed Editor.open to return Result type but didn't update all call sites. Also adds missing onSearchToggle prop to PromptProps.
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
Comment on lines
+22
to
+23
| export function checksum(content: string): string | undefined { | ||
| if (!content) return undefined |
There was a problem hiding this comment.
logic: changing return type from string to string | undefined could cause type issues
all call sites pass checksum result to cacheKey properties without handling potential undefined value (session.tsx line 1197, message-part.tsx line 917). if FileContents.cacheKey expects string, this causes TypeScript errors
consider:
- keep return type as string and return empty string for defensive behavior, OR
- update all call sites to handle undefined with nullish coalescing, OR
- make cacheKey accept string | undefined if supported
Prompt To Fix With AI
This is a comment left during a code review.
Path: packages/util/src/encode.ts
Line: 22:23
Comment:
**logic:** changing return type from string to string | undefined could cause type issues
all call sites pass checksum result to cacheKey properties without handling potential undefined value (session.tsx line 1197, message-part.tsx line 917). if FileContents.cacheKey expects string, this causes TypeScript errors
consider:
- keep return type as string and return empty string for defensive behavior, OR
- update all call sites to handle undefined with nullish coalescing, OR
- make cacheKey accept string | undefined if supported
How can I resolve this? If you propose a fix, please make it concise.
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
4 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.
Summary
This PR merges bug fixes for issues #240, #238, and #234 into the integration branch, along with the latest upstream synchronization (v1.0.223) and other improvements from
shuvcode-dev.Changes
Features
AskQuestionWizardUI in the web application. Added comprehensive tests inpackages/opencode/test/tool/askquestion.test.ts.getSpinnerFrame()utility.Fixes
Marklogo from the sidebar to align with shuvcode branding.Editor.openResult type handling andAgent not foundtoast issues for subagents.Sync
bun.lockandflake.lock.Testing
AskQuestiontool passed (bun test packages/opencode/test/tool/askquestion.test.ts).Greptile Summary
This PR merges upstream v1.0.223 into the integration branch and adds two fork-specific fixes.
Key Changes:
hidden sm:blockdiv)Note on PR Description: The PR description mentions fixes for issues #240 (AskQuestion tool), #238 (spinner customization), and #234 (branding). However, these issues were already resolved in previous commits on the
shuvcode-devbranch that were merged before this PR. The actual changes in THIS PR are the upstream sync and the two fixes listed above.Confidence Score: 3/5
Important Files Changed
Sequence Diagram
sequenceDiagram participant Dev as Developer participant Fork as shuvcode-dev participant Int as integration branch participant Up as Upstream v1.0.223 Note over Fork: Issues #240, #238, #234<br/>already fixed in shuvcode-dev Dev->>Int: Commit: Hide status bar on mobile<br/>(iPhone dynamic island fix) Dev->>Int: Merge upstream v1.0.223 Up->>Int: feat: Context window view Up->>Int: fix: Checksum defensiveness Up->>Int: fix: Subagent toast handling Up->>Int: fix: Update primitive colors Note over Int: Merge conflicts resolved:<br/>- session.tsx (preserved mobile features)<br/>- prompt/index.tsx (upstream subagent fix) Dev->>Int: Post-merge fix:<br/>Editor.open Result type handling Note over Int: Final state:<br/>✓ Mobile status bar hidden<br/>✓ Context window feature<br/>✓ Checksum returns undefined<br/>✓ Editor.open uses Result type