Kilocode Merge Minimizer

Kilo Merge Minimizer

Use this skill whenever a normal development task touches shared upstream-owned code and includes Kilo-specific behavior, especially for marker cleanup, extraction work, or kilocode_change annotations.

Do not use this skill when all changes are confined to Kilo-owned paths, including packages/kilo-vscode/, packages/kilo-ui/, and paths with kilocode in their name. Those files are not merged from upstream and do not need merge-minimization guidance. If a task also touches shared upstream-owned code, use this skill for the shared portion only.

Do not use this as the primary guide for upstream merge resolution. Upstream merges have their own instructions and should not duplicate that workflow here.

Goal

Minimize Kilo's long-term diff against upstream OpenCode while preserving behavior.

Prefer this shape for Kilo-specific additions:

1. Shared upstream file contains only a minimal hook, import, call, registration, or config entry.
2. Kilo-specific behavior lives in Kilo-owned code.
3. Unavoidable shared-file changes have narrow kilocode_change markers.
4. The annotation checker passes.

For changes to existing upstream behavior, prefer the smallest in-place shared-file diff with narrow markers. Do not move changed upstream logic into Kilo-owned code just to avoid textual conflicts, because that can create harder semantic merge conflicts.

Core Rules

• Use script/check-opencode-annotations.ts as the source of truth for current shared scopes and exempt paths.
• Use script/upstream/fix-kilocode-markers.ts for stale or broad markers, inspecting --dry-run output before applying changes.
• Treat upstream-owned files as shared unless the checker or repo ownership rules exempt them.
• Put Kilo-owned UI, CLI, runtime logic, and tests in Kilo-owned paths where practical.
• Avoid adding Kilo business logic directly to shared files.
• Keep shared-file edits as close as possible to upstream shape.
• Do not change shared files unless the change is required for Kilo functionality, fixes a Kilo bug, or is a minimal targeted upstream-quality fix.
• Do not create a large Kilo-only fork for a general upstream-quality improvement. Prefer a minimal targeted fix, or leave the broader change for upstream.
• Do not duplicate upstream logic unless there is a concrete reason. If duplication is unavoidable, isolate the Kilo delta and keep the upstream dependency obvious.

Shared File Structure

• Do not refactor, rename, split files, or extract helpers in shared files just to improve readability or make Kilo extraction cleaner.
• Avoid structural changes that make upstream behavior harder to compare or hide semantic dependency on upstream code.

Shared File Style

• Preserve upstream formatting and import style in shared files, even when it differs from Kilo style.
• Put Kilo-only imports on separate marked lines instead of reorganizing upstream imports.

Decision Rules

Extract Kilo logic when:

• The change is an additive Kilo feature or integration, not a modification of existing upstream behavior.
• The shared-file change has meaningful Kilo-owned behavior, not just a tiny condition, import, registration, or field.
• The code has loops, branching, error handling, async workflows, storage access, network calls, UI rendering, or telemetry.
• The shared file can become a small orchestrator that calls Kilo helpers.
• The Kilo code is independent enough that extraction will not hide future upstream fixes or behavior changes.

Keep the change inline when:

• The Kilo delta is a single field, import, call, simple condition, or small registry entry.
• Extraction would reshape upstream code more than the Kilo change itself.
• The change modifies an upstream algorithm, ordering, heuristic, control flow, or bug fix.
• Extraction would duplicate upstream logic or hide semantic dependency on upstream behavior.
• The Kilo helper closes over upstream-local state. Keep closure-scoped helpers inline and contiguous in one narrow marker block.
• The shared file owns the only route table, enum, schema, switch, or registry where the hook must exist.
• The change restores upstream shape or removes a stale Kilo divergence.

Always preserve upstream behavior order unless the Kilo behavior change is intentional and tested.

Marker Rules

• Mark only Kilo-specific diff lines in shared upstream files.
• Prefer inline markers for single-line changes: const value = 42 // kilocode_change.
• Use block markers only for adjacent Kilo-specific lines:

// kilocode_change start
registerKiloFeature(app)
// kilocode_change end

• Use the file's native comment style, including JSX block comments inside JSX and # comments for YAML, TOML, and shell.
• Do not add markers in checker-exempt Kilo-owned paths.
• Remove stale markers when upstream already contains the behavior or when touching Kilo-owned files that still have old markers.
• Use // kilocode_change - new file only for unavoidable new Kilo-specific files inside shared upstream paths.

Tests

• Put Kilo-specific CLI/runtime tests in Kilo-owned test paths.
• Move tests out of shared upstream test paths when the behavior under test is Kilo-specific.
• Tests should cover the real failing path, not private or unstable APIs chosen only for convenience.
• Do not add skip gates for required regression coverage.

Verification

After editing shared files or marker comments, run:

bun run script/check-opencode-annotations.ts --worktree

If checking committed PR changes against a non-default comparison base, pass the correct base ref without --worktree:

bun run script/check-opencode-annotations.ts --base <base-ref>

For stale or broad markers in one shared file, inspect the dry run before applying:

bun run script/upstream/fix-kilocode-markers.ts <repo-relative-file> --dry-run

Before finishing, confirm:

• Shared files contain minimal integration points only.
• Kilo logic and tests live in Kilo-owned paths where practical.
• Markers are narrow.
• Stale markers are removed.
• The annotation checker passed, or the reason it could not run is reported.