fix(plugin): keep configured copilot auth during syncs

kiennq · github-actions[bot] · commit d739a1a46744 · 2026-03-14T02:07:08.000Z
diff --git a/.opencode/skill/sync-to-upstream/SKILL.md b/.opencode/skill/sync-to-upstream/SKILL.md
@@ -1,108 +1,56 @@
 ---
 name: sync-to-upstream
-description: Use this when rebasing the fork's dev branch onto upstream/dev. Covers fetching, rebasing, conflict resolution strategy, and force-pushing. Applies to the kiennq/opencode fork tracking anomalyco/opencode.
+description: Use when syncing this fork's dev branch with upstream/dev, especially when rebasing, resolving conflicts, or updating the fork after rewritten history.
 ---
 
-## Use this when
+# Sync To Upstream
 
-- User asks to rebase on upstream, sync with upstream, or pull upstream changes
-- Resolving conflicts during rebase onto upstream/dev
+## Overview
 
-## Prerequisites
-
-- Remotes: `origin` = `kiennq/opencode`, `upstream` = `anomalyco/opencode`
-- Default branch: `dev` (not main/master)
-- Working tree must be clean before rebasing
-
-## Workflow
-
-### 1. Fetch and assess
-
-```bash
-git fetch origin --quiet && git fetch upstream --quiet
-git log --oneline dev..upstream/dev          # count new commits
-git log --oneline --stat dev..upstream/dev -- packages/opencode/  # check for conflict-prone files
-```
-
-### 2. Ensure local dev is on top of origin/dev
-
-Before rebasing onto upstream, make sure local `dev` includes all commits from `origin/dev`.
-This prevents losing any commits pushed to the fork from other machines or collaborators.
-
-```bash
-# If local dev is behind origin/dev, fast-forward first
-git merge-base --is-ancestor origin/dev dev || git rebase origin/dev
-```
+Sync upstream carefully, keep intentional fork behavior, and avoid carrying forward one-off conflict notes that no longer generalize.
 
-If `origin/dev` has diverged (e.g. after a previous force-push from another machine), reset:
+## When to Use
 
-```bash
-git reset --hard origin/dev
-```
+- Rebasing `dev` onto `upstream/dev`
+- Resolving conflicts during an upstream sync
+- Updating `origin/dev` after a rebase
 
-### 3. Rebase onto upstream
-
-```bash
-git rebase upstream/dev
-```
-
-### 4. Resolve conflicts (if any)
-
-Known conflict-prone areas and resolution strategy:
-
-| File                                         | Our fork changes                                                         | Resolution strategy                                                                                                                   |
-| -------------------------------------------- | ------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------- |
-| `src/pty/index.ts`                           | Buffer chunk optimization (bufferChunks/bufferSize)                      | **Take upstream** — their cursor-based reconnection system is more important; our chunk approach is incompatible with cursor tracking |
-| `src/config/config.ts`                       | Shell metadata, attach env fields                                        | **Merge both** — keep upstream's new fields AND our additions                                                                         |
-| `src/session/index.ts`                       | FileTime import, offset pagination, session list merge                   | **Merge both** — keep all imports from both sides                                                                                     |
-| `src/cli/cmd/tui/component/dialog-model.tsx` | Lazy DialogProvider import, PROVIDER_PRIORITY, popularProvidersList memo | **Take ours** for `popularProvidersList()` since `createDialogProviderOptions` isn't imported in our lazy-import version              |
-| `src/provider/transform.ts`                  | Expanded Anthropic detection, whitespace trim                            | **Merge both** — our detection expansions layer on top of upstream                                                                    |
-| `src/tool/bash.ts`                           | Ring buffer (10MB cap)                                                   | **Take ours** if upstream still uses simple approach; watch for upstream ring buffer adoption                                         |
-| `src/question/index.ts`                      | Timeout + rejected event                                                 | **Take ours** if upstream removed timeouts                                                                                            |
-
-General conflict resolution rules:
-
-- **Imports**: Keep all imports from both sides; remove duplicates
-- **Config schema fields**: Keep both upstream's new fields AND our additions
-- **Core algorithms** (buffer, compaction overflow): Prefer upstream's approach if architecturally different, then layer our custom config options as early-exit checks
-- **UI components**: Keep our lazy imports and memo patterns; use upstream's refactored component structure
-
-### 5. After resolving each file
+## Prerequisites
 
