Fix Claude session cwd resume drift

[juliusmarminge]

Aims to fix#2256

What Changed

• restart provider sessions when a thread's effective workspace cwd changes, so Claude does not keep running in a stale repo root or prior worktree
• backfill the persisted cwd when ProviderService.startSession() resumes an existing Claude session without an explicit cwd
• annotate provider/session start spans with the effective cwd and resume-source decision, and add a dedicated Claude adapter start-session span with the exact launch inputs passed to the Claude SDK
• add regression tests for both workspace-switch restarts and trace-file visibility of Claude cwd/resume inputs
• fix a ProviderService test isolation issue by using a unique thread id for the runtime-persistence assertion, avoiding cross-test reuse of persisted cwd
• stabilize the Claude trace test by switching it from the real file/batch trace sink to an in-memory sink, avoiding CI timeout/flushing variance while still asserting the emitted span attributes

Why

Claude resume state currently reuses persisted session identity independently of workspace selection. That can leave an active Claude session bound to an outdated working directory, or replay a persisted resume cursor without the matching persisted cwd, which makes resume behavior unreliable for worktrees and subdirectory clones. The added span attributes make future regressions diagnosable from local trace files and exported OTEL spans.

Testing

• bun run test src/provider/Layers/ClaudeAdapter.test.ts
• bun run test src/provider/Layers/ProviderService.test.ts
• bun run test src/provider/Layers/ClaudeAdapter.test.ts src/provider/Layers/ProviderService.test.ts -t "captures claude start-session span annotations for resume and cwd inputs|passes Claude resume ids without pinning a stale assistant checkpoint|uses an app-generated Claude session id for fresh sessions|reuses persisted cwd when startSession resumes a claude session without cwd input"
• bun fmt
• bun lint
• bun typecheck

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for any UI changes
• I included a video for animation/interaction changes

Note

Fix Claude session cwd drift by restarting sessions on workspace change and preserving cwd across resumes

• Provider sessions are now restarted when the effective working directory changes between turns; previously the session was reused even if the workspace had changed.
• ProviderService.startSession now falls back to the persisted cwd from an existing session binding when no cwd is provided as input, ensuring resumed sessions use the correct working directory.
• ClaudeAdapter no longer treats transient hook_started, hook_progress, or hook_response session IDs as durable thread identifiers; thread.started events and resume cursor updates are now gated on a durable session ID (e.g. from init).
• Behavioral Change: sessions that previously survived a workspace path change will now be restarted, and the resume cursor is preserved across the restart.

