Skip to content

milestone: integrate M1+M2 changes to unblock merge order#2123

Open
SupenBysz wants to merge 9 commits intocode-yeongyu:devfrom
SupenBysz:integration/m1-m2-local
Open

milestone: integrate M1+M2 changes to unblock merge order#2123
SupenBysz wants to merge 9 commits intocode-yeongyu:devfrom
SupenBysz:integration/m1-m2-local

Conversation

@SupenBysz
Copy link

@SupenBysz SupenBysz commented Feb 26, 2026

Purpose

This PR provides a single integrated branch containing both M1 and M2 deliverables to avoid merge-order blocking.

Includes

Merge Strategy

Verification

  • bun test src/shared/model-error-classifier.test.ts src/hooks/model-fallback/hook.test.ts src/plugin/event.model-fallback.test.ts src/cli/model-fallback.test.ts src/hooks/session-notification.test.ts src/hooks/session-notification-input-needed.test.ts src/plugin/tool-execute-before-session-notification.test.ts src/cli/mcp-oauth/login.test.ts src/plugin-config.test.ts src/plugin/hooks/create-transform-hooks.test.ts src/features/claude-code-plugin-loader/discovery.test.ts
  • bun run typecheck
  • bun run build

Result:

  • tests: 87 pass / 0 fail
  • typecheck: pass
  • build: pass

Notes


Summary by cubic

Integrates M1 regression stabilization and M2 injection/loader updates into one branch to unblock merge sequencing. Stabilizes model fallback and session notifications, and adds a context-injection toggle plus a managed default plugin when no DB exists.

  • New Features

    • Add default_injection_toggle to config and gate the context-injector hook (defaults to on).
    • Inject a managed builtin plugin when installed_plugins.json is missing in the Claude plugin loader; discovery tests added.
    • Add milestone-aligned delivery docs synced with the GitLab ktai roadmap.
  • Bug Fixes

    • Make model fallback provider selection deterministic by preferring the current provider when available.
    • Fix session-notification command finder to clear pending state and avoid cross-test leakage; tighten return typing.
    • Ensure spy cleanup in the session-notification tool execution test.

Written for commit 8610160. Summary will update on new commits.

SupenBysz and others added 9 commits February 26, 2026 04:42
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
Copy link

@cubic-dev-ai cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No issues found across 13 files

Confidence score: 5/5

  • Automated review surfaced no issues in the provided summaries.
  • No files require special attention.

Requires human review: Logic changes in model fallback selection and plugin discovery (M2) introduce new behaviors that, while intended to stabilize, carry inherent risk under '100% sure no regressions' criteria.

@SupenBysz
Copy link
Author

Milestone execution status:

  • This integrated PR now has all checks green (cla / GitGuardian / cubic).
  • It contains both M1 + M2 deliverables and is ready to merge.
  • Merge attempt from this account is blocked by repository permission (MergePullRequest denied).

Maintainer action:

  1. Merge milestone: integrate M1+M2 changes to unblock merge order #2123 into dev
  2. Trigger M3 closure verification on dev using:
    • bun test src/shared/model-error-classifier.test.ts src/hooks/model-fallback/hook.test.ts src/plugin/event.model-fallback.test.ts src/cli/model-fallback.test.ts src/hooks/session-notification.test.ts src/hooks/session-notification-input-needed.test.ts src/plugin/tool-execute-before-session-notification.test.ts src/cli/mcp-oauth/login.test.ts src/plugin-config.test.ts src/plugin/hooks/create-transform-hooks.test.ts src/features/claude-code-plugin-loader/discovery.test.ts
    • bun run typecheck
    • bun run build

I can run and post the M3 closure report immediately after merge.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

1 participant