[BUG] Nested skills dont return to invoking skill context on finishing but to main context

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?

When invoking a skill from another skill the workflow execution from the invoking (main) skill is discontinued.

I have experimented with this behavior and used the new context: fork and agent: with the nested skill to define a different model (Haiku) for the invoked skill. The main skill was invoked with a command and a different model (Sonnet). After the skill finished, the session returned to the main context (Opus). This also happens without the context forking.

A skill with a workflow that delegates a task to another skill (forked or not) cannot continue the workflow. Manually asking to continue it shows that Opus is used (Strg + O/E).

The invoked skill did not contain directives to finish or create a report or something similar.

What Should Happen?

The execution should return to the skill and not the main session. If the behavior is intended, the limitations of context nesting should be documented.

Error Messages/Logs

Steps to Reproduce

1. Create a skill that invokes another skill explicitly (Skill(...)).
2. Create a command with a different model than the main session that invokes the main skill explicitly.
3. Run the command and observe the used model in the session transcript

Claude Model

Not sure / Multiple models

Is this a regression?

I don't know

Last Working Version

_No response_

Claude Code Version

2.1.3

Platform

Anthropic API

Operating System

macOS

Terminal/Shell

iTerm2

Additional Information

_No response_