^{Macroscope summarized 11d6b00.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 0830e957-3a5b-46d7-b4cf-e4ab6fed91b6

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch cursor/fix-claude-cwd-resume-0c76

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Potential infinite restart loop when effectiveCwd is undefined
  • Added an effectiveCwd !== undefined guard to the cwdChanged check so that an unresolved workspace (undefined) no longer triggers a spurious restart that would loop indefinitely due to the persisted cwd backfill in ProviderService.

Or push these changes by commenting:

@cursor push 9974bfe8fa

Preview (9974bfe8fa)

diff --git a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts--- a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts+++ b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts@@ -334,7 +334,7 @@
thread.session && thread.session.status !== "stopped" && activeSession ? thread.id : null;
if (existingSessionThreadId) {
const runtimeModeChanged = thread.runtimeMode !== thread.session?.runtimeMode;
- const cwdChanged = effectiveCwd !== activeSession?.cwd;+ const cwdChanged = effectiveCwd !== undefined && effectiveCwd !== activeSession?.cwd;
const sessionModelSwitch =
currentProvider === undefined
? "in-session"

_{You can send follow-ups to the cloud agent here.}

^{Reviewed by Cursor Bugbot for commit fcb4421. Configure here.}

[macroscopeapp]

Approvability

A prior Macroscope approval was dismissed. Re-evaluating 4c5917b…

No code changes detected at 11d6b00. Prior analysis still applies.

Dismissing prior approval to re-evaluate 94af290

Dismissing prior approval to re-evaluate 4c5917b

[juliusmarminge]

Aims to fix#2256

What Changed

• restart provider sessions when a thread's effective workspace cwd changes, so Claude does not keep running in a stale repo root or prior worktree
• backfill the persisted cwd when ProviderService.startSession() resumes an existing Claude session without an explicit cwd
• annotate provider/session start spans with the effective cwd and resume-source decision, and add a dedicated Claude adapter start-session span with the exact launch inputs passed to the Claude SDK
• add regression tests for both workspace-switch restarts and trace-file visibility of Claude cwd/resume inputs
• fix a ProviderService test isolation issue by using a unique thread id for the runtime-persistence assertion, avoiding cross-test reuse of persisted cwd
• stabilize the Claude trace test by switching it from the real file/batch trace sink to an in-memory sink, avoiding CI timeout/flushing variance while still asserting the emitted span attributes

Why

Claude resume state currently reuses persisted session identity independently of workspace selection. That can leave an active Claude session bound to an outdated working directory, or replay a persisted resume cursor without the matching persisted cwd, which makes resume behavior unreliable for worktrees and subdirectory clones. The added span attributes make future regressions diagnosable from local trace files and exported OTEL spans.

Testing

• bun run test src/provider/Layers/ClaudeAdapter.test.ts
• bun run test src/provider/Layers/ProviderService.test.ts
• bun run test src/provider/Layers/ClaudeAdapter.test.ts src/provider/Layers/ProviderService.test.ts -t "captures claude start-session span annotations for resume and cwd inputs|passes Claude resume ids without pinning a stale assistant checkpoint|uses an app-generated Claude session id for fresh sessions|reuses persisted cwd when startSession resumes a claude session without cwd input"
• bun fmt
• bun lint
• bun typecheck

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for any UI changes
• I included a video for animation/interaction changes

Note

Fix Claude session cwd drift by restarting sessions on workspace change and preserving cwd across resumes

• Provider sessions are now restarted when the effective working directory changes between turns; previously the session was reused even if the workspace had changed.
• ProviderService.startSession now falls back to the persisted cwd from an existing session binding when no cwd is provided as input, ensuring resumed sessions use the correct working directory.
• ClaudeAdapter no longer treats transient hook_started, hook_progress, or hook_response session IDs as durable thread identifiers; thread.started events and resume cursor updates are now gated on a durable session ID (e.g. from init).
• Behavioral Change: sessions that previously survived a workspace path change will now be restarted, and the resume cursor is preserved across the restart.

^{Macroscope summarized 11d6b00.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 0830e957-3a5b-46d7-b4cf-e4ab6fed91b6

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch cursor/fix-claude-cwd-resume-0c76

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Potential infinite restart loop when effectiveCwd is undefined
  • Added an effectiveCwd !== undefined guard to the cwdChanged check so that an unresolved workspace (undefined) no longer triggers a spurious restart that would loop indefinitely due to the persisted cwd backfill in ProviderService.

Or push these changes by commenting:

@cursor push 9974bfe8fa

Preview (9974bfe8fa)

diff --git a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts--- a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts+++ b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts@@ -334,7 +334,7 @@
thread.session && thread.session.status !== "stopped" && activeSession ? thread.id : null;
if (existingSessionThreadId) {
const runtimeModeChanged = thread.runtimeMode !== thread.session?.runtimeMode;
- const cwdChanged = effectiveCwd !== activeSession?.cwd;+ const cwdChanged = effectiveCwd !== undefined && effectiveCwd !== activeSession?.cwd;
const sessionModelSwitch =
currentProvider === undefined
? "in-session"

_{You can send follow-ups to the cloud agent here.}

^{Reviewed by Cursor Bugbot for commit fcb4421. Configure here.}

[macroscopeapp]

Approvability

A prior Macroscope approval was dismissed. Re-evaluating 4c5917b…

No code changes detected at 11d6b00. Prior analysis still applies.

Dismissing prior approval to re-evaluate 94af290

Dismissing prior approval to re-evaluate 4c5917b

[juliusmarminge]

Aims to fix#2256

What Changed

• restart provider sessions when a thread's effective workspace cwd changes, so Claude does not keep running in a stale repo root or prior worktree
• backfill the persisted cwd when ProviderService.startSession() resumes an existing Claude session without an explicit cwd
• annotate provider/session start spans with the effective cwd and resume-source decision, and add a dedicated Claude adapter start-session span with the exact launch inputs passed to the Claude SDK
• add regression tests for both workspace-switch restarts and trace-file visibility of Claude cwd/resume inputs
• fix a ProviderService test isolation issue by using a unique thread id for the runtime-persistence assertion, avoiding cross-test reuse of persisted cwd
• stabilize the Claude trace test by switching it from the real file/batch trace sink to an in-memory sink, avoiding CI timeout/flushing variance while still asserting the emitted span attributes

Why

Claude resume state currently reuses persisted session identity independently of workspace selection. That can leave an active Claude session bound to an outdated working directory, or replay a persisted resume cursor without the matching persisted cwd, which makes resume behavior unreliable for worktrees and subdirectory clones. The added span attributes make future regressions diagnosable from local trace files and exported OTEL spans.

Testing

• bun run test src/provider/Layers/ClaudeAdapter.test.ts
• bun run test src/provider/Layers/ProviderService.test.ts
• bun run test src/provider/Layers/ClaudeAdapter.test.ts src/provider/Layers/ProviderService.test.ts -t "captures claude start-session span annotations for resume and cwd inputs|passes Claude resume ids without pinning a stale assistant checkpoint|uses an app-generated Claude session id for fresh sessions|reuses persisted cwd when startSession resumes a claude session without cwd input"
• bun fmt
• bun lint
• bun typecheck

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for any UI changes
• I included a video for animation/interaction changes

Note

Fix Claude session cwd drift by restarting sessions on workspace change and preserving cwd across resumes

• Provider sessions are now restarted when the effective working directory changes between turns; previously the session was reused even if the workspace had changed.
• ProviderService.startSession now falls back to the persisted cwd from an existing session binding when no cwd is provided as input, ensuring resumed sessions use the correct working directory.
• ClaudeAdapter no longer treats transient hook_started, hook_progress, or hook_response session IDs as durable thread identifiers; thread.started events and resume cursor updates are now gated on a durable session ID (e.g. from init).
• Behavioral Change: sessions that previously survived a workspace path change will now be restarted, and the resume cursor is preserved across the restart.

^{Macroscope summarized 11d6b00.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 0830e957-3a5b-46d7-b4cf-e4ab6fed91b6

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch cursor/fix-claude-cwd-resume-0c76

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Potential infinite restart loop when effectiveCwd is undefined
  • Added an effectiveCwd !== undefined guard to the cwdChanged check so that an unresolved workspace (undefined) no longer triggers a spurious restart that would loop indefinitely due to the persisted cwd backfill in ProviderService.

Or push these changes by commenting:

@cursor push 9974bfe8fa

Preview (9974bfe8fa)

diff --git a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts--- a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts+++ b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts@@ -334,7 +334,7 @@
thread.session && thread.session.status !== "stopped" && activeSession ? thread.id : null;
if (existingSessionThreadId) {
const runtimeModeChanged = thread.runtimeMode !== thread.session?.runtimeMode;
- const cwdChanged = effectiveCwd !== activeSession?.cwd;+ const cwdChanged = effectiveCwd !== undefined && effectiveCwd !== activeSession?.cwd;
const sessionModelSwitch =
currentProvider === undefined
? "in-session"

_{You can send follow-ups to the cloud agent here.}

^{Reviewed by Cursor Bugbot for commit fcb4421. Configure here.}

[macroscopeapp]

Approvability

A prior Macroscope approval was dismissed. Re-evaluating 4c5917b…

No code changes detected at 11d6b00. Prior analysis still applies.

Dismissing prior approval to re-evaluate 94af290

Dismissing prior approval to re-evaluate 4c5917b

[juliusmarminge]

Aims to fix#2256

What Changed

• restart provider sessions when a thread's effective workspace cwd changes, so Claude does not keep running in a stale repo root or prior worktree
• backfill the persisted cwd when ProviderService.startSession() resumes an existing Claude session without an explicit cwd
• annotate provider/session start spans with the effective cwd and resume-source decision, and add a dedicated Claude adapter start-session span with the exact launch inputs passed to the Claude SDK
• add regression tests for both workspace-switch restarts and trace-file visibility of Claude cwd/resume inputs
• fix a ProviderService test isolation issue by using a unique thread id for the runtime-persistence assertion, avoiding cross-test reuse of persisted cwd
• stabilize the Claude trace test by switching it from the real file/batch trace sink to an in-memory sink, avoiding CI timeout/flushing variance while still asserting the emitted span attributes

Why

Claude resume state currently reuses persisted session identity independently of workspace selection. That can leave an active Claude session bound to an outdated working directory, or replay a persisted resume cursor without the matching persisted cwd, which makes resume behavior unreliable for worktrees and subdirectory clones. The added span attributes make future regressions diagnosable from local trace files and exported OTEL spans.

Testing

• bun run test src/provider/Layers/ClaudeAdapter.test.ts
• bun run test src/provider/Layers/ProviderService.test.ts
• bun run test src/provider/Layers/ClaudeAdapter.test.ts src/provider/Layers/ProviderService.test.ts -t "captures claude start-session span annotations for resume and cwd inputs|passes Claude resume ids without pinning a stale assistant checkpoint|uses an app-generated Claude session id for fresh sessions|reuses persisted cwd when startSession resumes a claude session without cwd input"
• bun fmt
• bun lint
• bun typecheck

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for any UI changes
• I included a video for animation/interaction changes

Note

Fix Claude session cwd drift by restarting sessions on workspace change and preserving cwd across resumes

• Provider sessions are now restarted when the effective working directory changes between turns; previously the session was reused even if the workspace had changed.
• ProviderService.startSession now falls back to the persisted cwd from an existing session binding when no cwd is provided as input, ensuring resumed sessions use the correct working directory.
• ClaudeAdapter no longer treats transient hook_started, hook_progress, or hook_response session IDs as durable thread identifiers; thread.started events and resume cursor updates are now gated on a durable session ID (e.g. from init).
• Behavioral Change: sessions that previously survived a workspace path change will now be restarted, and the resume cursor is preserved across the restart.

^{Macroscope summarized 11d6b00.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 0830e957-3a5b-46d7-b4cf-e4ab6fed91b6

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch cursor/fix-claude-cwd-resume-0c76

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Potential infinite restart loop when effectiveCwd is undefined
  • Added an effectiveCwd !== undefined guard to the cwdChanged check so that an unresolved workspace (undefined) no longer triggers a spurious restart that would loop indefinitely due to the persisted cwd backfill in ProviderService.

Or push these changes by commenting:

@cursor push 9974bfe8fa

Preview (9974bfe8fa)

diff --git a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts--- a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts+++ b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts@@ -334,7 +334,7 @@
thread.session && thread.session.status !== "stopped" && activeSession ? thread.id : null;
if (existingSessionThreadId) {
const runtimeModeChanged = thread.runtimeMode !== thread.session?.runtimeMode;
- const cwdChanged = effectiveCwd !== activeSession?.cwd;+ const cwdChanged = effectiveCwd !== undefined && effectiveCwd !== activeSession?.cwd;
const sessionModelSwitch =
currentProvider === undefined
? "in-session"

_{You can send follow-ups to the cloud agent here.}

^{Reviewed by Cursor Bugbot for commit fcb4421. Configure here.}

[macroscopeapp]

Approvability

A prior Macroscope approval was dismissed. Re-evaluating 4c5917b…

No code changes detected at 11d6b00. Prior analysis still applies.

Dismissing prior approval to re-evaluate 94af290

Dismissing prior approval to re-evaluate 4c5917b

[juliusmarminge]

Aims to fix#2256

What Changed

• restart provider sessions when a thread's effective workspace cwd changes, so Claude does not keep running in a stale repo root or prior worktree
• backfill the persisted cwd when ProviderService.startSession() resumes an existing Claude session without an explicit cwd
• annotate provider/session start spans with the effective cwd and resume-source decision, and add a dedicated Claude adapter start-session span with the exact launch inputs passed to the Claude SDK
• add regression tests for both workspace-switch restarts and trace-file visibility of Claude cwd/resume inputs
• fix a ProviderService test isolation issue by using a unique thread id for the runtime-persistence assertion, avoiding cross-test reuse of persisted cwd
• stabilize the Claude trace test by switching it from the real file/batch trace sink to an in-memory sink, avoiding CI timeout/flushing variance while still asserting the emitted span attributes

Why

Claude resume state currently reuses persisted session identity independently of workspace selection. That can leave an active Claude session bound to an outdated working directory, or replay a persisted resume cursor without the matching persisted cwd, which makes resume behavior unreliable for worktrees and subdirectory clones. The added span attributes make future regressions diagnosable from local trace files and exported OTEL spans.

Testing

• bun run test src/provider/Layers/ClaudeAdapter.test.ts
• bun run test src/provider/Layers/ProviderService.test.ts
• bun run test src/provider/Layers/ClaudeAdapter.test.ts src/provider/Layers/ProviderService.test.ts -t "captures claude start-session span annotations for resume and cwd inputs|passes Claude resume ids without pinning a stale assistant checkpoint|uses an app-generated Claude session id for fresh sessions|reuses persisted cwd when startSession resumes a claude session without cwd input"
• bun fmt
• bun lint
• bun typecheck

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for any UI changes
• I included a video for animation/interaction changes

Note

Fix Claude session cwd drift by restarting sessions on workspace change and preserving cwd across resumes

• Provider sessions are now restarted when the effective working directory changes between turns; previously the session was reused even if the workspace had changed.
• ProviderService.startSession now falls back to the persisted cwd from an existing session binding when no cwd is provided as input, ensuring resumed sessions use the correct working directory.
• ClaudeAdapter no longer treats transient hook_started, hook_progress, or hook_response session IDs as durable thread identifiers; thread.started events and resume cursor updates are now gated on a durable session ID (e.g. from init).
• Behavioral Change: sessions that previously survived a workspace path change will now be restarted, and the resume cursor is preserved across the restart.

^{Macroscope summarized 11d6b00.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 0830e957-3a5b-46d7-b4cf-e4ab6fed91b6

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch cursor/fix-claude-cwd-resume-0c76

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Potential infinite restart loop when effectiveCwd is undefined
  • Added an effectiveCwd !== undefined guard to the cwdChanged check so that an unresolved workspace (undefined) no longer triggers a spurious restart that would loop indefinitely due to the persisted cwd backfill in ProviderService.

Or push these changes by commenting:

@cursor push 9974bfe8fa

Preview (9974bfe8fa)

diff --git a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts--- a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts+++ b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts@@ -334,7 +334,7 @@
thread.session && thread.session.status !== "stopped" && activeSession ? thread.id : null;
if (existingSessionThreadId) {
const runtimeModeChanged = thread.runtimeMode !== thread.session?.runtimeMode;
- const cwdChanged = effectiveCwd !== activeSession?.cwd;+ const cwdChanged = effectiveCwd !== undefined && effectiveCwd !== activeSession?.cwd;
const sessionModelSwitch =
currentProvider === undefined
? "in-session"

_{You can send follow-ups to the cloud agent here.}

^{Reviewed by Cursor Bugbot for commit fcb4421. Configure here.}

[macroscopeapp]

Approvability

A prior Macroscope approval was dismissed. Re-evaluating 4c5917b…

No code changes detected at 11d6b00. Prior analysis still applies.

Dismissing prior approval to re-evaluate 94af290

Dismissing prior approval to re-evaluate 4c5917b

[juliusmarminge]

Aims to fix#2256

What Changed

• restart provider sessions when a thread's effective workspace cwd changes, so Claude does not keep running in a stale repo root or prior worktree
• backfill the persisted cwd when ProviderService.startSession() resumes an existing Claude session without an explicit cwd
• annotate provider/session start spans with the effective cwd and resume-source decision, and add a dedicated Claude adapter start-session span with the exact launch inputs passed to the Claude SDK
• add regression tests for both workspace-switch restarts and trace-file visibility of Claude cwd/resume inputs
• fix a ProviderService test isolation issue by using a unique thread id for the runtime-persistence assertion, avoiding cross-test reuse of persisted cwd
• stabilize the Claude trace test by switching it from the real file/batch trace sink to an in-memory sink, avoiding CI timeout/flushing variance while still asserting the emitted span attributes

Why

Claude resume state currently reuses persisted session identity independently of workspace selection. That can leave an active Claude session bound to an outdated working directory, or replay a persisted resume cursor without the matching persisted cwd, which makes resume behavior unreliable for worktrees and subdirectory clones. The added span attributes make future regressions diagnosable from local trace files and exported OTEL spans.

Testing

• bun run test src/provider/Layers/ClaudeAdapter.test.ts
• bun run test src/provider/Layers/ProviderService.test.ts
• bun run test src/provider/Layers/ClaudeAdapter.test.ts src/provider/Layers/ProviderService.test.ts -t "captures claude start-session span annotations for resume and cwd inputs|passes Claude resume ids without pinning a stale assistant checkpoint|uses an app-generated Claude session id for fresh sessions|reuses persisted cwd when startSession resumes a claude session without cwd input"
• bun fmt
• bun lint
• bun typecheck

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for any UI changes
• I included a video for animation/interaction changes

Note

Fix Claude session cwd drift by restarting sessions on workspace change and preserving cwd across resumes

• Provider sessions are now restarted when the effective working directory changes between turns; previously the session was reused even if the workspace had changed.
• ProviderService.startSession now falls back to the persisted cwd from an existing session binding when no cwd is provided as input, ensuring resumed sessions use the correct working directory.
• ClaudeAdapter no longer treats transient hook_started, hook_progress, or hook_response session IDs as durable thread identifiers; thread.started events and resume cursor updates are now gated on a durable session ID (e.g. from init).
• Behavioral Change: sessions that previously survived a workspace path change will now be restarted, and the resume cursor is preserved across the restart.

^{Macroscope summarized 11d6b00.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 0830e957-3a5b-46d7-b4cf-e4ab6fed91b6

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch cursor/fix-claude-cwd-resume-0c76

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Potential infinite restart loop when effectiveCwd is undefined
  • Added an effectiveCwd !== undefined guard to the cwdChanged check so that an unresolved workspace (undefined) no longer triggers a spurious restart that would loop indefinitely due to the persisted cwd backfill in ProviderService.

Or push these changes by commenting:

@cursor push 9974bfe8fa

Preview (9974bfe8fa)

diff --git a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts--- a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts+++ b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts@@ -334,7 +334,7 @@
thread.session && thread.session.status !== "stopped" && activeSession ? thread.id : null;
if (existingSessionThreadId) {
const runtimeModeChanged = thread.runtimeMode !== thread.session?.runtimeMode;
- const cwdChanged = effectiveCwd !== activeSession?.cwd;+ const cwdChanged = effectiveCwd !== undefined && effectiveCwd !== activeSession?.cwd;
const sessionModelSwitch =
currentProvider === undefined
? "in-session"

_{You can send follow-ups to the cloud agent here.}

^{Reviewed by Cursor Bugbot for commit fcb4421. Configure here.}

[macroscopeapp]

Approvability

A prior Macroscope approval was dismissed. Re-evaluating 4c5917b…

No code changes detected at 11d6b00. Prior analysis still applies.

Dismissing prior approval to re-evaluate 94af290

Dismissing prior approval to re-evaluate 4c5917b

[juliusmarminge]

Aims to fix#2256

What Changed

• restart provider sessions when a thread's effective workspace cwd changes, so Claude does not keep running in a stale repo root or prior worktree
• backfill the persisted cwd when ProviderService.startSession() resumes an existing Claude session without an explicit cwd
• annotate provider/session start spans with the effective cwd and resume-source decision, and add a dedicated Claude adapter start-session span with the exact launch inputs passed to the Claude SDK
• add regression tests for both workspace-switch restarts and trace-file visibility of Claude cwd/resume inputs
• fix a ProviderService test isolation issue by using a unique thread id for the runtime-persistence assertion, avoiding cross-test reuse of persisted cwd
• stabilize the Claude trace test by switching it from the real file/batch trace sink to an in-memory sink, avoiding CI timeout/flushing variance while still asserting the emitted span attributes

Why

Claude resume state currently reuses persisted session identity independently of workspace selection. That can leave an active Claude session bound to an outdated working directory, or replay a persisted resume cursor without the matching persisted cwd, which makes resume behavior unreliable for worktrees and subdirectory clones. The added span attributes make future regressions diagnosable from local trace files and exported OTEL spans.

Testing

• bun run test src/provider/Layers/ClaudeAdapter.test.ts
• bun run test src/provider/Layers/ProviderService.test.ts
• bun run test src/provider/Layers/ClaudeAdapter.test.ts src/provider/Layers/ProviderService.test.ts -t "captures claude start-session span annotations for resume and cwd inputs|passes Claude resume ids without pinning a stale assistant checkpoint|uses an app-generated Claude session id for fresh sessions|reuses persisted cwd when startSession resumes a claude session without cwd input"
• bun fmt
• bun lint
• bun typecheck

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for any UI changes
• I included a video for animation/interaction changes

Note

Fix Claude session cwd drift by restarting sessions on workspace change and preserving cwd across resumes

• Provider sessions are now restarted when the effective working directory changes between turns; previously the session was reused even if the workspace had changed.
• ProviderService.startSession now falls back to the persisted cwd from an existing session binding when no cwd is provided as input, ensuring resumed sessions use the correct working directory.
• ClaudeAdapter no longer treats transient hook_started, hook_progress, or hook_response session IDs as durable thread identifiers; thread.started events and resume cursor updates are now gated on a durable session ID (e.g. from init).
• Behavioral Change: sessions that previously survived a workspace path change will now be restarted, and the resume cursor is preserved across the restart.

^{Macroscope summarized 11d6b00.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 0830e957-3a5b-46d7-b4cf-e4ab6fed91b6

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch cursor/fix-claude-cwd-resume-0c76

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Potential infinite restart loop when effectiveCwd is undefined
  • Added an effectiveCwd !== undefined guard to the cwdChanged check so that an unresolved workspace (undefined) no longer triggers a spurious restart that would loop indefinitely due to the persisted cwd backfill in ProviderService.

Or push these changes by commenting:

@cursor push 9974bfe8fa

Preview (9974bfe8fa)

diff --git a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts--- a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts+++ b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts@@ -334,7 +334,7 @@
thread.session && thread.session.status !== "stopped" && activeSession ? thread.id : null;
if (existingSessionThreadId) {
const runtimeModeChanged = thread.runtimeMode !== thread.session?.runtimeMode;
- const cwdChanged = effectiveCwd !== activeSession?.cwd;+ const cwdChanged = effectiveCwd !== undefined && effectiveCwd !== activeSession?.cwd;
const sessionModelSwitch =
currentProvider === undefined
? "in-session"

_{You can send follow-ups to the cloud agent here.}

^{Reviewed by Cursor Bugbot for commit fcb4421. Configure here.}

[macroscopeapp]

Approvability

A prior Macroscope approval was dismissed. Re-evaluating 4c5917b…

No code changes detected at 11d6b00. Prior analysis still applies.

Dismissing prior approval to re-evaluate 94af290

Dismissing prior approval to re-evaluate 4c5917b

[juliusmarminge]

Aims to fix#2256

What Changed

• restart provider sessions when a thread's effective workspace cwd changes, so Claude does not keep running in a stale repo root or prior worktree
• backfill the persisted cwd when ProviderService.startSession() resumes an existing Claude session without an explicit cwd
• annotate provider/session start spans with the effective cwd and resume-source decision, and add a dedicated Claude adapter start-session span with the exact launch inputs passed to the Claude SDK
• add regression tests for both workspace-switch restarts and trace-file visibility of Claude cwd/resume inputs
• fix a ProviderService test isolation issue by using a unique thread id for the runtime-persistence assertion, avoiding cross-test reuse of persisted cwd
• stabilize the Claude trace test by switching it from the real file/batch trace sink to an in-memory sink, avoiding CI timeout/flushing variance while still asserting the emitted span attributes

Why

Claude resume state currently reuses persisted session identity independently of workspace selection. That can leave an active Claude session bound to an outdated working directory, or replay a persisted resume cursor without the matching persisted cwd, which makes resume behavior unreliable for worktrees and subdirectory clones. The added span attributes make future regressions diagnosable from local trace files and exported OTEL spans.

Testing

• bun run test src/provider/Layers/ClaudeAdapter.test.ts
• bun run test src/provider/Layers/ProviderService.test.ts
• bun run test src/provider/Layers/ClaudeAdapter.test.ts src/provider/Layers/ProviderService.test.ts -t "captures claude start-session span annotations for resume and cwd inputs|passes Claude resume ids without pinning a stale assistant checkpoint|uses an app-generated Claude session id for fresh sessions|reuses persisted cwd when startSession resumes a claude session without cwd input"
• bun fmt
• bun lint
• bun typecheck

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for any UI changes
• I included a video for animation/interaction changes

Note

Fix Claude session cwd drift by restarting sessions on workspace change and preserving cwd across resumes

• Provider sessions are now restarted when the effective working directory changes between turns; previously the session was reused even if the workspace had changed.
• ProviderService.startSession now falls back to the persisted cwd from an existing session binding when no cwd is provided as input, ensuring resumed sessions use the correct working directory.
• ClaudeAdapter no longer treats transient hook_started, hook_progress, or hook_response session IDs as durable thread identifiers; thread.started events and resume cursor updates are now gated on a durable session ID (e.g. from init).
• Behavioral Change: sessions that previously survived a workspace path change will now be restarted, and the resume cursor is preserved across the restart.

^{Macroscope summarized 11d6b00.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 0830e957-3a5b-46d7-b4cf-e4ab6fed91b6

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch cursor/fix-claude-cwd-resume-0c76

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Potential infinite restart loop when effectiveCwd is undefined
  • Added an effectiveCwd !== undefined guard to the cwdChanged check so that an unresolved workspace (undefined) no longer triggers a spurious restart that would loop indefinitely due to the persisted cwd backfill in ProviderService.

Or push these changes by commenting:

@cursor push 9974bfe8fa

Preview (9974bfe8fa)

diff --git a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts--- a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts+++ b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts@@ -334,7 +334,7 @@
thread.session && thread.session.status !== "stopped" && activeSession ? thread.id : null;
if (existingSessionThreadId) {
const runtimeModeChanged = thread.runtimeMode !== thread.session?.runtimeMode;
- const cwdChanged = effectiveCwd !== activeSession?.cwd;+ const cwdChanged = effectiveCwd !== undefined && effectiveCwd !== activeSession?.cwd;
const sessionModelSwitch =
currentProvider === undefined
? "in-session"

_{You can send follow-ups to the cloud agent here.}

^{Reviewed by Cursor Bugbot for commit fcb4421. Configure here.}

[macroscopeapp]

Approvability

A prior Macroscope approval was dismissed. Re-evaluating 4c5917b…

No code changes detected at 11d6b00. Prior analysis still applies.

Dismissing prior approval to re-evaluate 94af290

Dismissing prior approval to re-evaluate 4c5917b