Skip to content

Conversation

@ChrisPei
Copy link
Contributor

  • Add Windows platform check in getShellEnvironment() to avoid spawning Unix shells (/bin/bash, /bin/zsh) which don't exist on Windows
  • Replace hardcoded "/dev/null" with os.devNull for cross-platform compatibility in git diff --no-index commands
  • Pre-resolve git refs to commit hashes before passing to execFile to avoid Windows command line escaping issues with ^{commit} syntax
  • Fallback to local branch when origin/branch doesn't exist
  • Use path.isAbsolute() instead of startsWith("/") for cross-platform absolute path detection in worktree-config.ts

- Add Windows platform check in getShellEnvironment() to use process.env directly
- Replace "/dev/null" with os.devNull for cross-platform compatibility
- Pre-resolve git refs to commit hash to avoid Windows escaping issues with ^{commit}
- Fallback to local branch when origin/branch doesn't exist
- Use path.isAbsolute() instead of startsWith("/") for cross-platform path detection

Co-Authored-By: Claude <noreply@anthropic.com>
@ChrisPei ChrisPei force-pushed the fix-worktree-windows branch from c7b019b to 844f8fa Compare January 23, 2026 16:53
@serafimcloud serafimcloud merged commit d1de4da into 21st-dev:main Jan 23, 2026
ChrisPeiSC added a commit to hongshancapital/1code that referenced this pull request Jan 24, 2026
合并内容:
- v0.0.35 ~ v0.0.39 版本更新
- Git 分支管理增强 (21st-dev#64)
- Claude SDK spawn 错误修复 (21st-dev#70)
- Windows git worktree 兼容 (21st-dev#72)
- macOS traffic light spacer 修复 (21st-dev#73)
- Claude binary 版本获取修复 (21st-dev#74)
- Mermaid 图表支持
- Plan sidebar 功能
- Model usage tracking
- CLI 安装支持

保留的定制功能:
- LiteLLM onboarding
- Runtime settings tab
- Monaco Editor / LSP 支持
- Code review comment 系统
- Terminal Run 功能
- 文件搜索和工具检测
- Hong 品牌定制

Co-Authored-By: Claude <noreply@anthropic.com>
guilhermexp added a commit to guilhermexp/1code that referenced this pull request Jan 25, 2026
… OAuth, slash commands fixes

Includes:
- Human-readable worktree folder names (21st-dev#87)
- Git branch management with local/remote branch selection (21st-dev#64)
- MCP OAuth authentication for servers with allowlists (21st-dev#88)
- Custom slash commands with multi-line arguments (21st-dev#86)
- Insert slash commands without auto-send (21st-dev#84)
- Claude SDK spawn errors and expired sessions (21st-dev#70)
- Claude binary version fetch using GCS bucket (21st-dev#74)
- Windows compatibility for git worktree (21st-dev#72)
- Traffic light spacer only on macOS (21st-dev#73)

Resolved conflicts in:
- App.tsx: Combined I18nProvider and WindowProvider
- chat-markdown-renderer.tsx: Added both onUrlClick and isStreaming deps
- atoms/index.ts: Kept previewSidebarOpen default as false
- ipc-chat-transport.ts: Added detailed SDK error logging
- active-chat.tsx: Combined imports and slash command expansion
- messages-list.tsx: Added both chatId and onUrlClick props
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants