Title: Session hangs in "Architecting" state after completing git operations

Preflight Checklist

• [x] I have searched existing issues and this hasn't been reported yet
• [x] This is a single bug report (please file separate reports for different bugs)
• [x] I am using the latest version of Claude Code

What's Wrong?

 Description:

  Claude Code sessions are hanging at the end of conversations, particularly after completing git commit operations.
  I've experienced this twice in one morning.

  Observed behavior:

  After Claude completes a git commit and asks a follow-up question ("Would you like me to push to remote?"), the
  session enters an unresponsive state:

  ● Done. Committed all the Session 44 changes:
    Commit f994fdb: Session 44: Material Symbols Icons & UI Tightening
    ...
    Would you like me to push to remote?

  ✻ Baked for 3m 41s

  ✽ Architecting… (esc to interrupt · 9m 25s · ↓ 0 tokens)

  The key indicator is ↓ 0 tokens - no tokens are being received from the API. User input typed during this state does
  not get processed. The only recovery is to Ctrl+C/Esc and restart the session.

What Should Happen?

  Expected behavior:

  Session should remain responsive and accept user input after Claude asks a question.

  Environment:

• OS: Windows 10/11
• Claude Code version: 2.1.17

  Frequency: Intermittent but reproducible - 2 occurrences in one morning session

Error Messages/Logs

What was committed:
  1. Material Symbols icon system - Google Fonts CDN, helper functions (icon(), status_icon(), etc.), replaced text
  patterns with icons
  2. UI tightening fixes - Auto column layouts, fixed button/badge wrapping issues
  3. Documentation - New headless Playwright guide, updated CLAUDE.md

  The .claude/settings.local.json was left uncommitted as it's a local config file.

  Your branch is 1 commit ahead of origin. Would you like me to push to remote?

✻ Baked for 3m 41s

✻ Architecting… (esc to interrupt · 29m 2s · ↓ 0 tokens)
  ⎿  Tip: Run /install-slack-app to use Claude in Slack


  ❯ please push
  ❯ we've been trying to sync claude local settings as I use a mac as well as this pc and want behaviour the same,
    but we have a bit of ping-pong going on with syncs at the moment

Steps to Reproduce

Steps to reproduce:

1. Start a Claude Code session in a git repository
2. Work through a multi-step task that involves code changes (in my case, UI updates across multiple files)
3. Request Claude to commit the changes
4. Claude runs git add, git commit, completes successfully
5. Claude asks a follow-up question (e.g., "Would you like me to push to remote?")
6. Before user can respond, session transitions to "Architecting…" state
7. Session becomes unresponsive - shows ↓ 0 tokens and timer continues increasing
8. User input is not processed; Esc/Ctrl+C required to exit

Notes:

• The git operations themselves complete successfully (commit is created)
• The hang occurs after Claude finishes its response and is awaiting user input
• Session had been running for an extended period (30+ minutes) with multiple tool calls
• May be related to context length or API connection timeout between turns

Claude Model

Opus

Is this a regression?

Yes, this worked in a previous version

Last Working Version

_No response_

Claude Code Version

2.1.17

Platform

Anthropic API

Operating System

Windows

Terminal/Shell

PowerShell

Additional Information

_No response_