Files
openchamber/packages/vscode/src/bridge.ts
T
Islam NoflandBohdan Triapitsyn 21253d7fc2 feat: fork-aware issue/PR listing & OpenCode startup loading indicator (#1061)
* Add design spec: OpenCode readiness loading indicator

* Add implementation plan: OpenCode readiness loading indicator

* feat: add useOpenCodeReadiness hook

* feat: add i18n keys for common.loading

* feat: add loading state to ModelSelector

* feat: add loading state to AgentSelector

* feat: add loading state to ModelControls chat selectors

* update package-lock

* feat(github): add shared fork detection utility

* feat(github): make issue listing fork-aware

* feat(github): make PR listing fork-aware

* feat(types): add sourceRepo to issue/PR summary types

* feat(ui): add source badges to GitHub integration dialog

* feat(ui): add source badges to issue/PR picker dialogs

* feat(github): pass headRemote in PR creation for fork support

* feat(ui): add source→target label in PR tab for fork workflows

* fix(github): allow PR section on base branch when upstream remote exists

* fix(github): show PR section on any branch including main for fork→upstream PRs

* fix(github): allow PullRequestSection to render on base branch when upstream remote exists

* feat(github): auto-detect upstream repo for fork→upstream PR creation

- Add GET /api/github/repo/upstream endpoint to discover fork's upstream
- Fix PullRequestSection canShow to allow PR creation on base branch when repo is a fork
- Add virtual upstream target in remote dropdown (no explicit upstream remote needed)
- Add targetRepo parameter to /api/github/pr/create for direct upstream targeting
- Add repoUpstream() API client method and GitHubRepoUpstreamResult type

* feat(github): auto-detect upstream repo for fork→upstream PR creation

- Add GET /api/github/repo/upstream endpoint to discover fork's upstream
- Fix PullRequestSection canShow to allow PR creation on base branch when repo is a fork
- Add virtual upstream target in remote dropdown (no explicit upstream remote needed)
- Add targetRepo parameter to /api/github/pr/create for direct upstream targeting
- Add repoUpstream() API client method and GitHubRepoUpstreamResult type

* fix: complete fork→upstream PR workflow

- Server: return defaultBranch from /api/github/repo/upstream endpoint
- Server: fix cross-repo head ref construction (compare repos, not remote names)
- Server: filterActiveRemoteBranches checks all remotes, not just origin
- UI: set targetBaseBranch to upstream's default branch when using detected upstream
- UI: include all remote branches in base branch dropdown when using detected upstream
- UI: skip base===head check for cross-repo PRs (same branch name on different repos is valid)
- Types: add defaultBranch to GitHubRepoUpstreamResult

* chore: delete superpowers folder

* feat: add (local)/(remote) labels to PR branch display and adapt Repository button to selected remote

* feat: Repository button adapts to selected remote (upstream vs origin)

* fix: complete fork→upstream PR feature gaps

Server:
- Extend /api/github/repo/upstream to return defaultBranchSha and remoteName
- Reuse headRepo result instead of redundant resolveGitHubRepoFromDirectory call
- Return clear error when headRepo is null (invalid GitHub URL)

UI:
- Add upstream's default branch to availableBaseBranches when using detected upstream
- Use upstream's default branch SHA in git log for generate description (fixes 'No commits found in range main...main')
- Show qualified names (owner/repo · branch) in base branch dropdown when using detected upstream

Types:
- Add defaultBranchSha and remoteName to GitHubRepoUpstreamResult

* fix: move detectedUpstream state before availableBaseBranches to fix temporal dead zone

* fix: fetch upstream branches from GitHub API for base branch dropdown

- Add GET /api/github/repo/branches endpoint to fetch branches via Octokit
- Add repoBranches() to GitHub API client and interface
- Fetch upstream branches on detection and store in upstreamBranches state
- Include upstreamBranches in availableBaseBranches when using detected upstream
- Re-add availableBaseBranches memo and auto-correction effect that were lost
- Remove unnecessary qualified names from dropdown (upstream is already selected)

* fix: restore prStatusKey and statusEntry declarations lost during refactor

* fix: cleanly re-apply all fork→upstream PR UI changes

Restored PullRequestSection.tsx from clean base and re-applied:
- Expand detectedUpstream type with defaultBranch, defaultBranchSha, remoteName
- Add upstreamBranches state and fetch on upstream detection
- Include upstream branches in availableBaseBranches when using detected upstream
- Use upstream default branch SHA in generate description (fixes 'No commits found')
- Adapt Repository button URL to selected remote
- Add (local)/(remote)/(upstream) labels to branch display

* fix: move detectedUpstream/upstreamBranches before availableBaseBranches to fix TDZ

* style: add pill badge styling to upstream repo source labels

* fix: don't cache error PR status responses, allow force-bypass of server cache

* fix: resolve PR status cache bugs, stale directory fallback, and upstream re-detection

* fix: keep collapse button visible when scrolling long user messages

- Collapse button now sticks to top of scrollable user message content instead of scrolling away

* fix: checkbox focus ring blends into sidebar background

* fix: polish fork PR follow-ups

* fix: remove user message collapse artifact

* fix: tighten fork PR internals

* fix: check all remotes for fork PR status

* fix: recover sidebar PR status misses

---------

Signed-off-by: Islam Nofl <islamnofl.official@gmail.com>
Co-authored-by: Bohdan Triapitsyn <artmore@protonmail.com>
2026-04-29 12:03:39 +03:00

169 lines
4.8 KiB
TypeScript

import * as vscode from 'vscode';
import { type OpenCodeManager } from './opencode';
import { handleStandardGitBridgeMessage } from './bridge-git-runtime';
import { handleSpecialGitBridgeMessage } from './bridge-git-special-runtime';
import { handleFsBridgeMessage } from './bridge-fs-runtime';
import { handleConfigBridgeMessage } from './bridge-config-runtime';
import { handleSystemBridgeMessage } from './bridge-system-runtime';
import { handleProxyBridgeMessage } from './bridge-proxy-runtime';
import {
fetchOpenCodeSkillsFromApi,
persistSettings,
readSettings,
readMagicPromptOverrides,
saveMagicPromptOverride,
resetMagicPromptOverride,
resetAllMagicPromptOverrides,
} from './bridge-settings-runtime';
import { execGit } from './bridge-git-process-runtime';
import {
parseDroppedFileReference,
readUriAsAttachment,
resolveUserPath,
listDirectoryEntries,
normalizeFsPath,
searchDirectory,
resolveFileReadPath,
fetchModelsMetadata,
} from './bridge-fs-helpers-runtime';
import {
tryHandleLocalFsProxy,
buildUnavailableApiResponse,
sanitizeForwardHeaders,
collectHeaders,
base64EncodeUtf8,
} from './bridge-localfs-proxy-runtime';
export interface BridgeRequest {
id: string;
type: string;
payload?: unknown;
}
export interface BridgeResponse {
id: string;
type: string;
success: boolean;
data?: unknown;
error?: string;
}
export interface BridgeContext {
manager?: OpenCodeManager;
context?: vscode.ExtensionContext;
}
const CLIENT_RELOAD_DELAY_MS = 800;
const UPDATE_CHECK_URL = process.env.OPENCHAMBER_UPDATE_API_URL || 'https://api.openchamber.dev/v1/update/check';
const GITHUB_BACKEND_DISABLED_ERROR = 'OpenChamber VS Code backend GitHub integration is disabled. Use native VS Code GitHub integrations.';
export async function handleBridgeMessage(message: BridgeRequest, ctx?: BridgeContext): Promise<BridgeResponse> {
const { id, type, payload } = message;
try {
const standardGitResponse = await handleStandardGitBridgeMessage({ id, type, payload });
if (standardGitResponse) {
return standardGitResponse;
}
const specialGitResponse = await handleSpecialGitBridgeMessage(
{ id, type, payload },
ctx,
{ readSettings, execGit }
);
if (specialGitResponse) {
return specialGitResponse;
}
const fsResponse = await handleFsBridgeMessage(
{ id, type, payload },
{
resolveUserPath,
listDirectoryEntries,
normalizeFsPath,
execGit,
searchDirectory,
resolveFileReadPath,
parseDroppedFileReference,
readUriAsAttachment,
}
);
if (fsResponse) {
return fsResponse;
}
const configResponse = await handleConfigBridgeMessage(
{ id, type, payload },
ctx,
{
readSettings,
persistSettings,
readMagicPromptOverrides,
saveMagicPromptOverride,
resetMagicPromptOverride,
resetAllMagicPromptOverrides,
fetchOpenCodeSkillsFromApi,
clientReloadDelayMs: CLIENT_RELOAD_DELAY_MS,
},
);
if (configResponse) {
return configResponse;
}
const systemResponse = await handleSystemBridgeMessage(
{ id, type, payload },
ctx,
{
resolveUserPath,
fetchModelsMetadata,
updateCheckUrl: UPDATE_CHECK_URL,
clientReloadDelayMs: CLIENT_RELOAD_DELAY_MS,
},
);
if (systemResponse) {
return systemResponse;
}
const proxyResponse = await handleProxyBridgeMessage(
{ id, type, payload },
ctx,
{
tryHandleLocalFsProxy,
buildUnavailableApiResponse,
sanitizeForwardHeaders,
collectHeaders,
base64EncodeUtf8,
},
);
if (proxyResponse) {
return proxyResponse;
}
switch (type) {
case 'api:github/auth:status':
case 'api:github/auth:start':
case 'api:github/auth:complete':
case 'api:github/auth:disconnect':
case 'api:github/auth:activate':
case 'api:github/me':
case 'api:github/pr:status':
case 'api:github/pr:create':
case 'api:github/pr:update':
case 'api:github/pr:merge':
case 'api:github/pr:ready':
case 'api:github/issues:list':
case 'api:github/issues:get':
case 'api:github/issues:comments':
case 'api:github/pulls:list':
case 'api:github/pulls:context':
case 'api:github/repo:upstream':
case 'api:github/repo:branches': {
return { id, type, success: false, error: GITHUB_BACKEND_DISABLED_ERROR };
}
default:
return { id, type, success: false, error: `Unknown message type: ${type}` };
}
} catch (err) {
const errorMessage = err instanceof Error ? err.message : String(err);
return { id, type, success: false, error: errorMessage };
}
}