From ab049fa6dd128d0a22e1b3d3c8a5a2f63e21f90f Mon Sep 17 00:00:00 2001
From: "kiloconnect[bot]" <240665456+kiloconnect[bot]@users.noreply.github.com>
Date: Thu, 7 May 2026 14:37:06 +0000
Subject: [PATCH 1/2] chore(cli): mark editorContext param as kilocode_change
 in system prompt

Add missing kilocode_change marker to the editorContext param in
the environment Effect.fn implementation; the interface signature
already had a marker but the implementation didn't.
---
 packages/opencode/src/session/system.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/opencode/src/session/system.ts b/packages/opencode/src/session/system.ts
index 64a5446e6eb..01ab642d09f 100644
--- a/packages/opencode/src/session/system.ts
+++ b/packages/opencode/src/session/system.ts
@@ -92,7 +92,10 @@ export const layer = Layer.effect(
     const skill = yield* Skill.Service
 
     return Service.of({
-      environment: Effect.fn("SystemPrompt.environment")(function* (model: Provider.Model, editorContext?: EditorContext) {
+      environment: Effect.fn("SystemPrompt.environment")(function* (
+        model: Provider.Model,
+        editorContext?: EditorContext, // kilocode_change
+      ) {
         const ctx = yield* InstanceState.context
         return [
           [

From 2f2e92b223f91975945fed79e8753ea339307e84 Mon Sep 17 00:00:00 2001
From: "kiloconnect[bot]" <240665456+kiloconnect[bot]@users.noreply.github.com>
Date: Thu, 7 May 2026 14:40:40 +0000
Subject: [PATCH 2/2] fix(cli): wrap signature in kilocode_change block markers

---
 packages/opencode/src/session/system.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/opencode/src/session/system.ts b/packages/opencode/src/session/system.ts
index 01ab642d09f..f41e8980b54 100644
--- a/packages/opencode/src/session/system.ts
+++ b/packages/opencode/src/session/system.ts
@@ -92,10 +92,12 @@ export const layer = Layer.effect(
     const skill = yield* Skill.Service
 
     return Service.of({
+      // kilocode_change start
       environment: Effect.fn("SystemPrompt.environment")(function* (
         model: Provider.Model,
-        editorContext?: EditorContext, // kilocode_change
+        editorContext?: EditorContext,
       ) {
+        // kilocode_change end
         const ctx = yield* InstanceState.context
         return [
           [