diff --git a/pkg/agentic/plan_from_issue.go b/pkg/agentic/plan_from_issue.go
index 82f884c..63bd27a 100644
--- a/pkg/agentic/plan_from_issue.go
+++ b/pkg/agentic/plan_from_issue.go
@@ -80,13 +80,15 @@ func (s *PrepSubsystem) planFromIssue(ctx context.Context, _ *mcp.CallToolReques
 		Objective:   objective,
 		Description: description,
 		Context: map[string]any{
-			"source_issue":        issueOutput.Issue,
-			"source_issue_id":     issueOutput.Issue.ID,
-			"source_issue_slug":   issueOutput.Issue.Slug,
-			"source_issue_type":   issueOutput.Issue.Type,
-			"source_issue_labels": issueOutput.Issue.Labels,
-			"source_issue_state":  issueOutput.Issue.Status,
-			"source_issue_meta":   issueOutput.Issue.Metadata,
+			"source_issue":          issueOutput.Issue,
+			"source_issue_id":       issueOutput.Issue.ID,
+			"source_issue_slug":     issueOutput.Issue.Slug,
+			"source_issue_type":     issueOutput.Issue.Type,
+			"source_issue_labels":   issueOutput.Issue.Labels,
+			"source_issue_status":   issueOutput.Issue.Status,
+			"source_issue_metadata": issueOutput.Issue.Metadata,
+			"source_issue_state":    issueOutput.Issue.Status,
+			"source_issue_meta":     issueOutput.Issue.Metadata,
 		},
 		Phases: []Phase{
 			{
diff --git a/pkg/agentic/plan_from_issue_test.go b/pkg/agentic/plan_from_issue_test.go
index 97bdb63..07f2743 100644
--- a/pkg/agentic/plan_from_issue_test.go
+++ b/pkg/agentic/plan_from_issue_test.go
@@ -46,6 +46,8 @@ func TestPlanFromIssue_PlanFromIssue_Good(t *testing.T) {
 	require.NoError(t, err)
 	assert.Equal(t, output.Plan.Slug, plan.Slug)
 	assert.Equal(t, output.Issue.Slug, plan.Context["source_issue_slug"])
+	assert.Equal(t, output.Issue.Status, plan.Context["source_issue_status"])
+	assert.Equal(t, output.Issue.Metadata, plan.Context["source_issue_metadata"])
 	require.Len(t, plan.Phases, 1)
 	require.Len(t, plan.Phases[0].Tasks, 1)
 	assert.Equal(t, "Keep CLI output stable", plan.Phases[0].Tasks[0].Title)