diff --git a/.github/workflows/test-vscode.yml b/.github/workflows/test-vscode.yml
index e662c784692..272879f2e0b 100644
--- a/.github/workflows/test-vscode.yml
+++ b/.github/workflows/test-vscode.yml
@@ -44,12 +44,5 @@ jobs:
         run: bun run knip
 
       - name: Check for kilocode_change markers
-        run: |
-          if grep -r --include='*' -l 'kilocode_change' packages/kilo-vscode/ packages/kilo-ui/; then
-            echo ""
-            echo "ERROR: Found 'kilocode_change' markers in kilo-specific packages."
-            echo "These packages are entirely Kilo Code additions and do not need kilocode_change markers."
-            echo "Please remove them from the files listed above."
-            exit 1
-          fi
-          echo "No kilocode_change markers found. All clear."
+        working-directory: packages/kilo-vscode
+        run: bun run check-kilocode-change
diff --git a/AGENTS.md b/AGENTS.md
index c0262af58b8..64e41fc7f54 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -15,6 +15,7 @@ Kilo CLI is an open source AI coding agent that generates code from natural lang
 - **Single test**: `bun test test/tool/tool.test.ts` from `packages/opencode/`
 - **SDK regen**: After changing server endpoints in `packages/opencode/src/server/`, run `./script/generate.ts` from root to regenerate `packages/sdk/js/`
 - **Knip** (unused exports): `bun run knip` from `packages/kilo-vscode/`. CI runs this — all exported types/functions must be imported somewhere. Remove or unexport unused exports before pushing.
+- **kilocode_change check**: `bun run check-kilocode-change` from `packages/kilo-vscode/`. CI runs this — `kilocode_change` is a marker for upstream merge conflicts and must not appear in `packages/kilo-vscode/` or `packages/kilo-ui/` (these are entirely Kilo Code additions). Remove the markers before pushing.
 
 ## Products
 
diff --git a/packages/kilo-vscode/package.json b/packages/kilo-vscode/package.json
index e6325d4377b..60c6cd27e50 100644
--- a/packages/kilo-vscode/package.json
+++ b/packages/kilo-vscode/package.json
@@ -708,6 +708,7 @@
     "format": "prettier --write .",
     "format:check": "prettier --check .",
     "knip": "knip",
+    "check-kilocode-change": "! grep -r -l 'kilocode_change' . ../kilo-ui/ --exclude='package.json' --exclude='*.md'",
     "lint": "eslint src webview-ui",
     "test": "vscode-test",
     "test:unit": "bun test tests/unit/",