-```bash
-git add <resolved-files>
-git rebase --continue
-```
+- Working tree is clean
+- Remotes are correct
+- Local `dev` includes the latest `origin/dev` commits before rebasing onto upstream
 
-### 6. Verify and push
+## Workflow
 
-```bash
-git log --oneline -5                                    # verify history looks correct
-git push origin dev --force-with-lease --no-verify      # force push
-```
+1. Fetch `origin` and `upstream`.
+2. Make sure local `dev` is current with `origin/dev` so fork commits are not lost.
+3. Rebase onto `upstream/dev`.
+4. Resolve conflicts by taking upstream structure where it replaces old implementation details, then re-apply any intentional fork behavior that still matters.
+5. Verify the result and push with `--force-with-lease` if the rebase rewrote history.
 
-If push fails with "stale info" (GitHub 500 during previous push):
+## Conflict Guidance
 
-```bash
-git fetch origin dev --quiet && git push origin dev --force-with-lease --no-verify
-```
+- Keep both sides when upstream and fork changes are independent.
+- Prefer upstream for broad architectural rewrites, then layer back fork-specific behavior only where it is still required.
+- Preserve intentional fork behavior that affects user configuration or supported workflows.
 
-### 7. Post-rebase checks
+## Fork Decisions To Preserve
 
-- New `.yml` workflow files from upstream need renaming to `.yml.disabled` (we disable upstream CI)
-- Pre-push hook may fail on `@opencode-ai/desktop` typecheck due to missing `@tauri-apps/plugin-clipboard-manager` — use `--no-verify` to bypass
+- Configured `copilot-auth` plugins must remain allowed after upstream syncs.
+- Do not reintroduce logic that filters, skips, or blocks user-configured `copilot-auth` plugins during plugin loading.
 
-## Our fork's additions (must preserve)
+## Verification
 
-- **Persistent shell** — Windows native routing, shell metadata in bash tool output
-- **Attach env propagation** — `x-opencode-env` header, compressed fallback env in attach/server/pty paths
-- **Offset pagination** — `session list` API supports `before` cursor for incremental timeline loading
-- **TUI prompt fixes** — leader-key guard on history navigation, leader-down session shortcut
+- Confirm there are no remaining conflict markers.
+- Review recent history and the final diff for accidental drops.
+- Run the most relevant targeted verification for any behavior touched during conflict resolution.
 
-## Quick checklist
+## Quick Checklist
 
-- [ ] Working tree clean before rebase
-- [ ] Fetched both origin and upstream
-- [ ] No conflict markers remain after resolution (`rg "<<<<<<|======|>>>>>>"`)
-- [ ] Force push with `--force-with-lease --no-verify`
-- [ ] Check for new upstream workflow files to disable
+- [ ] Working tree clean
+- [ ] Fetched `origin` and `upstream`
+- [ ] Local `dev` includes `origin/dev`
+- [ ] No conflict markers remain
+- [ ] Targeted verification completed
+- [ ] Used `--force-with-lease` only when needed
diff --git a/packages/opencode/src/plugin/index.ts b/packages/opencode/src/plugin/index.ts
@@ -64,7 +64,7 @@ export namespace Plugin {
 
       for (let plugin of plugins) {
         // ignore old codex plugin since it is supported first party now
-        if (plugin.includes("opencode-openai-codex-auth") || plugin.includes("opencode-copilot-auth")) continue
+        if (plugin.includes("opencode-openai-codex-auth")) continue
         log.info("loading plugin", { path: plugin })
         if (!plugin.startsWith("file://")) {
           // For git URLs (github:, git+, git://), don't parse @version - use full URL as package name
