From 9ab250839466311edf864001bb08bc9b0f1dd4c9 Mon Sep 17 00:00:00 2001 From: "claude[bot]" <209825114+claude[bot]@users.noreply.github.com> Date: Thu, 2 Oct 2025 21:57:45 +0000 Subject: [PATCH 01/12] feat: implement module system for pluggable integrations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add module interface system with HomeTab, Worker, and Orchestrator hooks - Create GitHub module with isEnabled check based on GITHUB_CLIENT_ID - Move GitHub-related code from core services to dedicated module: * Home tab rendering and repository management * Worker lifecycle hooks and environment variables * Orchestrator env var injection for GitHub tokens - Reduce core service complexity by ~300 lines of GitHub-specific code - Enable pluggable architecture for future integrations 🤖 Generated with [Claude Code](https://claude.ai/code) Co-authored-by: Burak Emre Kabakcı --- modules/github/handlers.ts | 135 ++++++++ modules/github/index.ts | 178 ++++++++++ modules/github/repository-manager.ts | 322 ++++++++++++++++++ modules/github/utils.ts | 11 + modules/github/workspace.ts | 274 +++++++++++++++ modules/index.ts | 46 +++ modules/types.ts | 52 +++ packages/dispatcher/src/index.ts | 9 + .../src/slack/handlers/action-handler.ts | 211 ++---------- .../src/base/BaseDeploymentManager.ts | 8 + packages/orchestrator/src/index.ts | 10 + .../orchestrator/src/module-integration.ts | 18 + packages/worker/src/index.ts | 8 + packages/worker/src/module-integration.ts | 49 +++ 14 files changed, 1139 insertions(+), 192 deletions(-) create mode 100644 modules/github/handlers.ts create mode 100644 modules/github/index.ts create mode 100644 modules/github/repository-manager.ts create mode 100644 modules/github/utils.ts create mode 100644 modules/github/workspace.ts create mode 100644 modules/index.ts create mode 100644 modules/types.ts create mode 100644 packages/orchestrator/src/module-integration.ts create mode 100644 packages/worker/src/module-integration.ts diff --git a/modules/github/handlers.ts b/modules/github/handlers.ts new file mode 100644 index 00000000..0a388989 --- /dev/null +++ b/modules/github/handlers.ts @@ -0,0 +1,135 @@ +import { createLogger } from "@peerbot/shared"; +import { getDbPool } from "@peerbot/shared"; + +const logger = createLogger("github-module"); +import { decrypt } from "@peerbot/shared"; +import { generateGitHubAuthUrl } from "./utils"; + +/** + * Handle GitHub connect action - initiates OAuth flow + */ +export async function handleGitHubConnect( + userId: string, + channelId: string, + client: any +): Promise { + try { + // Generate OAuth URL with user ID + const authUrl = generateGitHubAuthUrl(userId); + + await client.chat.postMessage({ + channel: channelId, + blocks: [ + { + type: "section", + text: { + type: "mrkdwn", + text: "🔗 *Connect your GitHub account*\n\nClick the link below to authorize Peerbot to access your GitHub repositories:", + }, + }, + { + type: "section", + text: { + type: "mrkdwn", + text: `<${authUrl}|Connect with GitHub>`, + }, + }, + { + type: "context", + elements: [ + { + type: "mrkdwn", + text: "🔒 We'll only access repositories you explicitly grant permission to", + }, + ], + }, + ], + }); + + logger.info(`GitHub connect initiated for user ${userId}`); + } catch (error) { + logger.error("Failed to initiate GitHub connect:", error); + await client.chat.postMessage({ + channel: channelId, + text: "Failed to generate GitHub login link. Please try again.", + }); + } +} + +/** + * Handle GitHub logout + */ +export async function handleGitHubLogout( + userId: string, + client: any +): Promise { + try { + const dbPool = getDbPool(process.env.DATABASE_URL!); + + // Remove GitHub token and username from database + await dbPool.query( + `DELETE FROM user_environ + WHERE user_id = (SELECT id FROM users WHERE platform = 'slack' AND platform_user_id = $1) + AND name IN ('GITHUB_TOKEN', 'GITHUB_USER')`, + [userId.toUpperCase()] + ); + + logger.info(`GitHub logout completed for user ${userId}`); + + // Send confirmation + const im = await client.conversations.open({ users: userId }); + if (im.channel?.id) { + await client.chat.postMessage({ + channel: im.channel.id, + text: "✅ Successfully logged out from GitHub", + }); + } + } catch (error) { + logger.error(`Failed to logout user ${userId}:`, error); + } +} + +/** + * Get user's GitHub info from database + */ +export async function getUserGitHubInfo(userId: string): Promise<{ + token: string | null; + username: string | null; +}> { + try { + const dbPool = getDbPool(process.env.DATABASE_URL!); + + const result = await dbPool.query( + `SELECT name, value + FROM user_environ + WHERE user_id = (SELECT id FROM users WHERE platform = 'slack' AND platform_user_id = $1) + AND name IN ('GITHUB_TOKEN', 'GITHUB_USER')`, + [userId.toUpperCase()] + ); + + let token = null; + let username = null; + + for (const row of result.rows) { + if (row.name === "GITHUB_TOKEN") { + try { + // Token is encrypted, decrypt it + token = decrypt(row.value); + } catch (error) { + logger.error( + `Failed to decrypt GitHub token for user ${userId}:`, + error + ); + token = null; + } + } else if (row.name === "GITHUB_USER") { + username = row.value; + } + } + + return { token, username }; + } catch (error) { + logger.error(`Failed to get GitHub info for user ${userId}:`, error); + return { token: null, username: null }; + } +} \ No newline at end of file diff --git a/modules/github/index.ts b/modules/github/index.ts new file mode 100644 index 00000000..300b23c1 --- /dev/null +++ b/modules/github/index.ts @@ -0,0 +1,178 @@ +import type { HomeTabModule, WorkerModule, OrchestratorModule, SessionContext, ActionButton } from '../types'; +import { GitHubRepositoryManager } from './repository-manager'; +import { handleGitHubConnect, handleGitHubLogout, getUserGitHubInfo } from './handlers'; +import { generateGitHubAuthUrl } from './utils'; + +export class GitHubModule implements HomeTabModule, WorkerModule, OrchestratorModule { + name = 'github'; + private repoManager?: GitHubRepositoryManager; + + isEnabled(): boolean { + return !!(process.env.GITHUB_CLIENT_ID && process.env.GITHUB_CLIENT_SECRET); + } + + async init(): Promise { + if (!this.isEnabled()) return; + + this.repoManager = new GitHubRepositoryManager( + { + token: process.env.GITHUB_TOKEN || '', + organization: process.env.GITHUB_ORGANIZATION || '', + repository: process.env.GITHUB_REPOSITORY, + clientId: process.env.GITHUB_CLIENT_ID!, + clientSecret: process.env.GITHUB_CLIENT_SECRET!, + ingressUrl: process.env.INGRESS_URL, + }, + process.env.DATABASE_URL + ); + } + + async renderHomeTab(userId: string): Promise { + if (!this.repoManager) return []; + + const { token, username } = await getUserGitHubInfo(userId); + const isGitHubConnected = !!token; + + if (!isGitHubConnected) { + const authUrl = generateGitHubAuthUrl(userId); + return [ + { + type: "section", + text: { + type: "mrkdwn", + text: "*🔗 GitHub Integration*\nConnect your GitHub account to work with repositories", + }, + }, + { + type: "actions", + elements: [ + { + type: "button", + text: { + type: "plain_text", + text: "🔗 Login with GitHub", + emoji: true, + }, + url: authUrl, + style: "primary", + }, + ], + }, + ]; + } + + const userRepo = await this.repoManager.getUserRepository(username!, userId); + + if (userRepo) { + const repoUrl = userRepo.repositoryUrl.replace(/\.git$/, ""); + const repoDisplayName = repoUrl.replace(/^https?:\/\/(www\.)?github\.com\//, ""); + + return [ + { + type: "section", + text: { + type: "mrkdwn", + text: `*Active Repository:*\n<${repoUrl}|${repoDisplayName}>`, + }, + accessory: { + type: "button", + text: { type: "plain_text", text: "🔄 Change Repository" }, + action_id: "open_repository_modal", + }, + }, + ]; + } + + return [ + { + type: "section", + text: { + type: "mrkdwn", + text: `*🔗 GitHub Integration*\nConnected as @${username}`, + }, + }, + { + type: "actions", + elements: [ + { + type: "button", + text: { + type: "plain_text", + text: "Select Repository", + emoji: true, + }, + action_id: "select_repository", + }, + { + type: "button", + text: { + type: "plain_text", + text: "Disconnect", + emoji: true, + }, + action_id: "github_logout", + }, + ], + }, + ]; + } + + async handleHomeTabAction(actionId: string, userId: string, value?: any): Promise { + // Implementation will be added when integrating with dispatcher + } + + async initWorkspace(config: any): Promise { + // Implementation will be added when integrating with worker + } + + async onSessionStart(context: SessionContext): Promise { + if (context.repositoryUrl) { + const repoName = this.extractRepoName(context.repositoryUrl); + context.systemPrompt += `\n\nYou are working with the GitHub repository: ${repoName}`; + } + return context; + } + + async onSessionEnd(context: SessionContext): Promise { + if (!context.repositoryUrl) return []; + + return [ + { + text: "Create Pull Request", + action_id: "create_pull_request", + style: "primary", + }, + { + text: "Commit Changes", + action_id: "commit_changes", + }, + ]; + } + + async buildEnvVars(userId: string, baseEnv: Record): Promise> { + const { token, username } = await getUserGitHubInfo(userId); + + if (token && username) { + return { + ...baseEnv, + GITHUB_TOKEN: token, + GITHUB_USER: username, + }; + } + + return baseEnv; + } + + private extractRepoName(url: string): string { + const match = url.match(/github\.com[:/]([^/]+)\/([^/]+?)(?:\.git)?$/); + return match ? `${match[1]}/${match[2]}` : url; + } + + getRepositoryManager(): GitHubRepositoryManager | undefined { + return this.repoManager; + } +} + +export * from './repository-manager'; +export * from './handlers'; +export * from './utils'; \ No newline at end of file diff --git a/modules/github/repository-manager.ts b/modules/github/repository-manager.ts new file mode 100644 index 00000000..9fb6aa94 --- /dev/null +++ b/modules/github/repository-manager.ts @@ -0,0 +1,322 @@ +#!/usr/bin/env bun + +import { Octokit } from "@octokit/rest"; +import { createLogger } from "@peerbot/shared"; + +const logger = createLogger("github-module"); + +// Import from shared package +import { GitHubRepositoryError, getDbPool } from "@peerbot/shared"; + +export interface GitHubConfig { + token: string; + organization: string; + repository?: string; + clientId: string; + clientSecret: string; + ingressUrl?: string; +} + +export interface UserRepository { + username: string; + repositoryName: string; + repositoryUrl: string; + cloneUrl: string; + createdAt: number; + lastUsed: number; +} + +export class GitHubRepositoryManager { + private octokit: Octokit; + private config: GitHubConfig; + private repositories = new Map(); // username -> repository info + private databaseUrl?: string; + + constructor(config: GitHubConfig, databaseUrl?: string) { + this.config = config; + this.databaseUrl = databaseUrl; + + this.octokit = new Octokit({ + auth: config.token, + }); + } + + /** + * Extract repository name from GitHub URL + */ + private extractRepoNameFromUrl(url: string): string { + try { + // Handle both HTTPS and SSH URLs + // Match pattern: github.com[:/]owner/repo[.git] + const match = url.match(/github\.com[:/]([^/]+)\/([^/]+?)(?:\.git)?$/); + if (match?.[1] && match?.[2]) { + // Return owner/repo format + return `${match[1]}/${match[2]}`; + } + + // Fallback: try to extract from the URL path + const githubIndex = url.indexOf("github.com"); + if (githubIndex !== -1) { + const pathPart = url.substring(githubIndex + "github.com".length); + const cleanPath = pathPart.replace(/^[:/]/, "").replace(/\.git$/, ""); + if (cleanPath && !cleanPath.startsWith("http")) { + return cleanPath; + } + } + + // If we can't extract a proper name, return the full URL + return url; + } catch (_error) { + // If there's any error, return the full URL + return url; + } + } + + private normalizeRepoUrls(url: string): { + repositoryUrl: string; + cloneUrl: string; + } { + const clean = url.replace(/\.git$/, ""); + const clone = url.endsWith(".git") ? url : `${clean}.git`; + return { repositoryUrl: clean, cloneUrl: clone }; + } + + /** + * Get user's repositories using their GitHub token + */ + async getUserRepositories(token: string): Promise { + try { + const userOctokit = new Octokit({ auth: token }); + + // Fetch user's repositories (owned and collaborated) + const { data: repos } = + await userOctokit.rest.repos.listForAuthenticatedUser({ + sort: "updated", + per_page: 100, + type: "all", // Get all repos (owner, collaborator, org member) + }); + + return repos; + } catch (error) { + logger.error("Failed to fetch user repositories:", error); + throw new GitHubRepositoryError( + "getUserRepositories", + "user", + `Failed to fetch user repositories: ${error instanceof Error ? error.message : String(error)}`, + error instanceof Error ? error : undefined + ); + } + } + + /** + * Get cached repository for a user without creating + */ + async getUserRepository( + username: string, + slackUserId?: string + ): Promise { + // If a global repository override is configured, return it (highest priority) + if (this.config.repository) { + const { repositoryUrl, cloneUrl } = this.normalizeRepoUrls( + this.config.repository + ); + return { + username, + repositoryName: this.extractRepoNameFromUrl(this.config.repository), + repositoryUrl, + cloneUrl, + createdAt: Date.now(), + lastUsed: Date.now(), + }; + } + + // Check for user's selected repository from database + const selectedRepo = await this.getUserSelectedRepository( + username, + slackUserId + ); + if (selectedRepo) { + return selectedRepo; + } + + // Return cached repository if available + return this.repositories.get(username); + } + + /** + * Get user's selected repository from database + */ + private async getUserSelectedRepository( + username: string, + slackUserId?: string + ): Promise { + try { + logger.info( + `Checking for user-selected repository for ${username} (Slack ID: ${slackUserId || "unknown"})` + ); + const dbPool = getDbPool(this.databaseUrl || process.env.DATABASE_URL); + + let result; + + // If we have the Slack user ID, use it directly + if (slackUserId) { + result = await dbPool.query( + `SELECT ue.value as repo_url + FROM users u + JOIN user_environ ue ON u.id = ue.user_id + WHERE u.platform = 'slack' + AND u.platform_user_id = $1 + AND ue.name = 'SELECTED_REPOSITORY'`, + [slackUserId.toUpperCase()] + ); + } else { + // Fall back to searching by username pattern + result = await dbPool.query( + `SELECT ue.value as repo_url + FROM users u + JOIN user_environ ue ON u.id = ue.user_id + WHERE u.platform = 'slack' + AND ue.name = 'SELECTED_REPOSITORY' + ORDER BY u.updated_at DESC + LIMIT 1`, + [] + ); + } + + if (result.rows.length > 0 && result.rows[0].repo_url) { + const repoUrl = result.rows[0].repo_url; + const repoName = this.extractRepoNameFromUrl(repoUrl); + + logger.info( + `Found user-selected repository for ${username}: ${repoUrl}` + ); + + return { + username, + repositoryName: repoName, + repositoryUrl: repoUrl.replace(".git", ""), + cloneUrl: repoUrl.endsWith(".git") ? repoUrl : `${repoUrl}.git`, + createdAt: Date.now(), + lastUsed: Date.now(), + }; + } else { + logger.info(`No user-selected repository found for ${username}`); + } + } catch (error) { + logger.warn( + `Failed to get user selected repository for ${username}:`, + error + ); + } + return undefined; + } + + /** + * Ensure user repository exists, create if needed + */ + async ensureUserRepository(username: string): Promise { + try { + // If a global repository override is configured, use it (highest priority) + if (this.config.repository) { + // Create repository info from override URL (no caching for overrides) + const { repositoryUrl, cloneUrl } = this.normalizeRepoUrls( + this.config.repository + ); + const repository: UserRepository = { + username, + repositoryName: this.extractRepoNameFromUrl(this.config.repository), + repositoryUrl, + cloneUrl, + createdAt: Date.now(), + lastUsed: Date.now(), + }; + + logger.info( + `Using global repository override for user ${username}: ${repository.repositoryUrl}` + ); + return repository; + } + + // Check for user's selected repository from database + const selectedRepo = await this.getUserSelectedRepository(username); + if (selectedRepo) { + logger.info( + `Using user-selected repository for ${username}: ${selectedRepo.repositoryUrl}` + ); + // Cache it + this.repositories.set(username, selectedRepo); + return selectedRepo; + } + + // Check if we have cached repository info + const cached = this.repositories.get(username); + if (cached) { + // Update last used timestamp + cached.lastUsed = Date.now(); + return cached; + } + + // No user-specific repository configured + // Return null to indicate no repository is set + // The worker will create a local workspace without git operations + logger.info( + `No repository configured for user ${username}. Will use local workspace only.` + ); + return null; + } catch (error) { + throw new GitHubRepositoryError( + "ensureUserRepository", + username, + `Failed to ensure repository for user ${username}`, + error as Error + ); + } + } + + /** + * Get repository information + */ + async getRepositoryInfo(username: string): Promise { + return this.repositories.get(username) || null; + } + + /** + * Fetch README.md content from a GitHub repository + */ + async fetchReadmeContent( + owner: string, + repo: string + ): Promise { + try { + logger.info(`Fetching README.md from ${owner}/${repo}...`); + + const response = await this.octokit.rest.repos.getContent({ + owner, + repo, + path: "README.md", + }); + + if ("content" in response.data && response.data.content) { + const content = Buffer.from(response.data.content, "base64").toString( + "utf8" + ); + logger.info( + `Successfully fetched README.md from ${owner}/${repo} (${content.length} characters)` + ); + return content; + } + + logger.warn( + `README.md found but no content available for ${owner}/${repo}` + ); + return null; + } catch (error: any) { + if (error.status === 404) { + logger.info(`README.md not found for ${owner}/${repo}`); + return null; + } + logger.error(`Failed to fetch README.md from ${owner}/${repo}:`, error); + return null; + } + } +} \ No newline at end of file diff --git a/modules/github/utils.ts b/modules/github/utils.ts new file mode 100644 index 00000000..1a81c321 --- /dev/null +++ b/modules/github/utils.ts @@ -0,0 +1,11 @@ +/** + * Utility functions for GitHub-related operations + */ + +/** + * Generate GitHub OAuth URL for user authentication + */ +export function generateGitHubAuthUrl(userId: string): string { + const baseUrl = process.env.INGRESS_URL || "http://localhost:8080"; + return `${baseUrl}/api/github/oauth/authorize?user_id=${userId}`; +} \ No newline at end of file diff --git a/modules/github/workspace.ts b/modules/github/workspace.ts new file mode 100644 index 00000000..9b59bc98 --- /dev/null +++ b/modules/github/workspace.ts @@ -0,0 +1,274 @@ +#!/usr/bin/env bun + +import { exec } from "node:child_process"; +import { promisify } from "node:util"; +import { createLogger } from "@peerbot/shared"; + +const logger = createLogger("github-module"); +const execAsync = promisify(exec); + +export interface WorkspaceSetupConfig { + baseDirectory: string; + githubToken: string; +} + +export interface GitRepository { + url: string; + branch: string; + directory: string; + lastCommit?: string; +} + +export interface WorkspaceInfo { + baseDirectory: string; + userDirectory: string; + repository?: GitRepository; + setupComplete: boolean; +} + +export class GitHubWorkspaceManager { + private config: WorkspaceSetupConfig; + + constructor(config: WorkspaceSetupConfig) { + this.config = config; + } + + /** + * Setup GitHub-specific workspace operations + */ + async setupGitHubWorkspace( + repositoryUrl: string, + userDirectory: string, + username: string, + sessionKey?: string + ): Promise { + try { + logger.info(`Setting up GitHub workspace for ${username}...`); + + // Setup git configuration + await this.setupGitConfig(userDirectory, username); + + // Setup GitHub CLI authentication if token is available + if (this.config.githubToken) { + try { + logger.info("Setting up GitHub CLI authentication..."); + await execAsync( + `echo "${this.config.githubToken}" | gh auth login --with-token`, + { + cwd: userDirectory, + env: { ...process.env, GH_TOKEN: this.config.githubToken }, + } + ); + logger.info("GitHub CLI authentication configured successfully"); + } catch (error) { + logger.warn("Failed to setup GitHub CLI authentication:", error); + } + } + + // Get repository info + const repository = await this.getRepositoryInfo(userDirectory, repositoryUrl); + + return { + baseDirectory: this.config.baseDirectory, + userDirectory, + repository, + setupComplete: true, + }; + } catch (error) { + logger.error(`Failed to setup GitHub workspace: ${error}`); + throw error; + } + } + + /** + * Setup git configuration for the user + */ + private async setupGitConfig( + repositoryDirectory: string, + username: string + ): Promise { + try { + logger.info(`Setting up git configuration for ${username}...`); + + // Set user name and email + await execAsync(`git config user.name "Peerbot"`, { + cwd: repositoryDirectory, + }); + + await execAsync( + `git config user.email "claude-code-bot+${username}@noreply.github.com"`, + { + cwd: repositoryDirectory, + } + ); + + // Set push default + await execAsync("git config push.default simple", { + cwd: repositoryDirectory, + }); + + logger.info("Git configuration completed"); + } catch (error) { + throw new Error(`Failed to setup git configuration for ${username}: ${error}`); + } + } + + /** + * Get repository information + */ + private async getRepositoryInfo( + repositoryDirectory: string, + repositoryUrl: string + ): Promise { + try { + // Get current branch + const { stdout: branchOutput } = await execAsync( + "git branch --show-current", + { + cwd: repositoryDirectory, + } + ); + const branch = branchOutput.trim(); + + // Get last commit hash + const { stdout: commitOutput } = await execAsync("git rev-parse HEAD", { + cwd: repositoryDirectory, + }); + const lastCommit = commitOutput.trim(); + + return { + url: repositoryUrl, + branch, + directory: repositoryDirectory, + lastCommit, + }; + } catch (error) { + throw new Error(`Failed to get repository information: ${error}`); + } + } + + /** + * Create a new branch for the session + */ + async createSessionBranch(userDirectory: string, sessionKey: string): Promise { + try { + const branchName = `claude/${sessionKey.replace(/\./g, "-")}`; + + logger.info(`Checking if session branch exists: ${branchName}`); + + // Check if branch already exists locally or remotely + try { + // Try to checkout existing branch + await execAsync(`git checkout "${branchName}"`, { + cwd: userDirectory, + }); + logger.info(`Session branch ${branchName} already exists locally, checked out`); + + // Pull latest changes from remote to preserve previous work + try { + await execAsync(`git pull origin "${branchName}"`, { + cwd: userDirectory, + timeout: 30000, + }); + logger.info(`Pulled latest changes for session branch ${branchName}`); + } catch (pullError) { + logger.warn( + `Failed to pull latest changes for ${branchName} (branch might be new):`, + pullError + ); + } + } catch (_checkoutError) { + // Branch doesn't exist locally, check remote + try { + const { stdout } = await execAsync( + `git ls-remote --heads origin ${branchName}`, + { cwd: userDirectory, timeout: 10000 } + ); + + if (stdout.trim()) { + // Branch exists on remote, checkout from remote + await execAsync( + `git checkout -b "${branchName}" "origin/${branchName}"`, + { + cwd: userDirectory, + } + ); + logger.info( + `Session branch ${branchName} exists on remote, checked out with latest changes` + ); + } else { + // Branch doesn't exist anywhere, create new + await execAsync(`git checkout -b "${branchName}"`, { + cwd: userDirectory, + }); + logger.info(`Created new session branch: ${branchName}`); + } + } catch (_error) { + // Error checking remote, create new branch + await execAsync(`git checkout -b "${branchName}"`, { + cwd: userDirectory, + }); + logger.info(`Created new session branch: ${branchName}`); + } + } + + return branchName; + } catch (error) { + throw new Error(`Failed to create session branch for ${sessionKey}: ${error}`); + } + } + + /** + * Commit and push changes + */ + async commitAndPush(userDirectory: string, branch: string, message: string): Promise { + try { + // Add all changes + await execAsync("git add .", { cwd: userDirectory }); + + // Check if there are changes to commit + let hasUnstagedChanges = false; + try { + await execAsync("git diff --cached --exit-code", { cwd: userDirectory }); + logger.info("No staged changes to commit - checking for unpushed commits"); + } catch (_error) { + hasUnstagedChanges = true; + } + + // Check if there are unpushed commits + let hasUnpushedCommits = false; + try { + await execAsync(`git diff --exit-code origin/${branch}..HEAD`, { + cwd: userDirectory, + }); + logger.info("No unpushed commits"); + } catch (_error) { + hasUnpushedCommits = true; + logger.info("Found unpushed commits"); + } + + // If neither staged changes nor unpushed commits, return + if (!hasUnstagedChanges && !hasUnpushedCommits) { + logger.info("No changes to commit or push"); + return; + } + + // Commit changes if there are staged changes + if (hasUnstagedChanges) { + await execAsync(`git commit -m "${message}"`, { cwd: userDirectory }); + logger.info("Changes committed"); + } + + // Always push if there are unpushed commits (either new ones or existing ones) + if (hasUnpushedCommits || hasUnstagedChanges) { + await execAsync(`git push -u origin "${branch}"`, { + cwd: userDirectory, + timeout: 120000, + }); + logger.info(`Changes pushed to ${branch}`); + } + } catch (error) { + throw new Error(`Failed to commit and push changes: ${error}`); + } + } +} \ No newline at end of file diff --git a/modules/index.ts b/modules/index.ts new file mode 100644 index 00000000..fb94c0ee --- /dev/null +++ b/modules/index.ts @@ -0,0 +1,46 @@ +import type { ModuleInterface, HomeTabModule, WorkerModule, OrchestratorModule } from './types'; + +export class ModuleRegistry { + private modules: Map = new Map(); + + register(module: ModuleInterface): void { + if (module.isEnabled()) { + this.modules.set(module.name, module); + } + } + + async initAll(): Promise { + for (const module of this.modules.values()) { + if (module.init) { + await module.init(); + } + } + } + + getHomeTabModules(): HomeTabModule[] { + return Array.from(this.modules.values()).filter( + (m): m is HomeTabModule => 'renderHomeTab' in m + ); + } + + getWorkerModules(): WorkerModule[] { + return Array.from(this.modules.values()).filter( + (m): m is WorkerModule => 'onSessionStart' in m || 'onSessionEnd' in m + ); + } + + getOrchestratorModules(): OrchestratorModule[] { + return Array.from(this.modules.values()).filter( + (m): m is OrchestratorModule => 'buildEnvVars' in m + ); + } + + getModule(name: string): T | undefined { + return this.modules.get(name) as T; + } +} + +// Global registry instance +export const moduleRegistry = new ModuleRegistry(); + +export * from './types'; \ No newline at end of file diff --git a/modules/types.ts b/modules/types.ts new file mode 100644 index 00000000..72fd4c04 --- /dev/null +++ b/modules/types.ts @@ -0,0 +1,52 @@ +export interface ModuleInterface { + /** Module identifier */ + name: string; + + /** Check if module should be enabled based on environment */ + isEnabled(): boolean; + + /** Initialize module - called once at startup */ + init?(): Promise; +} + +export interface HomeTabModule extends ModuleInterface { + /** Render home tab elements */ + renderHomeTab?(userId: string): Promise; + + /** Handle home tab interactions */ + handleHomeTabAction?(actionId: string, userId: string, value?: any): Promise; +} + +export interface WorkerModule extends ModuleInterface { + /** Initialize workspace - called when worker starts session */ + initWorkspace?(config: any): Promise; + + /** Called at session start - can modify system prompt */ + onSessionStart?(context: SessionContext): Promise; + + /** Called at session end - can add action buttons */ + onSessionEnd?(context: SessionContext): Promise; +} + +export interface OrchestratorModule extends ModuleInterface { + /** Build environment variables for worker container */ + buildEnvVars?(userId: string, baseEnv: Record): Promise>; + + /** Get container address for module-specific services */ + getContainerAddress?(): string; +} + +export interface SessionContext { + userId: string; + threadId: string; + repositoryUrl?: string; + systemPrompt: string; + workspace?: any; +} + +export interface ActionButton { + text: string; + action_id: string; + style?: 'primary' | 'danger'; + value?: string; +} \ No newline at end of file diff --git a/packages/dispatcher/src/index.ts b/packages/dispatcher/src/index.ts index 6b9404a4..f8845bff 100644 --- a/packages/dispatcher/src/index.ts +++ b/packages/dispatcher/src/index.ts @@ -21,6 +21,8 @@ import { QueueProducer } from "./queue/task-queue-producer"; import { setupHealthEndpoints } from "./simple-http"; import { SlackEventHandlers } from "./slack/slack-event-handlers"; import type { DispatcherConfig } from "./types"; +import { moduleRegistry } from "../../../modules"; +import { GitHubModule } from "../../../modules/github"; export class SlackDispatcher { private app: App; @@ -34,6 +36,9 @@ export class SlackDispatcher { constructor(config: DispatcherConfig) { this.config = config; + // Register modules + moduleRegistry.register(new GitHubModule()); + if (!config.queues?.connectionString) { throw new Error("Queue connection string is required"); } @@ -131,6 +136,10 @@ export class SlackDispatcher { // Setup health endpoints will be called after event handlers are created + // Initialize modules + await moduleRegistry.initAll(); + logger.info("✅ Modules initialized"); + // Start queue producer await this.queueProducer.start(); logger.info("✅ Queue producer started"); diff --git a/packages/dispatcher/src/slack/handlers/action-handler.ts b/packages/dispatcher/src/slack/handlers/action-handler.ts index cd96c958..ce3f7ef1 100644 --- a/packages/dispatcher/src/slack/handlers/action-handler.ts +++ b/packages/dispatcher/src/slack/handlers/action-handler.ts @@ -12,6 +12,7 @@ import { handleGitHubLogout, getUserGitHubInfo, } from "./github-handler"; +import { moduleRegistry } from "../../../../../modules"; import { handleTryDemo } from "./demo-handler"; import { openRepositoryModal } from "./repository-modal-utils"; import { @@ -339,64 +340,10 @@ export class ActionHandler { client ); - // Check if user has GitHub token + // Get GitHub connection status for demo purposes const githubUser = await getUserGitHubInfo(userId); const isGitHubConnected = !!githubUser.token; - let repository; - let readmeSection: string | null = null; - - // Check for environment overrides - const userEnv = await this.messageHandler.getUserEnvironment(userId); - const overrideRepo = userEnv.GITHUB_REPOSITORY as string | undefined; - - // Try to get or create repository - try { - if (overrideRepo) { - const repoUrl = overrideRepo.replace(/\/$/, "").replace(/\.git$/, ""); - const repoName = repoUrl.split("/").pop() || "unknown"; - - repository = { - username, - repositoryName: repoName, - repositoryUrl: repoUrl, - cloneUrl: repoUrl.endsWith(".git") ? repoUrl : `${repoUrl}.git`, - createdAt: Date.now(), - lastUsed: Date.now(), - }; - - logger.info( - `Using environment override repository for user ${userId}: ${repoUrl}` - ); - } else { - // Try to get existing repository - repository = await this.repoManager.getUserRepository( - username, - userId - ); - - // If no cached repository and we have a token, create one - if (!repository && (this.config.github.token || isGitHubConnected)) { - repository = await this.repoManager.ensureUserRepository(username); - } - } - - // Fetch README.md content if we have a repository - if (repository) { - const readmeContent = await this.fetchRepositoryReadme( - repository.repositoryUrl - ); - if (readmeContent) { - readmeSection = `*📖 README :*\n\`\`\`\n${readmeContent.slice(0, 500)}${readmeContent.length > 500 ? "..." : ""}\n\`\`\``; - } - } - } catch (error) { - logger.warn( - `Could not get/ensure repository for user ${username}:`, - error - ); - } - const blocks: any[] = [ { type: "section", @@ -407,85 +354,27 @@ export class ActionHandler { }, ]; - // Show repository info or login prompt - if (repository && isGitHubConnected) { - const repoUrl = repository.repositoryUrl.replace(/\.git$/, ""); - const repoDisplayName = repoUrl.replace( - /^https?:\/\/(www\.)?github\.com\//, - "" - ); - - blocks.push({ - type: "section", - text: { - type: "mrkdwn", - text: `*Active Repository:*\n<${repoUrl}|${repoDisplayName}>`, - }, - accessory: { - type: "button", - text: { type: "plain_text", text: "🔄 Change Repository" }, - action_id: "open_repository_modal", - }, - }); - - // Add README section if available - if (readmeSection) { - blocks.push({ - type: "section", - text: { type: "mrkdwn", text: readmeSection }, - }); - } - - blocks.push({ type: "divider" }); - } else if (repository && !isGitHubConnected) { - // Repository exists but user not authenticated - show login prompt with repo info - const repoUrl = repository.repositoryUrl.replace(/\.git$/, ""); - const repoDisplayName = repoUrl.replace( - /^https?:\/\/(www\.)?github\.com\//, - "" - ); - - blocks.push({ - type: "section", - text: { - type: "mrkdwn", - text: `*Demo Repository:*\n<${repoUrl}|${repoDisplayName}>\n\n_Connect your GitHub account to work with your own repositories._`, - }, - }); - - const authUrl = generateGitHubAuthUrl(userId); - - const demoElements = [ - { - type: "button", - text: { type: "plain_text", text: "🔗 Login with GitHub" }, - url: authUrl, - style: "primary", - } as any, - ]; - - // Only show Try Demo button if DEMO_REPOSITORY is configured - if (process.env.DEMO_REPOSITORY) { - demoElements.push({ - type: "button", - text: { type: "plain_text", text: "🎮 Try Demo" }, - action_id: "try_demo", - }); + // Add module-rendered home tab sections + const homeTabModules = moduleRegistry.getHomeTabModules(); + for (const module of homeTabModules) { + try { + const moduleBlocks = await module.renderHomeTab!(userId); + blocks.push(...moduleBlocks); + if (moduleBlocks.length > 0) { + blocks.push({ type: "divider" }); + } + } catch (error) { + logger.error(`Failed to render home tab for module ${module.name}:`, error); } + } - blocks.push({ - type: "actions", - elements: demoElements, - }); - - blocks.push({ type: "divider" }); - } else if (isGitHubConnected) { - // GitHub connected but no repository selected + // Demo functionality (non-module specific) + if (process.env.DEMO_REPOSITORY && !isGitHubConnected) { blocks.push({ type: "section", text: { type: "mrkdwn", - text: `*GitHub Connected:* ${githubUser.username || "✓"}\n\nSelect a repository to start working:`, + text: "*🎮 Demo Mode*\nTry Peerbot with a demo repository", }, }); @@ -494,49 +383,13 @@ export class ActionHandler { elements: [ { type: "button", - text: { type: "plain_text", text: "📂 Select Repository" }, - action_id: "open_repository_modal", + text: { type: "plain_text", text: "🎮 Try Demo" }, + action_id: "try_demo", style: "primary", }, ], }); - blocks.push({ type: "divider" }); - } else { - // Not connected to GitHub - blocks.push({ - type: "section", - text: { - type: "mrkdwn", - text: "*Get Started:*\nConnect your GitHub account to start working with your repositories.", - }, - }); - - const authUrl = generateGitHubAuthUrl(userId); - - const loginElements = [ - { - type: "button", - text: { type: "plain_text", text: "🔗 Login with GitHub" }, - url: authUrl, - style: "primary", - } as any, - ]; - - // Only show Try Demo button if DEMO_REPOSITORY is configured - if (process.env.DEMO_REPOSITORY) { - loginElements.push({ - type: "button", - text: { type: "plain_text", text: "🎮 Try Demo" }, - action_id: "try_demo", - }); - } - - blocks.push({ - type: "actions", - elements: loginElements, - }); - blocks.push({ type: "divider" }); } @@ -553,32 +406,6 @@ export class ActionHandler { }, }); - // Add logout button if GitHub is connected - if (isGitHubConnected) { - blocks.push( - { type: "divider" }, - { - type: "actions", - elements: [ - { - type: "button", - text: { type: "plain_text", text: "🚪 Logout from GitHub" }, - action_id: "github_logout", - style: "danger", - confirm: { - title: { type: "plain_text", text: "Logout from GitHub?" }, - text: { - type: "mrkdwn", - text: "This will disconnect your GitHub account. You'll need to login again to access your repositories.", - }, - confirm: { type: "plain_text", text: "Logout" }, - deny: { type: "plain_text", text: "Cancel" }, - }, - }, - ], - } - ); - } // Update the app home view await client.views.publish({ diff --git a/packages/orchestrator/src/base/BaseDeploymentManager.ts b/packages/orchestrator/src/base/BaseDeploymentManager.ts index 8a38b7f1..6034387e 100644 --- a/packages/orchestrator/src/base/BaseDeploymentManager.ts +++ b/packages/orchestrator/src/base/BaseDeploymentManager.ts @@ -7,6 +7,7 @@ import { } from "../types"; import type { BaseSecretManager } from "./BaseSecretManager"; import { decrypt, createLogger } from "@peerbot/shared"; +import { buildModuleEnvVars } from "../module-integration"; const logger = createLogger("orchestrator"); @@ -257,6 +258,13 @@ export abstract class BaseDeploymentManager { envVars.GITHUB_TOKEN = process.env.GITHUB_TOKEN; } // OAuth token is now always handled by the proxy in dispatcher + + // Add module-specific environment variables + try { + envVars = await buildModuleEnvVars(messageData?.userId || '', envVars); + } catch (error) { + logger.warn('Failed to build module environment variables:', error); + } } if (process.env.CLAUDE_ALLOWED_TOOLS) { diff --git a/packages/orchestrator/src/index.ts b/packages/orchestrator/src/index.ts index a1143c1f..7b048772 100644 --- a/packages/orchestrator/src/index.ts +++ b/packages/orchestrator/src/index.ts @@ -5,6 +5,9 @@ import { initSentry } from "@peerbot/shared"; // Initialize Sentry monitoring initSentry(); +import { moduleRegistry } from "../../../modules"; +import { GitHubModule } from "../../../modules/github"; + import { join } from "node:path"; import { config as dotenvConfig } from "dotenv"; import type { BaseDeploymentManager } from "./base/BaseDeploymentManager"; @@ -27,6 +30,9 @@ class PeerbotOrchestrator { constructor(config: OrchestratorConfig) { this.config = config; + + // Register modules + moduleRegistry.register(new GitHubModule()); this.dbPool = new DatabasePool(config.database); this.deploymentManager = this.createDeploymentManager(config); this.queueConsumer = new QueueConsumer(config, this.deploymentManager); @@ -178,6 +184,10 @@ class PeerbotOrchestrator { async start(): Promise { try { + // Initialize modules + await moduleRegistry.initAll(); + logger.info("✅ Modules initialized"); + // Run database migrations using dbmate (this will create database and run migrations) await this.runDbmateMigrations(); diff --git a/packages/orchestrator/src/module-integration.ts b/packages/orchestrator/src/module-integration.ts new file mode 100644 index 00000000..87a7a616 --- /dev/null +++ b/packages/orchestrator/src/module-integration.ts @@ -0,0 +1,18 @@ +import { moduleRegistry } from '../../../modules'; + +export async function buildModuleEnvVars(userId: string, baseEnv: Record): Promise> { + let envVars = { ...baseEnv }; + + const orchestratorModules = moduleRegistry.getOrchestratorModules(); + for (const module of orchestratorModules) { + if (module.buildEnvVars) { + try { + envVars = await module.buildEnvVars(userId, envVars); + } catch (error) { + console.error(`Failed to build env vars for module ${module.name}:`, error); + } + } + } + + return envVars; +} \ No newline at end of file diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts index 89aa6344..049b868c 100644 --- a/packages/worker/src/index.ts +++ b/packages/worker/src/index.ts @@ -7,6 +7,9 @@ import { initSentry, createLogger } from "@peerbot/shared"; // Initialize Sentry monitoring initSentry(); +import { moduleRegistry } from "../../../modules"; +import { GitHubModule } from "../../../modules/github"; + const logger = createLogger("worker"); import { QueuePersistentClaudeWorker } from "./persistent-task-worker"; @@ -23,6 +26,11 @@ export { ClaudeWorker } from "./claude-worker"; * Main entry point - now supports both queue-based and legacy workers */ async function main() { + // Register modules + moduleRegistry.register(new GitHubModule()); + await moduleRegistry.initAll(); + logger.info("✅ Modules initialized"); + logger.info( "🔄 Starting in queue mode (dynamic deployment-based persistent worker)" ); diff --git a/packages/worker/src/module-integration.ts b/packages/worker/src/module-integration.ts new file mode 100644 index 00000000..59dd21e4 --- /dev/null +++ b/packages/worker/src/module-integration.ts @@ -0,0 +1,49 @@ +import { moduleRegistry, type SessionContext, type ActionButton } from '../../../modules'; + +export async function onSessionStart(context: SessionContext): Promise { + let updatedContext = context; + + const workerModules = moduleRegistry.getWorkerModules(); + for (const module of workerModules) { + if (module.onSessionStart) { + try { + updatedContext = await module.onSessionStart(updatedContext); + } catch (error) { + console.error(`Failed to execute onSessionStart for module ${module.name}:`, error); + } + } + } + + return updatedContext; +} + +export async function onSessionEnd(context: SessionContext): Promise { + const allButtons: ActionButton[] = []; + + const workerModules = moduleRegistry.getWorkerModules(); + for (const module of workerModules) { + if (module.onSessionEnd) { + try { + const buttons = await module.onSessionEnd(context); + allButtons.push(...buttons); + } catch (error) { + console.error(`Failed to execute onSessionEnd for module ${module.name}:`, error); + } + } + } + + return allButtons; +} + +export async function initModuleWorkspace(config: any): Promise { + const workerModules = moduleRegistry.getWorkerModules(); + for (const module of workerModules) { + if (module.initWorkspace) { + try { + await module.initWorkspace(config); + } catch (error) { + console.error(`Failed to initialize workspace for module ${module.name}:`, error); + } + } + } +} \ No newline at end of file From 66429d3d4e8ebc6761ca72d37e50aab4749eb650 Mon Sep 17 00:00:00 2001 From: "claude[bot]" <209825114+claude[bot]@users.noreply.github.com> Date: Thu, 2 Oct 2025 22:21:20 +0000 Subject: [PATCH 02/12] fix: remove dead code and clean up module system MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Remove dead GitHub files from dispatcher package - Fix async/await compilation issue in BaseDeploymentManager - Fix home tab action button ID mismatch (select_repository -> open_repository_modal) - Replace stub implementations with actual code in GitHub module - Update all import statements to use new module locations - Move GitHubOAuthHandler to modules from deleted files - Remove backwards compatibility code 🤖 Generated with [Claude Code](https://claude.ai/code) Co-authored-by: Burak Emre Kabakcı --- modules/github/handlers.ts | 303 ++++++++++++++++- modules/github/index.ts | 27 +- .../src/converters/github-actions.ts | 6 +- .../src/github/repository-manager.ts | 305 ----------------- packages/dispatcher/src/index.ts | 4 +- .../src/oauth/github-oauth-handler.ts | 311 ------------------ .../src/queue/slack-thread-processor.ts | 2 +- packages/dispatcher/src/simple-http.ts | 2 +- .../src/slack/handlers/action-handler.ts | 6 +- .../src/slack/handlers/github-handler.ts | 142 -------- .../src/slack/handlers/message-handler.ts | 2 +- .../slack/handlers/repository-modal-utils.ts | 2 +- .../handlers/shortcut-command-handler.ts | 2 +- .../src/slack/slack-event-handlers.ts | 4 +- packages/dispatcher/src/utils/github-utils.ts | 11 - .../src/base/BaseDeploymentManager.ts | 4 +- .../src/docker/DockerDeploymentManager.ts | 2 +- .../src/k8s/K8sDeploymentManager.ts | 2 +- .../subprocess/SubprocessDeploymentManager.ts | 2 +- 19 files changed, 345 insertions(+), 794 deletions(-) delete mode 100644 packages/dispatcher/src/github/repository-manager.ts delete mode 100644 packages/dispatcher/src/oauth/github-oauth-handler.ts delete mode 100644 packages/dispatcher/src/slack/handlers/github-handler.ts delete mode 100644 packages/dispatcher/src/utils/github-utils.ts diff --git a/modules/github/handlers.ts b/modules/github/handlers.ts index 0a388989..71ac272d 100644 --- a/modules/github/handlers.ts +++ b/modules/github/handlers.ts @@ -1,10 +1,311 @@ import { createLogger } from "@peerbot/shared"; import { getDbPool } from "@peerbot/shared"; +import { encrypt, decrypt } from "@peerbot/shared"; +import axios from "axios"; +import type { Request, Response } from "express"; const logger = createLogger("github-module"); -import { decrypt } from "@peerbot/shared"; import { generateGitHubAuthUrl } from "./utils"; +export class GitHubOAuthHandler { + private dbPool: any; + private homeTabCallback?: (userId: string) => Promise; + + constructor( + databaseUrl: string, + homeTabCallback?: (userId: string) => Promise + ) { + this.dbPool = getDbPool(databaseUrl); + this.homeTabCallback = homeTabCallback; + } + + /** + * Handle OAuth authorization request + */ + async handleAuthorize(req: Request, res: Response): Promise { + const clientId = process.env.GITHUB_CLIENT_ID; + + if (!clientId) { + res.status(500).json({ error: "GitHub OAuth not configured" }); + return; + } + + const userId = req.query.user_id as string; + if (!userId) { + res.status(400).json({ error: "User ID required" }); + return; + } + + // Create encrypted state with user ID and timestamp + const stateData = JSON.stringify({ + userId, + timestamp: Date.now(), + }); + const state = encrypt(stateData); + + // Use INGRESS_URL if provided, otherwise construct from request + const baseUrl = + process.env.INGRESS_URL || `${req.protocol}://${req.get("host")}`; + + // If using default localhost, ensure we use port 8080 + const redirectUri = + baseUrl.includes("localhost") && !process.env.INGRESS_URL + ? `http://localhost:8080/api/github/oauth/callback` + : `${baseUrl}/api/github/oauth/callback`; + + // GitHub OAuth URL with full repo scope + const githubAuthUrl = + `https://github.com/login/oauth/authorize?` + + `client_id=${clientId}&` + + `redirect_uri=${encodeURIComponent(redirectUri)}&` + + `scope=${encodeURIComponent("repo read:user")}&` + + `state=${encodeURIComponent(state)}`; + + res.redirect(githubAuthUrl); + } + + /** + * Handle OAuth callback + */ + async handleCallback(req: Request, res: Response): Promise { + try { + const { code, state } = req.query; + + if (!code || !state) { + res.status(400).send("Missing code or state parameter"); + return; + } + + // Decrypt and validate state + let stateData; + try { + stateData = JSON.parse(decrypt(state as string)); + } catch (error) { + res.status(400).send("Invalid state parameter"); + return; + } + + // Check timestamp (expire after 10 minutes) + if (Date.now() - stateData.timestamp > 10 * 60 * 1000) { + res.status(400).send("State parameter expired"); + return; + } + + // Exchange code for access token + const tokenResponse = await axios.post( + "https://github.com/login/oauth/access_token", + { + client_id: process.env.GITHUB_CLIENT_ID, + client_secret: process.env.GITHUB_CLIENT_SECRET, + code, + }, + { + headers: { + Accept: "application/json", + }, + } + ); + + const accessToken = tokenResponse.data.access_token; + if (!accessToken) { + throw new Error("Failed to get access token"); + } + + // Get user info from GitHub + const userResponse = await axios.get("https://api.github.com/user", { + headers: { + Authorization: `Bearer ${accessToken}`, + }, + }); + + const githubUsername = userResponse.data.login; + + // Store token in database + const userId = stateData.userId.toUpperCase(); // Slack user IDs are uppercase + + // First ensure user exists + await this.dbPool.query( + `INSERT INTO users (platform, platform_user_id) + VALUES ('slack', $1) + ON CONFLICT (platform, platform_user_id) DO NOTHING`, + [userId] + ); + + // Get user ID + const userResult = await this.dbPool.query( + `SELECT id FROM users WHERE platform = 'slack' AND platform_user_id = $1`, + [userId] + ); + const userDbId = userResult.rows[0].id; + + // Store GitHub token and username (token encrypted at rest) + const encToken = encrypt(accessToken); + await this.dbPool.query( + `INSERT INTO user_environ (user_id, channel_id, repository, name, value, type) + VALUES ($1, NULL, NULL, 'GITHUB_TOKEN', $2, 'user') + ON CONFLICT (user_id, channel_id, repository, name) + DO UPDATE SET value = EXCLUDED.value, updated_at = NOW()`, + [userDbId, encToken] + ); + + await this.dbPool.query( + `INSERT INTO user_environ (user_id, channel_id, repository, name, value, type) + VALUES ($1, NULL, NULL, 'GITHUB_USER', $2, 'user') + ON CONFLICT (user_id, channel_id, repository, name) + DO UPDATE SET value = EXCLUDED.value, updated_at = NOW()`, + [userDbId, githubUsername] + ); + + // Trigger home tab refresh and send repository selection message + try { + if (this.homeTabCallback) { + logger.info( + `Triggering home tab refresh for user ${userId} after GitHub OAuth` + ); + await this.homeTabCallback(userId); + } + } catch (error) { + logger.error("Failed to trigger home tab refresh:", error); + // Don't fail the OAuth flow if home tab refresh fails + } + + // Success page + res.send(` + + + + GitHub Connected + + + +
+
✅
+

GitHub Connected!

+

Successfully connected as @${githubUsername}

+

You can now return to Slack and select your repositories.

+
You can close this window.
+
+ + + + `); + } catch (error) { + logger.error("OAuth callback error:", error); + res.status(500).send(` + + + + Connection Failed + + + +
+
❌
+

Connection Failed

+

Failed to connect to GitHub. Please try again.

+

Error: ${error instanceof Error ? error.message : "Unknown error"}

+
+ + + `); + } + } + + /** + * Handle logout + */ + async handleLogout(req: Request, res: Response): Promise { + try { + const userId = req.body.user_id; + if (!userId) { + res.status(400).json({ error: "User ID required" }); + return; + } + + // Remove GitHub token and username from database + await this.dbPool.query( + `DELETE FROM user_environ + WHERE user_id = (SELECT id FROM users WHERE platform = 'slack' AND platform_user_id = $1) + AND name IN ('GITHUB_TOKEN', 'GITHUB_USER')`, + [userId.toUpperCase()] + ); + + res.json({ success: true }); + } catch (error) { + logger.error("Logout error:", error); + res.status(500).json({ error: "Failed to logout" }); + } + } + + /** + * Cleanup resources + */ + async cleanup(): Promise { + /* no-op for shared pool */ + } +} + /** * Handle GitHub connect action - initiates OAuth flow */ diff --git a/modules/github/index.ts b/modules/github/index.ts index 300b23c1..813de350 100644 --- a/modules/github/index.ts +++ b/modules/github/index.ts @@ -101,7 +101,7 @@ export class GitHubModule implements HomeTabModule, WorkerModule, OrchestratorMo text: "Select Repository", emoji: true, }, - action_id: "select_repository", + action_id: "open_repository_modal", }, { type: "button", @@ -118,11 +118,30 @@ export class GitHubModule implements HomeTabModule, WorkerModule, OrchestratorMo } async handleHomeTabAction(actionId: string, userId: string, value?: any): Promise { - // Implementation will be added when integrating with dispatcher + // Home tab actions are handled by the dispatcher action handler + // This method is called from the dispatcher for module-specific actions } - async initWorkspace(config: any): Promise { - // Implementation will be added when integrating with worker + async initWorkspace(config: { repositoryUrl?: string; workspaceDir?: string }): Promise { + if (!config.repositoryUrl || !config.workspaceDir) return; + + // Clone repository if not already present + const repoName = this.extractRepoName(config.repositoryUrl); + const targetDir = `${config.workspaceDir}/${repoName}`; + + // Check if repo already exists + try { + const fs = await import('fs'); + if (!fs.existsSync(targetDir)) { + const { execSync } = await import('child_process'); + execSync(`git clone ${config.repositoryUrl} ${targetDir}`, { + stdio: 'inherit', + cwd: config.workspaceDir + }); + } + } catch (error) { + console.warn(`Failed to clone repository: ${error}`); + } } async onSessionStart(context: SessionContext): Promise { diff --git a/packages/dispatcher/src/converters/github-actions.ts b/packages/dispatcher/src/converters/github-actions.ts index 0e9ddd77..1c889d60 100644 --- a/packages/dispatcher/src/converters/github-actions.ts +++ b/packages/dispatcher/src/converters/github-actions.ts @@ -1,8 +1,8 @@ #!/usr/bin/env bun -import type { GitHubRepositoryManager } from "../github/repository-manager"; -import { generateGitHubAuthUrl } from "../utils/github-utils"; -import { getUserGitHubInfo } from "../slack/handlers/github-handler"; +import type { GitHubRepositoryManager } from "../../../../modules/github/repository-manager"; +import { generateGitHubAuthUrl } from "../../../../modules/github/utils"; +import { getUserGitHubInfo } from "../../../../modules/github/handlers"; import { generateDeterministicActionId } from "./blockkit-processor"; import { createLogger } from "@peerbot/shared"; diff --git a/packages/dispatcher/src/github/repository-manager.ts b/packages/dispatcher/src/github/repository-manager.ts deleted file mode 100644 index 9f8737db..00000000 --- a/packages/dispatcher/src/github/repository-manager.ts +++ /dev/null @@ -1,305 +0,0 @@ -#!/usr/bin/env bun - -import { Octokit } from "@octokit/rest"; -import { createLogger } from "@peerbot/shared"; -import type { GitHubConfig, UserRepository } from "../types"; - -const logger = createLogger("dispatcher"); - -// Import from shared package -import { GitHubRepositoryError, getDbPool } from "@peerbot/shared"; - -export class GitHubRepositoryManager { - private octokit: Octokit; - private config: GitHubConfig; - private repositories = new Map(); // username -> repository info - private databaseUrl?: string; - - constructor(config: GitHubConfig, databaseUrl?: string) { - this.config = config; - this.databaseUrl = databaseUrl; - - this.octokit = new Octokit({ - auth: config.token, - }); - } - - /** - * Extract repository name from GitHub URL - */ - private extractRepoNameFromUrl(url: string): string { - try { - // Handle both HTTPS and SSH URLs - // Match pattern: github.com[:/]owner/repo[.git] - const match = url.match(/github\.com[:/]([^/]+)\/([^/]+?)(?:\.git)?$/); - if (match?.[1] && match?.[2]) { - // Return owner/repo format - return `${match[1]}/${match[2]}`; - } - - // Fallback: try to extract from the URL path - const githubIndex = url.indexOf("github.com"); - if (githubIndex !== -1) { - const pathPart = url.substring(githubIndex + "github.com".length); - const cleanPath = pathPart.replace(/^[:/]/, "").replace(/\.git$/, ""); - if (cleanPath && !cleanPath.startsWith("http")) { - return cleanPath; - } - } - - // If we can't extract a proper name, return the full URL - return url; - } catch (_error) { - // If there's any error, return the full URL - return url; - } - } - - private normalizeRepoUrls(url: string): { - repositoryUrl: string; - cloneUrl: string; - } { - const clean = url.replace(/\.git$/, ""); - const clone = url.endsWith(".git") ? url : `${clean}.git`; - return { repositoryUrl: clean, cloneUrl: clone }; - } - - /** - * Get user's repositories using their GitHub token - */ - async getUserRepositories(token: string): Promise { - try { - const userOctokit = new Octokit({ auth: token }); - - // Fetch user's repositories (owned and collaborated) - const { data: repos } = - await userOctokit.rest.repos.listForAuthenticatedUser({ - sort: "updated", - per_page: 100, - type: "all", // Get all repos (owner, collaborator, org member) - }); - - return repos; - } catch (error) { - logger.error("Failed to fetch user repositories:", error); - throw new GitHubRepositoryError( - "getUserRepositories", - "user", - `Failed to fetch user repositories: ${error instanceof Error ? error.message : String(error)}`, - error instanceof Error ? error : undefined - ); - } - } - - /** - * Get cached repository for a user without creating - */ - async getUserRepository( - username: string, - slackUserId?: string - ): Promise { - // If a global repository override is configured, return it (highest priority) - if (this.config.repository) { - const { repositoryUrl, cloneUrl } = this.normalizeRepoUrls( - this.config.repository - ); - return { - username, - repositoryName: this.extractRepoNameFromUrl(this.config.repository), - repositoryUrl, - cloneUrl, - createdAt: Date.now(), - lastUsed: Date.now(), - }; - } - - // Check for user's selected repository from database - const selectedRepo = await this.getUserSelectedRepository( - username, - slackUserId - ); - if (selectedRepo) { - return selectedRepo; - } - - // Return cached repository if available - return this.repositories.get(username); - } - - /** - * Get user's selected repository from database - */ - private async getUserSelectedRepository( - username: string, - slackUserId?: string - ): Promise { - try { - logger.info( - `Checking for user-selected repository for ${username} (Slack ID: ${slackUserId || "unknown"})` - ); - const dbPool = getDbPool(this.databaseUrl || process.env.DATABASE_URL); - - let result; - - // If we have the Slack user ID, use it directly - if (slackUserId) { - result = await dbPool.query( - `SELECT ue.value as repo_url - FROM users u - JOIN user_environ ue ON u.id = ue.user_id - WHERE u.platform = 'slack' - AND u.platform_user_id = $1 - AND ue.name = 'SELECTED_REPOSITORY'`, - [slackUserId.toUpperCase()] - ); - } else { - // Fall back to searching by username pattern - result = await dbPool.query( - `SELECT ue.value as repo_url - FROM users u - JOIN user_environ ue ON u.id = ue.user_id - WHERE u.platform = 'slack' - AND ue.name = 'SELECTED_REPOSITORY' - ORDER BY u.updated_at DESC - LIMIT 1`, - [] - ); - } - - if (result.rows.length > 0 && result.rows[0].repo_url) { - const repoUrl = result.rows[0].repo_url; - const repoName = this.extractRepoNameFromUrl(repoUrl); - - logger.info( - `Found user-selected repository for ${username}: ${repoUrl}` - ); - - return { - username, - repositoryName: repoName, - repositoryUrl: repoUrl.replace(".git", ""), - cloneUrl: repoUrl.endsWith(".git") ? repoUrl : `${repoUrl}.git`, - createdAt: Date.now(), - lastUsed: Date.now(), - }; - } else { - logger.info(`No user-selected repository found for ${username}`); - } - } catch (error) { - logger.warn( - `Failed to get user selected repository for ${username}:`, - error - ); - } - return undefined; - } - - /** - * Ensure user repository exists, create if needed - */ - async ensureUserRepository(username: string): Promise { - try { - // If a global repository override is configured, use it (highest priority) - if (this.config.repository) { - // Create repository info from override URL (no caching for overrides) - const { repositoryUrl, cloneUrl } = this.normalizeRepoUrls( - this.config.repository - ); - const repository: UserRepository = { - username, - repositoryName: this.extractRepoNameFromUrl(this.config.repository), - repositoryUrl, - cloneUrl, - createdAt: Date.now(), - lastUsed: Date.now(), - }; - - logger.info( - `Using global repository override for user ${username}: ${repository.repositoryUrl}` - ); - return repository; - } - - // Check for user's selected repository from database - const selectedRepo = await this.getUserSelectedRepository(username); - if (selectedRepo) { - logger.info( - `Using user-selected repository for ${username}: ${selectedRepo.repositoryUrl}` - ); - // Cache it - this.repositories.set(username, selectedRepo); - return selectedRepo; - } - - // Check if we have cached repository info - const cached = this.repositories.get(username); - if (cached) { - // Update last used timestamp - cached.lastUsed = Date.now(); - return cached; - } - - // No user-specific repository configured - // Return null to indicate no repository is set - // The worker will create a local workspace without git operations - logger.info( - `No repository configured for user ${username}. Will use local workspace only.` - ); - return null; - } catch (error) { - throw new GitHubRepositoryError( - "ensureUserRepository", - username, - `Failed to ensure repository for user ${username}`, - error as Error - ); - } - } - - /** - * Get repository information - */ - async getRepositoryInfo(username: string): Promise { - return this.repositories.get(username) || null; - } - - /** - * Fetch README.md content from a GitHub repository - */ - async fetchReadmeContent( - owner: string, - repo: string - ): Promise { - try { - logger.info(`Fetching README.md from ${owner}/${repo}...`); - - const response = await this.octokit.rest.repos.getContent({ - owner, - repo, - path: "README.md", - }); - - if ("content" in response.data && response.data.content) { - const content = Buffer.from(response.data.content, "base64").toString( - "utf8" - ); - logger.info( - `Successfully fetched README.md from ${owner}/${repo} (${content.length} characters)` - ); - return content; - } - - logger.warn( - `README.md found but no content available for ${owner}/${repo}` - ); - return null; - } catch (error: any) { - if (error.status === 404) { - logger.info(`README.md not found for ${owner}/${repo}`); - return null; - } - logger.error(`Failed to fetch README.md from ${owner}/${repo}:`, error); - return null; - } - } -} diff --git a/packages/dispatcher/src/index.ts b/packages/dispatcher/src/index.ts index f8845bff..6d7deca8 100644 --- a/packages/dispatcher/src/index.ts +++ b/packages/dispatcher/src/index.ts @@ -8,7 +8,7 @@ initSentry(); import { join } from "node:path"; import { App, ExpressReceiver, LogLevel } from "@slack/bolt"; import { config as dotenvConfig } from "dotenv"; -import { GitHubRepositoryManager } from "./github/repository-manager"; +import { GitHubRepositoryManager } from "../../../modules/github/repository-manager"; import { createLogger } from "@peerbot/shared"; const logger = createLogger("dispatcher"); @@ -444,7 +444,7 @@ export class SlackDispatcher { text: "Select Repository", emoji: true, }, - action_id: "select_repository", + action_id: "open_repository_modal", style: "primary", }, ], diff --git a/packages/dispatcher/src/oauth/github-oauth-handler.ts b/packages/dispatcher/src/oauth/github-oauth-handler.ts deleted file mode 100644 index f4155baa..00000000 --- a/packages/dispatcher/src/oauth/github-oauth-handler.ts +++ /dev/null @@ -1,311 +0,0 @@ -#!/usr/bin/env bun - -import axios from "axios"; -import type { Request, Response } from "express"; -import { getDbPool } from "@peerbot/shared"; -import { createLogger } from "@peerbot/shared"; -import { encrypt, decrypt } from "@peerbot/shared"; - -const logger = createLogger("dispatcher"); - -export class GitHubOAuthHandler { - private dbPool: any; - private homeTabCallback?: (userId: string) => Promise; - - constructor( - databaseUrl: string, - homeTabCallback?: (userId: string) => Promise - ) { - this.dbPool = getDbPool(databaseUrl); - this.homeTabCallback = homeTabCallback; - } - - /** - * Handle OAuth authorization request - */ - async handleAuthorize(req: Request, res: Response): Promise { - const clientId = process.env.GITHUB_CLIENT_ID; - - if (!clientId) { - res.status(500).json({ error: "GitHub OAuth not configured" }); - return; - } - - const userId = req.query.user_id as string; - if (!userId) { - res.status(400).json({ error: "User ID required" }); - return; - } - - // Create encrypted state with user ID and timestamp - const stateData = JSON.stringify({ - userId, - timestamp: Date.now(), - }); - const state = encrypt(stateData); - - // Use INGRESS_URL if provided, otherwise construct from request - const baseUrl = - process.env.INGRESS_URL || `${req.protocol}://${req.get("host")}`; - - // If using default localhost, ensure we use port 8080 - const redirectUri = - baseUrl.includes("localhost") && !process.env.INGRESS_URL - ? `http://localhost:8080/api/github/oauth/callback` - : `${baseUrl}/api/github/oauth/callback`; - - // GitHub OAuth URL with full repo scope - const githubAuthUrl = - `https://github.com/login/oauth/authorize?` + - `client_id=${clientId}&` + - `redirect_uri=${encodeURIComponent(redirectUri)}&` + - `scope=${encodeURIComponent("repo read:user")}&` + - `state=${encodeURIComponent(state)}`; - - res.redirect(githubAuthUrl); - } - - /** - * Handle OAuth callback - */ - async handleCallback(req: Request, res: Response): Promise { - try { - const { code, state } = req.query; - - if (!code || !state) { - res.status(400).send("Missing code or state parameter"); - return; - } - - // Decrypt and validate state - let stateData; - try { - stateData = JSON.parse(decrypt(state as string)); - } catch (error) { - res.status(400).send("Invalid state parameter"); - return; - } - - // Check timestamp (expire after 10 minutes) - if (Date.now() - stateData.timestamp > 10 * 60 * 1000) { - res.status(400).send("State parameter expired"); - return; - } - - // Exchange code for access token - const tokenResponse = await axios.post( - "https://github.com/login/oauth/access_token", - { - client_id: process.env.GITHUB_CLIENT_ID, - client_secret: process.env.GITHUB_CLIENT_SECRET, - code, - }, - { - headers: { - Accept: "application/json", - }, - } - ); - - const accessToken = tokenResponse.data.access_token; - if (!accessToken) { - throw new Error("Failed to get access token"); - } - - // Get user info from GitHub - const userResponse = await axios.get("https://api.github.com/user", { - headers: { - Authorization: `Bearer ${accessToken}`, - }, - }); - - const githubUsername = userResponse.data.login; - - // Store token in database - const userId = stateData.userId.toUpperCase(); // Slack user IDs are uppercase - - // First ensure user exists - await this.dbPool.query( - `INSERT INTO users (platform, platform_user_id) - VALUES ('slack', $1) - ON CONFLICT (platform, platform_user_id) DO NOTHING`, - [userId] - ); - - // Get user ID - const userResult = await this.dbPool.query( - `SELECT id FROM users WHERE platform = 'slack' AND platform_user_id = $1`, - [userId] - ); - const userDbId = userResult.rows[0].id; - - // Store GitHub token and username (token encrypted at rest) - const encToken = encrypt(accessToken); - await this.dbPool.query( - `INSERT INTO user_environ (user_id, channel_id, repository, name, value, type) - VALUES ($1, NULL, NULL, 'GITHUB_TOKEN', $2, 'user') - ON CONFLICT (user_id, channel_id, repository, name) - DO UPDATE SET value = EXCLUDED.value, updated_at = NOW()`, - [userDbId, encToken] - ); - - await this.dbPool.query( - `INSERT INTO user_environ (user_id, channel_id, repository, name, value, type) - VALUES ($1, NULL, NULL, 'GITHUB_USER', $2, 'user') - ON CONFLICT (user_id, channel_id, repository, name) - DO UPDATE SET value = EXCLUDED.value, updated_at = NOW()`, - [userDbId, githubUsername] - ); - - // Trigger home tab refresh and send repository selection message - try { - if (this.homeTabCallback) { - logger.info( - `Triggering home tab refresh for user ${userId} after GitHub OAuth` - ); - await this.homeTabCallback(userId); - - // Also send a DM with repository selection prompt - // This requires access to Slack client, which we'll pass through the callback - } - } catch (error) { - logger.error("Failed to trigger home tab refresh:", error); - // Don't fail the OAuth flow if home tab refresh fails - } - - // Success page - res.send(` - - - - GitHub Connected - - - -
-
✅
-

GitHub Connected!

-

Successfully connected as @${githubUsername}

-

You can now return to Slack and select your repositories.

-
You can close this window.
-
- - - - `); - } catch (error) { - logger.error("OAuth callback error:", error); - res.status(500).send(` - - - - Connection Failed - - - -
-
❌
-

Connection Failed

-

Failed to connect to GitHub. Please try again.

-

Error: ${error instanceof Error ? error.message : "Unknown error"}

-
- - - `); - } - } - - /** - * Handle logout - */ - async handleLogout(req: Request, res: Response): Promise { - try { - const userId = req.body.user_id; - if (!userId) { - res.status(400).json({ error: "User ID required" }); - return; - } - - // Remove GitHub token and username from database - await this.dbPool.query( - `DELETE FROM user_environ - WHERE user_id = (SELECT id FROM users WHERE platform = 'slack' AND platform_user_id = $1) - AND name IN ('GITHUB_TOKEN', 'GITHUB_USER')`, - [userId.toUpperCase()] - ); - - res.json({ success: true }); - } catch (error) { - logger.error("Logout error:", error); - res.status(500).json({ error: "Failed to logout" }); - } - } - - /** - * Cleanup resources - */ - async cleanup(): Promise { - /* no-op for shared pool */ - } -} diff --git a/packages/dispatcher/src/queue/slack-thread-processor.ts b/packages/dispatcher/src/queue/slack-thread-processor.ts index 9eb2b50c..43827491 100644 --- a/packages/dispatcher/src/queue/slack-thread-processor.ts +++ b/packages/dispatcher/src/queue/slack-thread-processor.ts @@ -2,7 +2,7 @@ import { WebClient } from "@slack/web-api"; import PgBoss from "pg-boss"; -import type { GitHubRepositoryManager } from "../github/repository-manager"; +import type { GitHubRepositoryManager } from "../../../../modules/github/repository-manager"; import { processMarkdownAndBlockkit } from "../converters/blockkit-processor"; import { generateGitHubActionButtons } from "../converters/github-actions"; import { convertMarkdownToSlack } from "../converters/markdown-to-slack"; diff --git a/packages/dispatcher/src/simple-http.ts b/packages/dispatcher/src/simple-http.ts index b92c2997..46f89b84 100644 --- a/packages/dispatcher/src/simple-http.ts +++ b/packages/dispatcher/src/simple-http.ts @@ -3,7 +3,7 @@ import express from "express"; import { createLogger } from "@peerbot/shared"; const logger = createLogger("http"); -import { GitHubOAuthHandler } from "./oauth/github-oauth-handler"; +import { GitHubOAuthHandler } from "../../../modules/github/handlers"; import type { AnthropicProxy } from "./proxy/anthropic-proxy"; let healthServer: http.Server | null = null; diff --git a/packages/dispatcher/src/slack/handlers/action-handler.ts b/packages/dispatcher/src/slack/handlers/action-handler.ts index ce3f7ef1..b3bb9a5e 100644 --- a/packages/dispatcher/src/slack/handlers/action-handler.ts +++ b/packages/dispatcher/src/slack/handlers/action-handler.ts @@ -2,16 +2,16 @@ import { createLogger } from "@peerbot/shared"; // import { getDbPool } from "@peerbot/shared"; // Currently unused const logger = createLogger("dispatcher"); -import type { GitHubRepositoryManager } from "../../github/repository-manager"; +import type { GitHubRepositoryManager } from "../../../../../modules/github/repository-manager"; import type { QueueProducer } from "../../queue/task-queue-producer"; import type { DispatcherConfig, SlackContext } from "../../types"; -import { generateGitHubAuthUrl } from "../../utils/github-utils"; +import { generateGitHubAuthUrl } from "../../../../../modules/github/utils"; import type { MessageHandler } from "./message-handler"; import { handleGitHubConnect, handleGitHubLogout, getUserGitHubInfo, -} from "./github-handler"; +} from "../../../../../modules/github/handlers"; import { moduleRegistry } from "../../../../../modules"; import { handleTryDemo } from "./demo-handler"; import { openRepositoryModal } from "./repository-modal-utils"; diff --git a/packages/dispatcher/src/slack/handlers/github-handler.ts b/packages/dispatcher/src/slack/handlers/github-handler.ts deleted file mode 100644 index 73ab6507..00000000 --- a/packages/dispatcher/src/slack/handlers/github-handler.ts +++ /dev/null @@ -1,142 +0,0 @@ -import { createLogger } from "@peerbot/shared"; -import { getDbPool } from "@peerbot/shared"; - -const logger = createLogger("dispatcher"); -import { ErrorHandler } from "../../utils/error-handler"; -import { decrypt } from "@peerbot/shared"; -import { generateGitHubAuthUrl } from "../../utils/github-utils"; - -/** - * Handle GitHub connect action - initiates OAuth flow - */ -export async function handleGitHubConnect( - userId: string, - channelId: string, - client: any -): Promise { - try { - // Generate OAuth URL with user ID - const authUrl = generateGitHubAuthUrl(userId); - - // Check if this is a DM or channel - // const isDM = channelId.startsWith('D'); // Currently unused - - await client.chat.postMessage({ - channel: channelId, - blocks: [ - { - type: "section", - text: { - type: "mrkdwn", - text: "🔗 *Connect your GitHub account*\n\nClick the link below to authorize Peerbot to access your GitHub repositories:", - }, - }, - { - type: "section", - text: { - type: "mrkdwn", - text: `<${authUrl}|Connect with GitHub>`, - }, - }, - { - type: "context", - elements: [ - { - type: "mrkdwn", - text: "🔒 We'll only access repositories you explicitly grant permission to", - }, - ], - }, - ], - }); - - logger.info(`GitHub connect initiated for user ${userId}`); - } catch (error) { - ErrorHandler.logAndHandle("initiate GitHub connect", error, { userId }); - await client.chat.postMessage({ - channel: channelId, - text: ErrorHandler.formatSlackError( - error, - "Failed to generate GitHub login link" - ), - }); - } -} - -/** - * Handle GitHub logout - */ -export async function handleGitHubLogout( - userId: string, - client: any -): Promise { - try { - const dbPool = getDbPool(process.env.DATABASE_URL!); - - // Remove GitHub token and username from database - await dbPool.query( - `DELETE FROM user_environ - WHERE user_id = (SELECT id FROM users WHERE platform = 'slack' AND platform_user_id = $1) - AND name IN ('GITHUB_TOKEN', 'GITHUB_USER')`, - [userId.toUpperCase()] - ); - - logger.info(`GitHub logout completed for user ${userId}`); - - // Send confirmation - const im = await client.conversations.open({ users: userId }); - if (im.channel?.id) { - await client.chat.postMessage({ - channel: im.channel.id, - text: "✅ Successfully logged out from GitHub", - }); - } - } catch (error) { - logger.error(`Failed to logout user ${userId}:`, error); - } -} - -/** - * Get user's GitHub info from database - */ -export async function getUserGitHubInfo(userId: string): Promise<{ - token: string | null; - username: string | null; -}> { - try { - const dbPool = getDbPool(process.env.DATABASE_URL!); - - const result = await dbPool.query( - `SELECT name, value - FROM user_environ - WHERE user_id = (SELECT id FROM users WHERE platform = 'slack' AND platform_user_id = $1) - AND name IN ('GITHUB_TOKEN', 'GITHUB_USER')`, - [userId.toUpperCase()] - ); - - let token = null; - let username = null; - - for (const row of result.rows) { - if (row.name === "GITHUB_TOKEN") { - try { - // Token is encrypted, decrypt it - token = decrypt(row.value); - } catch (error) { - logger.error( - `Failed to decrypt GitHub token for user ${userId}:`, - error - ); - token = null; - } - } else if (row.name === "GITHUB_USER") { - username = row.value; - } - } - - return { token, username }; - } catch (error) { - logger.error(`Failed to get GitHub info for user ${userId}:`, error); - return { token: null, username: null }; - } -} diff --git a/packages/dispatcher/src/slack/handlers/message-handler.ts b/packages/dispatcher/src/slack/handlers/message-handler.ts index fa71a97c..3285fac7 100644 --- a/packages/dispatcher/src/slack/handlers/message-handler.ts +++ b/packages/dispatcher/src/slack/handlers/message-handler.ts @@ -13,7 +13,7 @@ import type { SlackContext, ThreadSession, } from "../../types"; -import type { GitHubRepositoryManager } from "../../github/repository-manager"; +import type { GitHubRepositoryManager } from "../../../../../modules/github/repository-manager"; import { getDbPool } from "@peerbot/shared"; export class MessageHandler { diff --git a/packages/dispatcher/src/slack/handlers/repository-modal-utils.ts b/packages/dispatcher/src/slack/handlers/repository-modal-utils.ts index 16377c96..4b5e56d7 100644 --- a/packages/dispatcher/src/slack/handlers/repository-modal-utils.ts +++ b/packages/dispatcher/src/slack/handlers/repository-modal-utils.ts @@ -1,5 +1,5 @@ import { createLogger } from "@peerbot/shared"; -import { generateGitHubAuthUrl } from "../../utils/github-utils"; +import { generateGitHubAuthUrl } from "../../../../../modules/github/utils"; const logger = createLogger("dispatcher"); diff --git a/packages/dispatcher/src/slack/handlers/shortcut-command-handler.ts b/packages/dispatcher/src/slack/handlers/shortcut-command-handler.ts index 4ff0a037..80b14498 100644 --- a/packages/dispatcher/src/slack/handlers/shortcut-command-handler.ts +++ b/packages/dispatcher/src/slack/handlers/shortcut-command-handler.ts @@ -8,7 +8,7 @@ import { encrypt } from "@peerbot/shared"; import type { MessageHandler } from "./message-handler"; import type { ActionHandler } from "./action-handler"; import { openRepositoryModal } from "./repository-modal-utils"; -import { getUserGitHubInfo } from "./github-handler"; +import { getUserGitHubInfo } from "../../../../../modules/github/handlers"; export class ShortcutCommandHandler { constructor( diff --git a/packages/dispatcher/src/slack/slack-event-handlers.ts b/packages/dispatcher/src/slack/slack-event-handlers.ts index a50342ac..35e89717 100644 --- a/packages/dispatcher/src/slack/slack-event-handlers.ts +++ b/packages/dispatcher/src/slack/slack-event-handlers.ts @@ -4,7 +4,7 @@ import type { App } from "@slack/bolt"; import { createLogger } from "@peerbot/shared"; const logger = createLogger("slack-events"); -import type { GitHubRepositoryManager } from "../github/repository-manager"; +import type { GitHubRepositoryManager } from "../../../../modules/github/repository-manager"; import type { QueueProducer } from "../queue/task-queue-producer"; import type { DispatcherConfig } from "../types"; import { @@ -17,7 +17,7 @@ import { setupTeamJoinHandler } from "./handlers/welcome-handler"; import { MessageHandler } from "./handlers/message-handler"; import { ActionHandler } from "./handlers/action-handler"; import { ShortcutCommandHandler } from "./handlers/shortcut-command-handler"; -import { getUserGitHubInfo } from "./handlers/github-handler"; +import { getUserGitHubInfo } from "../../../../modules/github/handlers"; /** * Queue-based Slack event handlers that route messages to appropriate queues diff --git a/packages/dispatcher/src/utils/github-utils.ts b/packages/dispatcher/src/utils/github-utils.ts deleted file mode 100644 index 4999fff7..00000000 --- a/packages/dispatcher/src/utils/github-utils.ts +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Utility functions for GitHub-related operations - */ - -/** - * Generate GitHub OAuth URL for user authentication - */ -export function generateGitHubAuthUrl(userId: string): string { - const baseUrl = process.env.INGRESS_URL || "http://localhost:8080"; - return `${baseUrl}/api/github/oauth/authorize?user_id=${userId}`; -} diff --git a/packages/orchestrator/src/base/BaseDeploymentManager.ts b/packages/orchestrator/src/base/BaseDeploymentManager.ts index 6034387e..c227aa0d 100644 --- a/packages/orchestrator/src/base/BaseDeploymentManager.ts +++ b/packages/orchestrator/src/base/BaseDeploymentManager.ts @@ -213,14 +213,14 @@ export abstract class BaseDeploymentManager { /** * Generate environment variables common to all deployment types */ - protected generateEnvironmentVariables( + protected async generateEnvironmentVariables( username: string, userId: string, deploymentName: string, messageData?: any, includeSecrets: boolean = true, userEnvVars: Record = {} - ): { [key: string]: string } { + ): Promise<{ [key: string]: string }> { // Parse database connection string to extract host and port const dbUrl = new URL(this.config.database.connectionString); const dbHost = dbUrl.hostname; diff --git a/packages/orchestrator/src/docker/DockerDeploymentManager.ts b/packages/orchestrator/src/docker/DockerDeploymentManager.ts index ad6050c5..3b251fc4 100644 --- a/packages/orchestrator/src/docker/DockerDeploymentManager.ts +++ b/packages/orchestrator/src/docker/DockerDeploymentManager.ts @@ -126,7 +126,7 @@ export class DockerDeploymentManager extends BaseDeploymentManager { const password = await this.getPasswordForUser(username); // Get common environment variables from base class - const commonEnvVars = this.generateEnvironmentVariables( + const commonEnvVars = await this.generateEnvironmentVariables( username, userId, deploymentName, diff --git a/packages/orchestrator/src/k8s/K8sDeploymentManager.ts b/packages/orchestrator/src/k8s/K8sDeploymentManager.ts index 3779ae4a..ee7efceb 100644 --- a/packages/orchestrator/src/k8s/K8sDeploymentManager.ts +++ b/packages/orchestrator/src/k8s/K8sDeploymentManager.ts @@ -234,7 +234,7 @@ export class K8sDeploymentManager extends BaseDeploymentManager { } // Get environment variables before creating the deployment spec - const envVars = this.generateEnvironmentVariables( + const envVars = await this.generateEnvironmentVariables( username, userId, deploymentName, diff --git a/packages/orchestrator/src/subprocess/SubprocessDeploymentManager.ts b/packages/orchestrator/src/subprocess/SubprocessDeploymentManager.ts index 847c41b4..d8e031f5 100644 --- a/packages/orchestrator/src/subprocess/SubprocessDeploymentManager.ts +++ b/packages/orchestrator/src/subprocess/SubprocessDeploymentManager.ts @@ -131,7 +131,7 @@ export class SubprocessDeploymentManager extends BaseDeploymentManager { const password = await this.getPasswordForUser(username); // Get common environment variables from base class - const commonEnvVars = this.generateEnvironmentVariables( + const commonEnvVars = await this.generateEnvironmentVariables( username, userId, deploymentName, From 5c20e59a9539af373ea74adff9a27f642cd89766 Mon Sep 17 00:00:00 2001 From: "claude[bot]" <209825114+claude[bot]@users.noreply.github.com> Date: Thu, 2 Oct 2025 22:32:37 +0000 Subject: [PATCH 03/12] feat: remove GitHub dependencies from core packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Remove GitHubConfig from dispatcher types - Update SlackEventHandlers to use module registry for GitHub access - Remove GitHub OAuth endpoints from simple-http.ts - Add null checks for GitHub module availability - Update ThreadResponseConsumer to get repository manager from modules - Clean up direct GitHub imports from core packages Co-authored-by: Burak Emre Kabakcı --- packages/dispatcher/src/index.ts | 69 +------------------ .../src/queue/slack-thread-processor.ts | 56 ++++++++------- packages/dispatcher/src/simple-http.ts | 26 +------ .../src/slack/slack-event-handlers.ts | 12 +++- packages/dispatcher/src/types.ts | 10 --- packages/worker/src/index.ts | 4 +- 6 files changed, 45 insertions(+), 132 deletions(-) diff --git a/packages/dispatcher/src/index.ts b/packages/dispatcher/src/index.ts index 6d7deca8..b360b798 100644 --- a/packages/dispatcher/src/index.ts +++ b/packages/dispatcher/src/index.ts @@ -8,7 +8,6 @@ initSentry(); import { join } from "node:path"; import { App, ExpressReceiver, LogLevel } from "@slack/bolt"; import { config as dotenvConfig } from "dotenv"; -import { GitHubRepositoryManager } from "../../../modules/github/repository-manager"; import { createLogger } from "@peerbot/shared"; const logger = createLogger("dispatcher"); @@ -22,13 +21,11 @@ import { setupHealthEndpoints } from "./simple-http"; import { SlackEventHandlers } from "./slack/slack-event-handlers"; import type { DispatcherConfig } from "./types"; import { moduleRegistry } from "../../../modules"; -import { GitHubModule } from "../../../modules/github"; export class SlackDispatcher { private app: App; private queueProducer: QueueProducer; private threadResponseConsumer?: ThreadResponseConsumer; - private repoManager: GitHubRepositoryManager; private eventHandlers?: SlackEventHandlers; private anthropicProxy?: AnthropicProxy; private config: DispatcherConfig; @@ -100,10 +97,6 @@ export class SlackDispatcher { // Initialize queue producer - use DATABASE_URL for consistency logger.info("Initializing queue mode"); this.queueProducer = new QueueProducer(config.queues.connectionString); - this.repoManager = new GitHubRepositoryManager( - config.github, - config.queues.connectionString - ); // ThreadResponseConsumer will be created after event handlers are initialized this.setupErrorHandling(); @@ -399,7 +392,6 @@ export class SlackDispatcher { this.eventHandlers = new SlackEventHandlers( this.app, this.queueProducer, - this.repoManager, config ); @@ -407,68 +399,11 @@ export class SlackDispatcher { this.threadResponseConsumer = new ThreadResponseConsumer( config.queues.connectionString, config.slack.token, - this.repoManager, this.eventHandlers.getUserMappings() ); - // Setup health endpoints with home tab update callback - setupHealthEndpoints( - this.anthropicProxy, - config.queues.connectionString, - async (userId: string) => { - if (this.eventHandlers) { - const client = this.app.client; - await (this.eventHandlers as any).updateAppHome(userId, client); - - // Send repository selection message after GitHub login - try { - const im = await client.conversations.open({ users: userId }); - await client.chat.postMessage({ - channel: im.channel?.id || userId, - text: "GitHub connected successfully!", - blocks: [ - { - type: "section", - text: { - type: "mrkdwn", - text: "✅ *GitHub connected successfully!*\n\nNow you can select a repository to work with:", - }, - }, - { - type: "actions", - elements: [ - { - type: "button", - text: { - type: "plain_text", - text: "Select Repository", - emoji: true, - }, - action_id: "open_repository_modal", - style: "primary", - }, - ], - }, - { - type: "context", - elements: [ - { - type: "mrkdwn", - text: "You can also visit the Home tab to manage your repositories", - }, - ], - }, - ], - }); - } catch (error) { - logger.error( - "Failed to send repository selection message:", - error - ); - } - } - } - ); + // Setup health endpoints + setupHealthEndpoints(this.anthropicProxy); } catch (error) { logger.error("Failed to get bot info:", error); throw new Error("Failed to initialize bot - could not get bot user ID"); diff --git a/packages/dispatcher/src/queue/slack-thread-processor.ts b/packages/dispatcher/src/queue/slack-thread-processor.ts index 43827491..0a0610f0 100644 --- a/packages/dispatcher/src/queue/slack-thread-processor.ts +++ b/packages/dispatcher/src/queue/slack-thread-processor.ts @@ -2,7 +2,7 @@ import { WebClient } from "@slack/web-api"; import PgBoss from "pg-boss"; -import type { GitHubRepositoryManager } from "../../../../modules/github/repository-manager"; +import { moduleRegistry } from "../../../../modules"; import { processMarkdownAndBlockkit } from "../converters/blockkit-processor"; import { generateGitHubActionButtons } from "../converters/github-actions"; import { convertMarkdownToSlack } from "../converters/markdown-to-slack"; @@ -36,20 +36,22 @@ export class ThreadResponseConsumer { private pgBoss: PgBoss; private slackClient: WebClient; private isRunning = false; - private repoManager: GitHubRepositoryManager; + private repoManager?: any; private userMappings: Map; // slackUserId -> githubUsername private sessionBotMessages: Map = new Map(); // sessionKey -> botMessageTs constructor( connectionString: string, slackToken: string, - repoManager: GitHubRepositoryManager, userMappings: Map ) { this.pgBoss = new PgBoss(connectionString); this.slackClient = new WebClient(slackToken); - this.repoManager = repoManager; this.userMappings = userMappings; + + // Get repository manager from GitHub module + const githubModule = moduleRegistry.getModule('github'); + this.repoManager = githubModule?.getRepositoryManager(); } /** @@ -392,16 +394,19 @@ export class ThreadResponseConsumer { ); } - // Get GitHub action buttons for this session - const githubActionButtons = await generateGitHubActionButtons( - userId, - data.gitBranch, - data.hasGitChanges, - data.pullRequestUrl, - this.userMappings, - this.repoManager, - this.slackClient - ); + // Get GitHub action buttons for this session if GitHub module is available + let githubActionButtons: any[] | undefined; + if (this.repoManager) { + githubActionButtons = await generateGitHubActionButtons( + userId, + data.gitBranch, + data.hasGitChanges, + data.pullRequestUrl, + this.userMappings, + this.repoManager, + this.slackClient + ); + } // Add GitHub action buttons as a separate actions block if (githubActionButtons && githubActionButtons.length > 0) { @@ -612,16 +617,19 @@ export class ThreadResponseConsumer { ], }; - // Get GitHub action buttons for this session - const githubActionButtons = await generateGitHubActionButtons( - userId, - data.gitBranch, - data.hasGitChanges, - data.pullRequestUrl, - this.userMappings, - this.repoManager, - this.slackClient - ); + // Get GitHub action buttons for this session if GitHub module is available + let githubActionButtons: any[] | undefined; + if (this.repoManager) { + githubActionButtons = await generateGitHubActionButtons( + userId, + data.gitBranch, + data.hasGitChanges, + data.pullRequestUrl, + this.userMappings, + this.repoManager, + this.slackClient + ); + } // Add GitHub action buttons if available if (githubActionButtons && githubActionButtons.length > 0) { diff --git a/packages/dispatcher/src/simple-http.ts b/packages/dispatcher/src/simple-http.ts index 46f89b84..102d97de 100644 --- a/packages/dispatcher/src/simple-http.ts +++ b/packages/dispatcher/src/simple-http.ts @@ -3,17 +3,13 @@ import express from "express"; import { createLogger } from "@peerbot/shared"; const logger = createLogger("http"); -import { GitHubOAuthHandler } from "../../../modules/github/handlers"; import type { AnthropicProxy } from "./proxy/anthropic-proxy"; let healthServer: http.Server | null = null; let proxyApp: express.Application | null = null; -let oauthHandler: GitHubOAuthHandler | null = null; export function setupHealthEndpoints( - anthropicProxy?: AnthropicProxy, - databaseUrl?: string, - homeTabUpdateCallback?: (userId: string) => Promise + anthropicProxy?: AnthropicProxy ) { if (healthServer) return; @@ -43,26 +39,6 @@ export function setupHealthEndpoints( logger.info("✅ Anthropic proxy enabled at :8080/api/anthropic"); } - // Add GitHub OAuth endpoints if database URL is provided - if (databaseUrl && process.env.GITHUB_CLIENT_ID) { - oauthHandler = new GitHubOAuthHandler(databaseUrl, homeTabUpdateCallback); - - proxyApp.get("/api/github/oauth/authorize", (req, res) => - oauthHandler!.handleAuthorize(req, res) - ); - - proxyApp.get("/api/github/oauth/callback", (req, res) => - oauthHandler!.handleCallback(req, res) - ); - - proxyApp.post("/api/github/logout", (req, res) => - oauthHandler!.handleLogout(req, res) - ); - - logger.info( - "✅ GitHub OAuth endpoints enabled at :8080/api/github/oauth/*" - ); - } // Create HTTP server with Express app healthServer = http.createServer(proxyApp); diff --git a/packages/dispatcher/src/slack/slack-event-handlers.ts b/packages/dispatcher/src/slack/slack-event-handlers.ts index 35e89717..693f8ba5 100644 --- a/packages/dispatcher/src/slack/slack-event-handlers.ts +++ b/packages/dispatcher/src/slack/slack-event-handlers.ts @@ -4,7 +4,6 @@ import type { App } from "@slack/bolt"; import { createLogger } from "@peerbot/shared"; const logger = createLogger("slack-events"); -import type { GitHubRepositoryManager } from "../../../../modules/github/repository-manager"; import type { QueueProducer } from "../queue/task-queue-producer"; import type { DispatcherConfig } from "../types"; import { @@ -17,7 +16,7 @@ import { setupTeamJoinHandler } from "./handlers/welcome-handler"; import { MessageHandler } from "./handlers/message-handler"; import { ActionHandler } from "./handlers/action-handler"; import { ShortcutCommandHandler } from "./handlers/shortcut-command-handler"; -import { getUserGitHubInfo } from "../../../../modules/github/handlers"; +import { moduleRegistry } from "../../../../modules"; /** * Queue-based Slack event handlers that route messages to appropriate queues @@ -31,9 +30,16 @@ export class SlackEventHandlers { constructor( private app: App, queueProducer: QueueProducer, - repoManager: GitHubRepositoryManager, private config: DispatcherConfig ) { + // Get repository manager from GitHub module + const githubModule = moduleRegistry.getModule('github'); + const repoManager = githubModule?.getRepositoryManager(); + + if (!repoManager) { + throw new Error('GitHub module not available or repository manager not found'); + } + // Initialize specialized handlers this.messageHandler = new MessageHandler( queueProducer, diff --git a/packages/dispatcher/src/types.ts b/packages/dispatcher/src/types.ts index ea1b06b1..c63ddca8 100644 --- a/packages/dispatcher/src/types.ts +++ b/packages/dispatcher/src/types.ts @@ -19,15 +19,6 @@ export interface SlackConfig { allowPrivateChannels?: boolean; } -export interface GitHubConfig { - token: string; - organization: string; - repoTemplate?: string; - repository?: string; // Override repository URL instead of creating user-specific ones - clientId?: string; // GitHub OAuth App Client ID - clientSecret?: string; // GitHub OAuth App Client Secret - ingressUrl?: string; // Public URL for OAuth callbacks -} export interface QueueConfig { directMessage: string; @@ -47,7 +38,6 @@ export interface AnthropicProxyConfig { export interface DispatcherConfig { slack: SlackConfig; - github: GitHubConfig; claude: Partial; sessionTimeoutMinutes: number; logLevel?: LogLevel; diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts index 049b868c..1d39f890 100644 --- a/packages/worker/src/index.ts +++ b/packages/worker/src/index.ts @@ -8,7 +8,6 @@ import { initSentry, createLogger } from "@peerbot/shared"; initSentry(); import { moduleRegistry } from "../../../modules"; -import { GitHubModule } from "../../../modules/github"; const logger = createLogger("worker"); @@ -26,8 +25,7 @@ export { ClaudeWorker } from "./claude-worker"; * Main entry point - now supports both queue-based and legacy workers */ async function main() { - // Register modules - moduleRegistry.register(new GitHubModule()); + // Initialize available modules await moduleRegistry.initAll(); logger.info("✅ Modules initialized"); From a85ba56ee26ae6c1412f6b0b53ef2d2ac8183ae0 Mon Sep 17 00:00:00 2001 From: "claude[bot]" <209825114+claude[bot]@users.noreply.github.com> Date: Sat, 4 Oct 2025 08:17:14 +0000 Subject: [PATCH 04/12] refactor: complete GitHub module system implementation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fix dispatcher missing imports and config for GitHubModule - Move GitHub-specific code from worker to GitHub module - Extract addGitHubAuth, OAuth URL generation, and CLI auth to module - Fix type system conflicts between modules and shared packages - Make GitHub tokens optional in worker types - Update prompts to be module-agnostic - Resolve GitHubConfig type conflicts using shared base types This completes the pluggable module architecture, removing ~200 lines of GitHub code from core packages while preserving all functionality. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-authored-by: Burak Emre Kabakcı --- modules/github/index.ts | 49 +++++++++++++- modules/github/repository-manager.ts | 14 ++-- modules/github/workspace.ts | 34 ++++++---- packages/dispatcher/src/index.ts | 1 + packages/dispatcher/src/types.ts | 10 ++- packages/worker/src/core/prompt-generation.ts | 2 +- packages/worker/src/task-queue-integration.ts | 66 ++++++++++++------- packages/worker/src/types.ts | 4 +- packages/worker/src/workspace-manager.ts | 52 +++++---------- 9 files changed, 147 insertions(+), 85 deletions(-) diff --git a/modules/github/index.ts b/modules/github/index.ts index 813de350..c4e1ecd8 100644 --- a/modules/github/index.ts +++ b/modules/github/index.ts @@ -16,11 +16,11 @@ export class GitHubModule implements HomeTabModule, WorkerModule, OrchestratorMo this.repoManager = new GitHubRepositoryManager( { + clientId: process.env.GITHUB_CLIENT_ID!, + clientSecret: process.env.GITHUB_CLIENT_SECRET!, token: process.env.GITHUB_TOKEN || '', organization: process.env.GITHUB_ORGANIZATION || '', repository: process.env.GITHUB_REPOSITORY, - clientId: process.env.GITHUB_CLIENT_ID!, - clientSecret: process.env.GITHUB_CLIENT_SECRET!, ingressUrl: process.env.INGRESS_URL, }, process.env.DATABASE_URL @@ -182,6 +182,51 @@ export class GitHubModule implements HomeTabModule, WorkerModule, OrchestratorMo return baseEnv; } + /** + * Add GitHub authentication to repository URL + */ + addGitHubAuth(repositoryUrl: string, token: string): string { + try { + const url = new URL(repositoryUrl); + if (url.hostname === "github.com") { + // Convert to authenticated HTTPS URL + url.username = "x-access-token"; + url.password = token; + return url.toString(); + } + return repositoryUrl; + } catch (error) { + console.warn(`Failed to parse repository URL: ${repositoryUrl}`, error); + return repositoryUrl; + } + } + + /** + * Generate GitHub OAuth URL for authentication + */ + generateOAuthUrl(userId: string): string { + const baseUrl = process.env.INGRESS_URL || "http://localhost:8080"; + return `${baseUrl}/api/github/oauth/authorize?userId=${userId}`; + } + + /** + * Check if GitHub CLI is authenticated + */ + async isGitHubCLIAuthenticated(workingDir: string): Promise { + try { + const { execSync } = await import('child_process'); + execSync("gh auth status", { + cwd: workingDir, + stdio: "pipe", + timeout: 3000, + }); + return true; + } catch (error) { + // If GH_TOKEN is set, authentication is available even if gh auth status fails + return !!(process.env.GH_TOKEN || process.env.GITHUB_TOKEN); + } + } + private extractRepoName(url: string): string { const match = url.match(/github\.com[:/]([^/]+)\/([^/]+?)(?:\.git)?$/); return match ? `${match[1]}/${match[2]}` : url; diff --git a/modules/github/repository-manager.ts b/modules/github/repository-manager.ts index 9fb6aa94..ccd3ae06 100644 --- a/modules/github/repository-manager.ts +++ b/modules/github/repository-manager.ts @@ -6,14 +6,12 @@ import { createLogger } from "@peerbot/shared"; const logger = createLogger("github-module"); // Import from shared package -import { GitHubRepositoryError, getDbPool } from "@peerbot/shared"; +import { GitHubRepositoryError, getDbPool, type GitHubConfig } from "@peerbot/shared"; -export interface GitHubConfig { - token: string; - organization: string; +export interface GitHubModuleConfig extends GitHubConfig { + token?: string; + organization?: string; repository?: string; - clientId: string; - clientSecret: string; ingressUrl?: string; } @@ -28,11 +26,11 @@ export interface UserRepository { export class GitHubRepositoryManager { private octokit: Octokit; - private config: GitHubConfig; + private config: GitHubModuleConfig; private repositories = new Map(); // username -> repository info private databaseUrl?: string; - constructor(config: GitHubConfig, databaseUrl?: string) { + constructor(config: GitHubModuleConfig, databaseUrl?: string) { this.config = config; this.databaseUrl = databaseUrl; diff --git a/modules/github/workspace.ts b/modules/github/workspace.ts index 9b59bc98..805bc421 100644 --- a/modules/github/workspace.ts +++ b/modules/github/workspace.ts @@ -50,19 +50,7 @@ export class GitHubWorkspaceManager { // Setup GitHub CLI authentication if token is available if (this.config.githubToken) { - try { - logger.info("Setting up GitHub CLI authentication..."); - await execAsync( - `echo "${this.config.githubToken}" | gh auth login --with-token`, - { - cwd: userDirectory, - env: { ...process.env, GH_TOKEN: this.config.githubToken }, - } - ); - logger.info("GitHub CLI authentication configured successfully"); - } catch (error) { - logger.warn("Failed to setup GitHub CLI authentication:", error); - } + await this.setupGitHubCLI(userDirectory); } // Get repository info @@ -80,6 +68,26 @@ export class GitHubWorkspaceManager { } } + /** + * Setup GitHub CLI authentication + */ + async setupGitHubCLI(userDirectory: string): Promise { + try { + logger.info("Setting up GitHub CLI authentication..."); + await execAsync( + `echo "${this.config.githubToken}" | gh auth login --with-token`, + { + cwd: userDirectory, + env: { ...process.env, GH_TOKEN: this.config.githubToken }, + } + ); + logger.info("GitHub CLI authentication configured successfully"); + } catch (error) { + logger.warn("Failed to setup GitHub CLI authentication:", error); + throw error; + } + } + /** * Setup git configuration for the user */ diff --git a/packages/dispatcher/src/index.ts b/packages/dispatcher/src/index.ts index b360b798..1268eea7 100644 --- a/packages/dispatcher/src/index.ts +++ b/packages/dispatcher/src/index.ts @@ -21,6 +21,7 @@ import { setupHealthEndpoints } from "./simple-http"; import { SlackEventHandlers } from "./slack/slack-event-handlers"; import type { DispatcherConfig } from "./types"; import { moduleRegistry } from "../../../modules"; +import { GitHubModule } from "../../../modules/github"; export class SlackDispatcher { private app: App; diff --git a/packages/dispatcher/src/types.ts b/packages/dispatcher/src/types.ts index c63ddca8..762e6c4b 100644 --- a/packages/dispatcher/src/types.ts +++ b/packages/dispatcher/src/types.ts @@ -1,6 +1,6 @@ #!/usr/bin/env bun -import type { ClaudeExecutionOptions } from "@peerbot/shared"; +import type { ClaudeExecutionOptions, GitHubConfig } from "@peerbot/shared"; import type { LogLevel } from "@slack/bolt"; export interface SlackConfig { @@ -36,8 +36,16 @@ export interface AnthropicProxyConfig { anthropicBaseUrl?: string; } +export interface DispatcherGitHubConfig extends GitHubConfig { + token?: string; + organization?: string; + repository?: string; + ingressUrl?: string; +} + export interface DispatcherConfig { slack: SlackConfig; + github: DispatcherGitHubConfig; claude: Partial; sessionTimeoutMinutes: number; logLevel?: LogLevel; diff --git a/packages/worker/src/core/prompt-generation.ts b/packages/worker/src/core/prompt-generation.ts index 63607b6d..1c4beb34 100644 --- a/packages/worker/src/core/prompt-generation.ts +++ b/packages/worker/src/core/prompt-generation.ts @@ -118,7 +118,7 @@ You are responding to a user in Slack through a Kubernetes-based Claude Code sys 1. **Progress Updates**: Your progress is automatically streamed to Slack 2. **Thread Context**: This conversation may be part of an ongoing thread 3. **File Changes**: After making any code changes, you MUST commit and push them using git commands (git add, git commit, git push) -4. **Links**: Users will receive GitHub.dev links and PR creation links +4. **Links**: Users will receive repository links and PR creation links when working with repositories 5. **Timeout**: You have a 5-minute timeout - work efficiently Keep responses concise but helpful. Focus on solving the user's specific request. diff --git a/packages/worker/src/task-queue-integration.ts b/packages/worker/src/task-queue-integration.ts index afd35cd1..6f986e74 100644 --- a/packages/worker/src/task-queue-integration.ts +++ b/packages/worker/src/task-queue-integration.ts @@ -277,31 +277,40 @@ export class QueueIntegration { `About to check for PR in directory: ${workingDir}, branch: ${branch}` ); - // First check if gh CLI is authenticated + // Check if GitHub CLI is authenticated through module + let isAuthenticated = false; try { - logger.info("Checking GitHub CLI authentication..."); - execSync("gh auth status", { - cwd: workingDir, - stdio: "pipe", - timeout: 3000, // 3 second timeout - }); - logger.info("GitHub CLI is authenticated"); - } catch (authError: any) { - // If GH_TOKEN is set, authentication is available even if gh auth status fails - if (process.env.GH_TOKEN || process.env.GITHUB_TOKEN) { - logger.info( - "Using GH_TOKEN/GITHUB_TOKEN environment variable for authentication" - ); + const { moduleRegistry } = await import('../../../modules'); + const githubModule = moduleRegistry.getModule('github'); + if (githubModule && 'isGitHubCLIAuthenticated' in githubModule) { + isAuthenticated = await (githubModule as any).isGitHubCLIAuthenticated(workingDir); + logger.info(`GitHub CLI authentication status: ${isAuthenticated}`); } else { - logger.warn( - "GitHub CLI not authenticated and no token found, skipping PR detection" - ); - return { - branch, - hasGitChanges: status.hasChanges, - pullRequestUrl: undefined, - }; + // Fallback to direct check + logger.info("Checking GitHub CLI authentication (fallback)..."); + execSync("gh auth status", { + cwd: workingDir, + stdio: "pipe", + timeout: 3000, + }); + isAuthenticated = true; } + } catch (authError: any) { + logger.warn("GitHub CLI not authenticated, skipping PR detection"); + return { + branch, + hasGitChanges: status.hasChanges, + pullRequestUrl: undefined, + }; + } + + if (!isAuthenticated) { + logger.warn("GitHub CLI not authenticated, skipping PR detection"); + return { + branch, + hasGitChanges: status.hasChanges, + pullRequestUrl: undefined, + }; } // Try to get PR information @@ -586,8 +595,17 @@ export class QueueIntegration { } try { - // Generate GitHub OAuth URL for authentication - const authUrl = `${process.env.INGRESS_URL || "http://localhost:8080"}/api/github/oauth/authorize?userId=${process.env.USER_ID}`; + // Generate GitHub OAuth URL for authentication through module + let authUrl = `${process.env.INGRESS_URL || "http://localhost:8080"}/login`; + try { + const { moduleRegistry } = await import('../../../modules'); + const githubModule = moduleRegistry.getModule('github'); + if (githubModule && 'generateOAuthUrl' in githubModule) { + authUrl = (githubModule as any).generateOAuthUrl(process.env.USER_ID || ''); + } + } catch (moduleError) { + console.warn('Failed to get GitHub OAuth URL from module, using fallback:', moduleError); + } // Create a rich message with buttons const blocks = [ diff --git a/packages/worker/src/types.ts b/packages/worker/src/types.ts index f6c007a4..bf0a2395 100644 --- a/packages/worker/src/types.ts +++ b/packages/worker/src/types.ts @@ -15,13 +15,13 @@ export interface WorkerConfig { resumeSessionId?: string; // Claude session ID to resume from workspace: { baseDirectory: string; - githubToken: string; + githubToken?: string; // Optional - provided by GitHub module if needed }; } export interface WorkspaceSetupConfig { baseDirectory: string; - githubToken: string; + githubToken?: string; // Optional - provided by GitHub module if needed } export interface GitRepository { diff --git a/packages/worker/src/workspace-manager.ts b/packages/worker/src/workspace-manager.ts index 25456e3b..14c838c2 100644 --- a/packages/worker/src/workspace-manager.ts +++ b/packages/worker/src/workspace-manager.ts @@ -116,20 +116,17 @@ export class WorkspaceManager { // Setup git configuration await this.setupGitConfig(userDirectory, username); - // Setup GitHub CLI authentication if token is available - if (process.env.GITHUB_TOKEN) { + // Setup GitHub CLI authentication through module if available + if (process.env.GITHUB_TOKEN && repositoryUrl.includes('github.com')) { try { - logger.info("Setting up GitHub CLI authentication..."); - await execAsync( - `echo "${process.env.GITHUB_TOKEN}" | gh auth login --with-token`, - { - cwd: userDirectory, - env: { ...process.env, GH_TOKEN: process.env.GITHUB_TOKEN }, - } - ); - logger.info("GitHub CLI authentication configured successfully"); + const { moduleRegistry } = await import('../../../modules'); + const githubModule = moduleRegistry.getModule('github'); + if (githubModule && 'init' in githubModule) { + // GitHub module will handle CLI authentication during its own setup + logger.info("GitHub module will handle CLI authentication"); + } } catch (error) { - logger.warn("Failed to setup GitHub CLI authentication:", error); + logger.warn("Failed to setup GitHub CLI authentication through module:", error); // Non-fatal - continue without gh CLI } } @@ -181,8 +178,15 @@ export class WorkspaceManager { `Cloning repository ${repositoryUrl} to ${targetDirectory}...` ); - // Use GitHub token for authentication - const authenticatedUrl = this.addGitHubAuth(repositoryUrl); + // Use GitHub token for authentication through module + let authenticatedUrl = repositoryUrl; + if (this.config.githubToken && repositoryUrl.includes('github.com')) { + const { moduleRegistry } = await import('../../../modules'); + const githubModule = moduleRegistry.getModule('github'); + if (githubModule && 'addGitHubAuth' in githubModule) { + authenticatedUrl = (githubModule as any).addGitHubAuth(repositoryUrl, this.config.githubToken); + } + } const { stderr } = await execAsync( `git clone "${authenticatedUrl}" "${targetDirectory}"`, @@ -389,26 +393,6 @@ export class WorkspaceManager { } } - /** - * Add GitHub authentication to URL - */ - private addGitHubAuth(repositoryUrl: string): string { - try { - const url = new URL(repositoryUrl); - - if (url.hostname === "github.com") { - // Convert to authenticated HTTPS URL - url.username = "x-access-token"; - url.password = this.config.githubToken; - return url.toString(); - } - - return repositoryUrl; - } catch (error) { - logger.warn("Failed to parse repository URL, using as-is:", error); - return repositoryUrl; - } - } /** * Check if directory exists From 912c39d9e1b81874c629f64592c384eafacd9661 Mon Sep 17 00:00:00 2001 From: "claude[bot]" <209825114+claude[bot]@users.noreply.github.com> Date: Sat, 4 Oct 2025 08:48:15 +0000 Subject: [PATCH 05/12] refactor: move GitHub config to module, clean dispatcher of GitHub dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Move GitHubConfigSchema and loadGitHubConfig() from shared to GitHub module - Remove DispatcherGitHubConfig and GitHub config from dispatcher - Update module registry to auto-register available modules - Achieve clean hook-based architecture where dispatcher has no GitHub dependencies - Core packages now interact with GitHub only through module hooks Co-authored-by: Burak Emre Kabakcı --- modules/github/index.ts | 43 ++++++++++++++++++++++------ modules/github/repository-manager.ts | 12 ++++---- modules/index.ts | 12 ++++++++ packages/dispatcher/src/index.ts | 19 ------------ packages/dispatcher/src/types.ts | 9 +----- packages/shared/src/config/index.ts | 23 --------------- 6 files changed, 53 insertions(+), 65 deletions(-) diff --git a/modules/github/index.ts b/modules/github/index.ts index c4e1ecd8..3fdd7763 100644 --- a/modules/github/index.ts +++ b/modules/github/index.ts @@ -1,8 +1,41 @@ +import { z } from 'zod'; import type { HomeTabModule, WorkerModule, OrchestratorModule, SessionContext, ActionButton } from '../types'; import { GitHubRepositoryManager } from './repository-manager'; import { handleGitHubConnect, handleGitHubLogout, getUserGitHubInfo } from './handlers'; import { generateGitHubAuthUrl } from './utils'; +// GitHub configuration schema (module-specific) +export const GitHubConfigSchema = z.object({ + appId: z.string().optional(), + privateKey: z.string().optional(), + clientId: z.string().optional(), + clientSecret: z.string().optional(), + installationId: z.string().optional(), + token: z.string().optional(), + organization: z.string().optional(), + repository: z.string().optional(), + ingressUrl: z.string().optional(), +}); + +export type GitHubConfig = z.infer; + +/** + * Loads GitHub configuration from environment variables + */ +export function loadGitHubConfig(): GitHubConfig { + return GitHubConfigSchema.parse({ + appId: process.env.GITHUB_APP_ID, + privateKey: process.env.GITHUB_PRIVATE_KEY, + clientId: process.env.GITHUB_CLIENT_ID, + clientSecret: process.env.GITHUB_CLIENT_SECRET, + installationId: process.env.GITHUB_INSTALLATION_ID, + token: process.env.GITHUB_TOKEN, + organization: process.env.GITHUB_ORGANIZATION, + repository: process.env.GITHUB_REPOSITORY, + ingressUrl: process.env.INGRESS_URL, + }); +} + export class GitHubModule implements HomeTabModule, WorkerModule, OrchestratorModule { name = 'github'; private repoManager?: GitHubRepositoryManager; @@ -14,15 +47,9 @@ export class GitHubModule implements HomeTabModule, WorkerModule, OrchestratorMo async init(): Promise { if (!this.isEnabled()) return; + const config = loadGitHubConfig(); this.repoManager = new GitHubRepositoryManager( - { - clientId: process.env.GITHUB_CLIENT_ID!, - clientSecret: process.env.GITHUB_CLIENT_SECRET!, - token: process.env.GITHUB_TOKEN || '', - organization: process.env.GITHUB_ORGANIZATION || '', - repository: process.env.GITHUB_REPOSITORY, - ingressUrl: process.env.INGRESS_URL, - }, + config, process.env.DATABASE_URL ); } diff --git a/modules/github/repository-manager.ts b/modules/github/repository-manager.ts index ccd3ae06..e13acd56 100644 --- a/modules/github/repository-manager.ts +++ b/modules/github/repository-manager.ts @@ -6,13 +6,11 @@ import { createLogger } from "@peerbot/shared"; const logger = createLogger("github-module"); // Import from shared package -import { GitHubRepositoryError, getDbPool, type GitHubConfig } from "@peerbot/shared"; +import { GitHubRepositoryError, getDbPool } from "@peerbot/shared"; +import type { GitHubConfig } from './index'; export interface GitHubModuleConfig extends GitHubConfig { - token?: string; - organization?: string; - repository?: string; - ingressUrl?: string; + // All config is already in the base GitHubConfig type } export interface UserRepository { @@ -26,11 +24,11 @@ export interface UserRepository { export class GitHubRepositoryManager { private octokit: Octokit; - private config: GitHubModuleConfig; + private config: GitHubConfig; private repositories = new Map(); // username -> repository info private databaseUrl?: string; - constructor(config: GitHubModuleConfig, databaseUrl?: string) { + constructor(config: GitHubConfig, databaseUrl?: string) { this.config = config; this.databaseUrl = databaseUrl; diff --git a/modules/index.ts b/modules/index.ts index fb94c0ee..2a26c04d 100644 --- a/modules/index.ts +++ b/modules/index.ts @@ -1,4 +1,5 @@ import type { ModuleInterface, HomeTabModule, WorkerModule, OrchestratorModule } from './types'; +import { GitHubModule } from './github'; export class ModuleRegistry { private modules: Map = new Map(); @@ -10,6 +11,9 @@ export class ModuleRegistry { } async initAll(): Promise { + // Auto-register available modules if not already registered + this.autoRegisterModules(); + for (const module of this.modules.values()) { if (module.init) { await module.init(); @@ -17,6 +21,14 @@ export class ModuleRegistry { } } + private autoRegisterModules(): void { + // Auto-register GitHub module + const gitHubModule = new GitHubModule(); + if (!this.modules.has(gitHubModule.name)) { + this.register(gitHubModule); + } + } + getHomeTabModules(): HomeTabModule[] { return Array.from(this.modules.values()).filter( (m): m is HomeTabModule => 'renderHomeTab' in m diff --git a/packages/dispatcher/src/index.ts b/packages/dispatcher/src/index.ts index 1268eea7..9e5ffec7 100644 --- a/packages/dispatcher/src/index.ts +++ b/packages/dispatcher/src/index.ts @@ -21,7 +21,6 @@ import { setupHealthEndpoints } from "./simple-http"; import { SlackEventHandlers } from "./slack/slack-event-handlers"; import type { DispatcherConfig } from "./types"; import { moduleRegistry } from "../../../modules"; -import { GitHubModule } from "../../../modules/github"; export class SlackDispatcher { private app: App; @@ -34,9 +33,6 @@ export class SlackDispatcher { constructor(config: DispatcherConfig) { this.config = config; - // Register modules - moduleRegistry.register(new GitHubModule()); - if (!config.queues?.connectionString) { throw new Error("Queue connection string is required"); } @@ -301,7 +297,6 @@ export class SlackDispatcher { // Log configuration logger.info("Configuration:"); - logger.info(`- GitHub Organization: ${this.config.github.organization}`); logger.info( `- Session Timeout: ${this.config.sessionTimeoutMinutes} minutes` ); @@ -521,14 +516,6 @@ async function main() { allowedUsers: process.env.SLACK_ALLOWED_USERS?.split(","), allowedChannels: process.env.SLACK_ALLOWED_CHANNELS?.split(","), }, - github: { - token: process.env.GITHUB_TOKEN || "", // Optional - users can use OAuth instead - organization: process.env.GITHUB_ORGANIZATION || "", // Empty string means use authenticated user - repository: process.env.GITHUB_REPOSITORY, // Optional override repository URL - clientId: process.env.GITHUB_CLIENT_ID, // GitHub OAuth App Client ID - clientSecret: process.env.GITHUB_CLIENT_SECRET, // GitHub OAuth App Client Secret - ingressUrl: process.env.INGRESS_URL, // Public URL for OAuth callbacks - }, claude: { allowedTools: process.env.ALLOWED_TOOLS?.split(","), model: process.env.AGENT_DEFAULT_MODEL, @@ -571,12 +558,6 @@ async function main() { if (!config.slack.token) { throw new Error("SLACK_BOT_TOKEN is required"); } - // GITHUB_TOKEN is optional - users can login with OAuth instead - if (!config.github.token) { - logger.warn( - "GITHUB_TOKEN not provided - users must login with GitHub OAuth to access repositories" - ); - } if (!config.queues.connectionString) { throw new Error("DATABASE_URL is required"); } diff --git a/packages/dispatcher/src/types.ts b/packages/dispatcher/src/types.ts index 762e6c4b..a568a50a 100644 --- a/packages/dispatcher/src/types.ts +++ b/packages/dispatcher/src/types.ts @@ -1,6 +1,6 @@ #!/usr/bin/env bun -import type { ClaudeExecutionOptions, GitHubConfig } from "@peerbot/shared"; +import type { ClaudeExecutionOptions } from "@peerbot/shared"; import type { LogLevel } from "@slack/bolt"; export interface SlackConfig { @@ -36,16 +36,9 @@ export interface AnthropicProxyConfig { anthropicBaseUrl?: string; } -export interface DispatcherGitHubConfig extends GitHubConfig { - token?: string; - organization?: string; - repository?: string; - ingressUrl?: string; -} export interface DispatcherConfig { slack: SlackConfig; - github: DispatcherGitHubConfig; claude: Partial; sessionTimeoutMinutes: number; logLevel?: LogLevel; diff --git a/packages/shared/src/config/index.ts b/packages/shared/src/config/index.ts index b7498e51..f73d60af 100644 --- a/packages/shared/src/config/index.ts +++ b/packages/shared/src/config/index.ts @@ -24,14 +24,6 @@ export const SlackConfigSchema = z.object({ .default("INFO"), }); -// GitHub configuration schema -export const GitHubConfigSchema = z.object({ - appId: z.string().optional(), - privateKey: z.string().optional(), - clientId: z.string().optional(), - clientSecret: z.string().optional(), - installationId: z.string().optional(), -}); // Claude configuration schema export const ClaudeConfigSchema = z.object({ @@ -77,7 +69,6 @@ export const KubernetesConfigSchema = z.object({ export const AppConfigSchema = z.object({ database: DatabaseConfigSchema, slack: SlackConfigSchema, - github: GitHubConfigSchema.optional(), claude: ClaudeConfigSchema.optional(), queue: QueueConfigSchema, kubernetes: KubernetesConfigSchema.optional(), @@ -85,7 +76,6 @@ export const AppConfigSchema = z.object({ export type DatabaseConfig = z.infer; export type SlackConfig = z.infer; -export type GitHubConfig = z.infer; export type ClaudeConfig = z.infer; export type QueueConfig = z.infer; export type KubernetesConfig = z.infer; @@ -122,18 +112,6 @@ export function loadSlackConfig(): SlackConfig { return SlackConfigSchema.parse(config); } -/** - * Loads GitHub configuration from environment variables - */ -export function loadGitHubConfig(): GitHubConfig { - return GitHubConfigSchema.parse({ - appId: process.env.GITHUB_APP_ID, - privateKey: process.env.GITHUB_PRIVATE_KEY, - clientId: process.env.GITHUB_CLIENT_ID, - clientSecret: process.env.GITHUB_CLIENT_SECRET, - installationId: process.env.GITHUB_INSTALLATION_ID, - }); -} /** * Loads Claude configuration from environment variables @@ -194,7 +172,6 @@ export function loadConfig(): AppConfig { return AppConfigSchema.parse({ database: loadDatabaseConfig(), slack: loadSlackConfig(), - github: loadGitHubConfig(), claude: loadClaudeConfig(), queue: loadQueueConfig(), kubernetes: loadKubernetesConfig(), From 073dad08fe6cc2b5bc313cec447fdd7663e04bca Mon Sep 17 00:00:00 2001 From: "claude[bot]" <209825114+claude[bot]@users.noreply.github.com> Date: Sat, 4 Oct 2025 17:27:10 +0000 Subject: [PATCH 06/12] refactor: complete module system implementation - remove GitHub dependencies from core packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add DispatcherModule interface for action button generation and handling - Move GitHub action button logic to modules/github/actions.ts - Update GitHubModule to implement all interfaces (HomeTab, Worker, Orchestrator, Dispatcher) - Replace direct GitHub imports with dynamic module calls in dispatcher - Move GitHubRepositoryError to GitHub module from shared package - Make GitHub dependencies optional in core constructors for graceful degradation - Enable system to work without GitHub module while preserving all functionality Co-authored-by: Burak Emre Kabakcı --- modules/github/actions.ts | 172 +++++++++++++++++ modules/github/errors.ts | 25 +++ modules/github/index.ts | 62 ++++++- modules/github/repository-manager.ts | 5 +- modules/index.ts | 8 +- modules/types.ts | 19 ++ .../src/converters/github-actions.ts | 174 +----------------- .../src/queue/slack-thread-processor.ts | 84 +++++---- .../src/slack/handlers/action-handler.ts | 119 +++++------- .../src/slack/handlers/message-handler.ts | 4 +- .../slack/handlers/repository-modal-utils.ts | 3 +- .../handlers/shortcut-command-handler.ts | 7 +- .../src/slack/slack-event-handlers.ts | 4 +- .../shared/src/errors/dispatcher-errors.ts | 27 +-- packages/shared/src/errors/index.ts | 3 +- 15 files changed, 402 insertions(+), 314 deletions(-) create mode 100644 modules/github/actions.ts create mode 100644 modules/github/errors.ts diff --git a/modules/github/actions.ts b/modules/github/actions.ts new file mode 100644 index 00000000..9e157c4e --- /dev/null +++ b/modules/github/actions.ts @@ -0,0 +1,172 @@ +#!/usr/bin/env bun + +import type { GitHubRepositoryManager } from "./repository-manager"; +import { generateGitHubAuthUrl } from "./utils"; +import { getUserGitHubInfo } from "./handlers"; +import { generateDeterministicActionId } from "../../packages/dispatcher/src/converters/blockkit-processor"; +import { createLogger } from "@peerbot/shared"; + +const logger = createLogger("github-module"); + +/** + * Generate GitHub action buttons for the session branch + */ +export async function generateGitHubActionButtons( + userId: string, + gitBranch: string | undefined, + hasGitChanges: boolean | undefined, + pullRequestUrl: string | undefined, + userMappings: Map, + repoManager: GitHubRepositoryManager, + slackClient?: any +): Promise { + try { + logger.debug( + `Generating GitHub action buttons for user ${userId}, gitBranch: ${gitBranch}, hasGitChanges: ${hasGitChanges}, pullRequestUrl: ${pullRequestUrl}` + ); + + // If no git branch provided, don't show buttons + if (!gitBranch) { + logger.debug(`No git branch provided, skipping GitHub buttons`); + return undefined; + } + + // Check if we're on a session branch (indicates work has been done) + const isSessionBranch = gitBranch.startsWith("claude/"); + + // Show buttons if: + // 1. There are uncommitted changes, OR + // 2. An existing PR exists, OR + // 3. We're on a session branch (even if all changes are committed) + if (!hasGitChanges && !pullRequestUrl && !isSessionBranch) { + logger.debug( + `No git changes, no PR, and not a session branch, skipping GitHub buttons` + ); + return undefined; + } + + // Get GitHub username from Slack user ID + let githubUsername = userMappings.get(userId); + if (!githubUsername && slackClient) { + // Create user mapping on-demand if not found + logger.debug(`Creating on-demand user mapping for user ${userId}`); + try { + const userInfo = await slackClient.users.info({ user: userId }); + const user = userInfo.user; + + let username = + user.profile?.display_name || user.profile?.real_name || user.name; + if (!username) { + username = userId; + } + + // Sanitize username for GitHub + username = username + .toLowerCase() + .replace(/[^a-z0-9-]/g, "-") + .replace(/^-|-$/g, ""); + + username = `user-${username}`; + userMappings.set(userId, username); + githubUsername = username; + + logger.info(`Created user mapping: ${userId} -> ${username}`); + } catch (error) { + logger.error(`Failed to create user mapping for ${userId}:`, error); + const fallbackUsername = `user-${userId.substring(0, 8)}`; + userMappings.set(userId, fallbackUsername); + githubUsername = fallbackUsername; + } + } + + if (!githubUsername) { + logger.debug(`No GitHub username mapping found for user ${userId}`); + return undefined; + } + + // Get repository information, create if needed + const repository = await repoManager.ensureUserRepository(githubUsername); + if (!repository) { + logger.debug(`No repository found for GitHub user ${githubUsername}`); + return undefined; + } + + const repoUrl = repository.repositoryUrl; + const repoPath = repoUrl.replace("https://github.com/", ""); + + logger.info( + `Showing action buttons for branch: ${gitBranch}, PR exists: ${!!pullRequestUrl}` + ); + + // Check if user has GitHub authentication + const githubInfo = await getUserGitHubInfo(userId); + const hasGitHubAuth = !!githubInfo.token; + + // Generate auth URL for GitHub OAuth + const authUrl = generateGitHubAuthUrl(userId); + + const buttons: any[] = []; + + // Show appropriate PR button based on whether PR exists + if (pullRequestUrl) { + // PR exists - show view button with green checkmark + buttons.push({ + type: "button", + text: { type: "plain_text", text: "🔀 View Pull Request" }, + url: pullRequestUrl, + action_id: generateDeterministicActionId( + `view_pr_${repoPath}_${gitBranch}`, + "github_view_pr" + ), + }); + } else if (hasGitChanges || isSessionBranch) { + // Build dynamic prompt based on GitHub auth status + let prompt: string; + + if (hasGitHubAuth) { + // User is authenticated - agent should handle forking if needed + prompt = `📝 *Create Pull Request* + +• Review the code and cleanup any temporary files +• Commit all changes to Git +• Try to push: \`git push -u origin ${gitBranch}\` +• If push fails due to permissions: + - Fork the repository: \`gh repo fork --clone=false\` + - Add fork as remote: \`git remote add fork $(gh repo fork --clone=false 2>&1 | grep -o 'https://[^ ]*')\` + - Push to fork: \`git push -u fork ${gitBranch}\` +• Create PR: \`gh pr create --web\``; + } else { + // User is not authenticated - provide auth link + prompt = `📝 *Create Pull Request* + +• Review the code and cleanup any temporary files +• Commit all changes to Git +• Try to push: \`git push -u origin ${gitBranch}\` +• If you get a permission error (403), ask the user to authenticate [here](${authUrl}) +• After authentication, retry the push +• Create PR: \`gh pr create --web\``; + } + + // No PR but has changes OR on a session branch - show create PR button + buttons.push({ + type: "button", + text: { type: "plain_text", text: "🔀 Create Pull Request" }, + action_id: generateDeterministicActionId( + `pr_${repoPath}_${gitBranch}`, + "github_pr" + ), + value: JSON.stringify({ + action: "create_pr", + repo: repoPath, + branch: gitBranch, + prompt: prompt, + }), + }); + } + + return buttons.length > 0 ? buttons : undefined; + } catch (_error) { + // Return undefined on error - this will result in no action buttons being added + return undefined; + } +} \ No newline at end of file diff --git a/modules/github/errors.ts b/modules/github/errors.ts new file mode 100644 index 00000000..cf249816 --- /dev/null +++ b/modules/github/errors.ts @@ -0,0 +1,25 @@ +import { BaseError } from "@peerbot/shared"; + +/** + * Error class for GitHub repository operations + */ +export class GitHubRepositoryError extends BaseError { + readonly name = "GitHubRepositoryError"; + + constructor( + public operation: string, + public username: string, + message: string, + cause?: Error + ) { + super(message, cause); + } + + toJSON(): Record { + return { + ...super.toJSON(), + operation: this.operation, + username: this.username, + }; + } +} \ No newline at end of file diff --git a/modules/github/index.ts b/modules/github/index.ts index 3fdd7763..fa504053 100644 --- a/modules/github/index.ts +++ b/modules/github/index.ts @@ -1,5 +1,5 @@ import { z } from 'zod'; -import type { HomeTabModule, WorkerModule, OrchestratorModule, SessionContext, ActionButton } from '../types'; +import type { HomeTabModule, WorkerModule, OrchestratorModule, DispatcherModule, SessionContext, ActionButton, ThreadContext } from '../types'; import { GitHubRepositoryManager } from './repository-manager'; import { handleGitHubConnect, handleGitHubLogout, getUserGitHubInfo } from './handlers'; import { generateGitHubAuthUrl } from './utils'; @@ -36,7 +36,7 @@ export function loadGitHubConfig(): GitHubConfig { }); } -export class GitHubModule implements HomeTabModule, WorkerModule, OrchestratorModule { +export class GitHubModule implements HomeTabModule, WorkerModule, OrchestratorModule, DispatcherModule { name = 'github'; private repoManager?: GitHubRepositoryManager; @@ -259,6 +259,61 @@ export class GitHubModule implements HomeTabModule, WorkerModule, OrchestratorMo return match ? `${match[1]}/${match[2]}` : url; } + async generateActionButtons(context: ThreadContext): Promise { + if (!this.repoManager) { + return []; + } + + const { generateGitHubActionButtons } = await import('./actions'); + const buttons = await generateGitHubActionButtons( + context.userId, + context.gitBranch, + context.hasGitChanges, + context.pullRequestUrl, + context.userMappings, + this.repoManager, + context.slackClient + ); + + return buttons?.map(button => ({ + text: button.text?.text || '', + action_id: button.action_id, + style: button.style, + value: button.value + })) || []; + } + + async handleAction(actionId: string, userId: string, context: any): Promise { + // Handle GitHub-specific actions + switch (actionId) { + case "github_login": + const { handleGitHubConnect } = await import('./handlers'); + await handleGitHubConnect(userId, context.channelId, context.client); + return true; + + case "github_logout": + const { handleGitHubLogout } = await import('./handlers'); + await handleGitHubLogout(userId, context.client); + // Update home tab after logout - delegate back to action handler + if (context.updateAppHome) { + await context.updateAppHome(userId, context.client); + } + return true; + + case "open_repository_modal": + // This is handled by repository-modal-utils which should also be moved to module + return false; // Let dispatcher handle for now + + default: + // Check if it's a GitHub-specific action (prefixed with github_ or contains repo operations) + if (actionId.startsWith('github_') || actionId.includes('pr_') || actionId.includes('view_pr_')) { + // This is a GitHub action but not one we handle directly + return false; + } + return false; + } + } + getRepositoryManager(): GitHubRepositoryManager | undefined { return this.repoManager; } @@ -266,4 +321,5 @@ export class GitHubModule implements HomeTabModule, WorkerModule, OrchestratorMo export * from './repository-manager'; export * from './handlers'; -export * from './utils'; \ No newline at end of file +export * from './utils'; +export * from './errors'; \ No newline at end of file diff --git a/modules/github/repository-manager.ts b/modules/github/repository-manager.ts index e13acd56..3df07483 100644 --- a/modules/github/repository-manager.ts +++ b/modules/github/repository-manager.ts @@ -5,8 +5,9 @@ import { createLogger } from "@peerbot/shared"; const logger = createLogger("github-module"); -// Import from shared package -import { GitHubRepositoryError, getDbPool } from "@peerbot/shared"; +// Import from shared package and local module +import { getDbPool } from "@peerbot/shared"; +import { GitHubRepositoryError } from './errors'; import type { GitHubConfig } from './index'; export interface GitHubModuleConfig extends GitHubConfig { diff --git a/modules/index.ts b/modules/index.ts index 2a26c04d..69eff799 100644 --- a/modules/index.ts +++ b/modules/index.ts @@ -1,4 +1,4 @@ -import type { ModuleInterface, HomeTabModule, WorkerModule, OrchestratorModule } from './types'; +import type { ModuleInterface, HomeTabModule, WorkerModule, OrchestratorModule, DispatcherModule } from './types'; import { GitHubModule } from './github'; export class ModuleRegistry { @@ -47,6 +47,12 @@ export class ModuleRegistry { ); } + getDispatcherModules(): DispatcherModule[] { + return Array.from(this.modules.values()).filter( + (m): m is DispatcherModule => 'generateActionButtons' in m + ); + } + getModule(name: string): T | undefined { return this.modules.get(name) as T; } diff --git a/modules/types.ts b/modules/types.ts index 72fd4c04..dc81217b 100644 --- a/modules/types.ts +++ b/modules/types.ts @@ -36,6 +36,14 @@ export interface OrchestratorModule extends ModuleInterface { getContainerAddress?(): string; } +export interface DispatcherModule extends ModuleInterface { + /** Generate action buttons for thread responses */ + generateActionButtons?(context: ThreadContext): Promise; + + /** Handle action button clicks */ + handleAction?(actionId: string, userId: string, context: any): Promise; +} + export interface SessionContext { userId: string; threadId: string; @@ -49,4 +57,15 @@ export interface ActionButton { action_id: string; style?: 'primary' | 'danger'; value?: string; +} + +export interface ThreadContext { + userId: string; + channelId: string; + threadTs: string; + gitBranch?: string; + hasGitChanges?: boolean; + pullRequestUrl?: string; + userMappings: Map; + slackClient?: any; } \ No newline at end of file diff --git a/packages/dispatcher/src/converters/github-actions.ts b/packages/dispatcher/src/converters/github-actions.ts index 1c889d60..fa69db3d 100644 --- a/packages/dispatcher/src/converters/github-actions.ts +++ b/packages/dispatcher/src/converters/github-actions.ts @@ -1,172 +1,2 @@ -#!/usr/bin/env bun - -import type { GitHubRepositoryManager } from "../../../../modules/github/repository-manager"; -import { generateGitHubAuthUrl } from "../../../../modules/github/utils"; -import { getUserGitHubInfo } from "../../../../modules/github/handlers"; -import { generateDeterministicActionId } from "./blockkit-processor"; -import { createLogger } from "@peerbot/shared"; - -const logger = createLogger("dispatcher"); - -/** - * Generate GitHub action buttons for the session branch - */ -export async function generateGitHubActionButtons( - userId: string, - gitBranch: string | undefined, - hasGitChanges: boolean | undefined, - pullRequestUrl: string | undefined, - userMappings: Map, - repoManager: GitHubRepositoryManager, - slackClient?: any -): Promise { - try { - logger.debug( - `Generating GitHub action buttons for user ${userId}, gitBranch: ${gitBranch}, hasGitChanges: ${hasGitChanges}, pullRequestUrl: ${pullRequestUrl}` - ); - - // If no git branch provided, don't show buttons - if (!gitBranch) { - logger.debug(`No git branch provided, skipping GitHub buttons`); - return undefined; - } - - // Check if we're on a session branch (indicates work has been done) - const isSessionBranch = gitBranch.startsWith("claude/"); - - // Show buttons if: - // 1. There are uncommitted changes, OR - // 2. An existing PR exists, OR - // 3. We're on a session branch (even if all changes are committed) - if (!hasGitChanges && !pullRequestUrl && !isSessionBranch) { - logger.debug( - `No git changes, no PR, and not a session branch, skipping GitHub buttons` - ); - return undefined; - } - - // Get GitHub username from Slack user ID - let githubUsername = userMappings.get(userId); - if (!githubUsername && slackClient) { - // Create user mapping on-demand if not found - logger.debug(`Creating on-demand user mapping for user ${userId}`); - try { - const userInfo = await slackClient.users.info({ user: userId }); - const user = userInfo.user; - - let username = - user.profile?.display_name || user.profile?.real_name || user.name; - if (!username) { - username = userId; - } - - // Sanitize username for GitHub - username = username - .toLowerCase() - .replace(/[^a-z0-9-]/g, "-") - .replace(/^-|-$/g, ""); - - username = `user-${username}`; - userMappings.set(userId, username); - githubUsername = username; - - logger.info(`Created user mapping: ${userId} -> ${username}`); - } catch (error) { - logger.error(`Failed to create user mapping for ${userId}:`, error); - const fallbackUsername = `user-${userId.substring(0, 8)}`; - userMappings.set(userId, fallbackUsername); - githubUsername = fallbackUsername; - } - } - - if (!githubUsername) { - logger.debug(`No GitHub username mapping found for user ${userId}`); - return undefined; - } - - // Get repository information, create if needed - const repository = await repoManager.ensureUserRepository(githubUsername); - if (!repository) { - logger.debug(`No repository found for GitHub user ${githubUsername}`); - return undefined; - } - - const repoUrl = repository.repositoryUrl; - const repoPath = repoUrl.replace("https://github.com/", ""); - - logger.info( - `Showing action buttons for branch: ${gitBranch}, PR exists: ${!!pullRequestUrl}` - ); - - // Check if user has GitHub authentication - const githubInfo = await getUserGitHubInfo(userId); - const hasGitHubAuth = !!githubInfo.token; - - // Generate auth URL for GitHub OAuth - const authUrl = generateGitHubAuthUrl(userId); - - const buttons: any[] = []; - - // Show appropriate PR button based on whether PR exists - if (pullRequestUrl) { - // PR exists - show view button with green checkmark - buttons.push({ - type: "button", - text: { type: "plain_text", text: "🔀 View Pull Request" }, - url: pullRequestUrl, - action_id: generateDeterministicActionId( - `view_pr_${repoPath}_${gitBranch}`, - "github_view_pr" - ), - }); - } else if (hasGitChanges || isSessionBranch) { - // Build dynamic prompt based on GitHub auth status - let prompt: string; - - if (hasGitHubAuth) { - // User is authenticated - agent should handle forking if needed - prompt = `📝 *Create Pull Request* - -• Review the code and cleanup any temporary files -• Commit all changes to Git -• Try to push: \`git push -u origin ${gitBranch}\` -• If push fails due to permissions: - - Fork the repository: \`gh repo fork --clone=false\` - - Add fork as remote: \`git remote add fork $(gh repo fork --clone=false 2>&1 | grep -o 'https://[^ ]*')\` - - Push to fork: \`git push -u fork ${gitBranch}\` -• Create PR: \`gh pr create --web\``; - } else { - // User is not authenticated - provide auth link - prompt = `📝 *Create Pull Request* - -• Review the code and cleanup any temporary files -• Commit all changes to Git -• Try to push: \`git push -u origin ${gitBranch}\` -• If you get a permission error (403), ask the user to authenticate [here](${authUrl}) -• After authentication, retry the push -• Create PR: \`gh pr create --web\``; - } - - // No PR but has changes OR on a session branch - show create PR button - buttons.push({ - type: "button", - text: { type: "plain_text", text: "🔀 Create Pull Request" }, - action_id: generateDeterministicActionId( - `pr_${repoPath}_${gitBranch}`, - "github_pr" - ), - value: JSON.stringify({ - action: "create_pr", - repo: repoPath, - branch: gitBranch, - prompt: prompt, - }), - }); - } - - return buttons.length > 0 ? buttons : undefined; - } catch (_error) { - // Return undefined on error - this will result in no action buttons being added - return undefined; - } -} +// This file has been moved to modules/github/actions.ts +// Please remove this file \ No newline at end of file diff --git a/packages/dispatcher/src/queue/slack-thread-processor.ts b/packages/dispatcher/src/queue/slack-thread-processor.ts index 0a0610f0..a676a913 100644 --- a/packages/dispatcher/src/queue/slack-thread-processor.ts +++ b/packages/dispatcher/src/queue/slack-thread-processor.ts @@ -4,7 +4,7 @@ import { WebClient } from "@slack/web-api"; import PgBoss from "pg-boss"; import { moduleRegistry } from "../../../../modules"; import { processMarkdownAndBlockkit } from "../converters/blockkit-processor"; -import { generateGitHubActionButtons } from "../converters/github-actions"; +// GitHub action buttons now handled through module system import { convertMarkdownToSlack } from "../converters/markdown-to-slack"; import { createLogger } from "@peerbot/shared"; @@ -394,22 +394,33 @@ export class ThreadResponseConsumer { ); } - // Get GitHub action buttons for this session if GitHub module is available - let githubActionButtons: any[] | undefined; - if (this.repoManager) { - githubActionButtons = await generateGitHubActionButtons( - userId, - data.gitBranch, - data.hasGitChanges, - data.pullRequestUrl, - this.userMappings, - this.repoManager, - this.slackClient - ); + // Get action buttons from modules + let actionButtons: any[] = []; + const dispatcherModules = moduleRegistry.getDispatcherModules(); + for (const module of dispatcherModules) { + if (module.generateActionButtons) { + const moduleButtons = await module.generateActionButtons({ + userId, + channelId: data.channelId, + threadTs: data.threadTs, + gitBranch: data.gitBranch, + hasGitChanges: data.hasGitChanges, + pullRequestUrl: data.pullRequestUrl, + userMappings: this.userMappings, + slackClient: this.slackClient + }); + actionButtons.push(...moduleButtons.map(btn => ({ + type: "button", + text: { type: "plain_text", text: btn.text }, + action_id: btn.action_id, + style: btn.style, + value: btn.value + }))); + } } - // Add GitHub action buttons as a separate actions block - if (githubActionButtons && githubActionButtons.length > 0) { + // Add action buttons as a separate actions block + if (actionButtons && actionButtons.length > 0) { // Add a divider before the GitHub actions if there are other blocks if (result.blocks.length > 0) { result.blocks.push({ type: "divider" }); @@ -418,7 +429,7 @@ export class ThreadResponseConsumer { // Add the GitHub action buttons as an actions block result.blocks.push({ type: "actions", - elements: githubActionButtons, + elements: actionButtons, }); } @@ -617,22 +628,33 @@ export class ThreadResponseConsumer { ], }; - // Get GitHub action buttons for this session if GitHub module is available - let githubActionButtons: any[] | undefined; - if (this.repoManager) { - githubActionButtons = await generateGitHubActionButtons( - userId, - data.gitBranch, - data.hasGitChanges, - data.pullRequestUrl, - this.userMappings, - this.repoManager, - this.slackClient - ); + // Get action buttons from modules + let actionButtons: any[] = []; + const dispatcherModules = moduleRegistry.getDispatcherModules(); + for (const module of dispatcherModules) { + if (module.generateActionButtons) { + const moduleButtons = await module.generateActionButtons({ + userId, + channelId: data.channelId, + threadTs: data.threadTs, + gitBranch: data.gitBranch, + hasGitChanges: data.hasGitChanges, + pullRequestUrl: data.pullRequestUrl, + userMappings: this.userMappings, + slackClient: this.slackClient + }); + actionButtons.push(...moduleButtons.map(btn => ({ + type: "button", + text: { type: "plain_text", text: btn.text }, + action_id: btn.action_id, + style: btn.style, + value: btn.value + }))); + } } - // Add GitHub action buttons if available - if (githubActionButtons && githubActionButtons.length > 0) { + // Add action buttons if available + if (actionButtons && actionButtons.length > 0) { // Add a divider before the GitHub actions errorResult.blocks.push({ type: "divider", @@ -641,7 +663,7 @@ export class ThreadResponseConsumer { // Add the GitHub action buttons as an actions block errorResult.blocks.push({ type: "actions", - elements: githubActionButtons, + elements: actionButtons, } as any); } diff --git a/packages/dispatcher/src/slack/handlers/action-handler.ts b/packages/dispatcher/src/slack/handlers/action-handler.ts index b3bb9a5e..a96bcf6b 100644 --- a/packages/dispatcher/src/slack/handlers/action-handler.ts +++ b/packages/dispatcher/src/slack/handlers/action-handler.ts @@ -2,16 +2,9 @@ import { createLogger } from "@peerbot/shared"; // import { getDbPool } from "@peerbot/shared"; // Currently unused const logger = createLogger("dispatcher"); -import type { GitHubRepositoryManager } from "../../../../../modules/github/repository-manager"; import type { QueueProducer } from "../../queue/task-queue-producer"; import type { DispatcherConfig, SlackContext } from "../../types"; -import { generateGitHubAuthUrl } from "../../../../../modules/github/utils"; import type { MessageHandler } from "./message-handler"; -import { - handleGitHubConnect, - handleGitHubLogout, - getUserGitHubInfo, -} from "../../../../../modules/github/handlers"; import { moduleRegistry } from "../../../../../modules"; import { handleTryDemo } from "./demo-handler"; import { openRepositoryModal } from "./repository-modal-utils"; @@ -23,7 +16,7 @@ import { export class ActionHandler { constructor( - private repoManager: GitHubRepositoryManager, + private repoManager: any, // Made generic since GitHub module is optional _queueProducer: QueueProducer, // Not used directly in ActionHandler private config: DispatcherConfig, private messageHandler: MessageHandler @@ -44,30 +37,49 @@ export class ActionHandler { ): Promise { logger.info(`Handling block action: ${actionId}`); - switch (actionId) { - case "github_login": - await this.handleGitHubLogin(userId, client); - break; - - case "github_logout": - await handleGitHubLogout(userId, client); - // Update home tab after logout - await this.updateAppHome(userId, client); - break; - - case "open_repository_modal": - await openRepositoryModal({ - userId, - body, + // Try to handle action through modules first + let handled = false; + const dispatcherModules = moduleRegistry.getDispatcherModules(); + for (const module of dispatcherModules) { + if (module.handleAction) { + const moduleHandled = await module.handleAction(actionId, userId, { + channelId, client, - checkAdminStatus: false, - getGitHubUserInfo: getUserGitHubInfo, + body, + updateAppHome: this.updateAppHome.bind(this) }); + if (moduleHandled) { + handled = true; + break; + } + } + } + + if (!handled) { + switch (actionId) { + + case "open_repository_modal": { + // Get GitHub functions from module + const gitHubModule = moduleRegistry.getModule('github'); + if (gitHubModule) { + const { getUserGitHubInfo } = await import('../../../../../modules/github/handlers'); + await openRepositoryModal({ + userId, + body, + client, + checkAdminStatus: false, + getGitHubUserInfo: getUserGitHubInfo, + }); + } break; + } case "open_github_login_modal": { - // Open modal with GitHub OAuth link - const authUrl = generateGitHubAuthUrl(userId); + // Get GitHub auth URL from module + const gitHubModule = moduleRegistry.getModule('github'); + if (gitHubModule) { + const { generateGitHubAuthUrl } = await import('../../../../../modules/github/utils'); + const authUrl = generateGitHubAuthUrl(userId); await client.views.open({ trigger_id: body.trigger_id, view: { @@ -139,12 +151,19 @@ export class ActionHandler { }, }, }); + } break; } - case "github_connect": - await handleGitHubConnect(userId, channelId, client); + case "github_connect": { + // This should be handled by the GitHub module, but fallback for compatibility + const gitHubModule = moduleRegistry.getModule('github'); + if (gitHubModule) { + const { handleGitHubConnect } = await import('../../../../../modules/github/handlers'); + await handleGitHubConnect(userId, channelId, client); + } break; + } case "try_demo": { // Check if this is from the home tab (view type will be 'home') @@ -422,48 +441,6 @@ export class ActionHandler { } } - /** - * Handle GitHub login - */ - private async handleGitHubLogin(userId: string, client: any): Promise { - const authUrl = generateGitHubAuthUrl(userId); - - try { - const im = await client.conversations.open({ users: userId }); - if (im.channel?.id) { - await client.chat.postMessage({ - channel: im.channel.id, - blocks: [ - { - type: "section", - text: { - type: "mrkdwn", - text: "*🔗 Connect to GitHub*\n\nClick the link below to connect your GitHub account:", - }, - }, - { - type: "section", - text: { - type: "mrkdwn", - text: `<${authUrl}|Connect with GitHub>`, - }, - }, - { - type: "context", - elements: [ - { - type: "mrkdwn", - text: "🔒 We'll only access repositories you explicitly grant permission to", - }, - ], - }, - ], - }); - } - } catch (error) { - logger.error(`Failed to send GitHub login message to ${userId}:`, error); - } - } /** * Fetch repository README content diff --git a/packages/dispatcher/src/slack/handlers/message-handler.ts b/packages/dispatcher/src/slack/handlers/message-handler.ts index 3285fac7..f73be26e 100644 --- a/packages/dispatcher/src/slack/handlers/message-handler.ts +++ b/packages/dispatcher/src/slack/handlers/message-handler.ts @@ -13,7 +13,7 @@ import type { SlackContext, ThreadSession, } from "../../types"; -import type { GitHubRepositoryManager } from "../../../../../modules/github/repository-manager"; +// GitHubRepositoryManager imported dynamically when needed import { getDbPool } from "@peerbot/shared"; export class MessageHandler { @@ -30,7 +30,7 @@ export class MessageHandler { constructor( private queueProducer: QueueProducer, - private repoManager: GitHubRepositoryManager, + private repoManager: any, // Made generic since GitHub module is optional private config: DispatcherConfig ) { this.startCachePrewarming(); diff --git a/packages/dispatcher/src/slack/handlers/repository-modal-utils.ts b/packages/dispatcher/src/slack/handlers/repository-modal-utils.ts index 4b5e56d7..766eb53c 100644 --- a/packages/dispatcher/src/slack/handlers/repository-modal-utils.ts +++ b/packages/dispatcher/src/slack/handlers/repository-modal-utils.ts @@ -1,5 +1,5 @@ import { createLogger } from "@peerbot/shared"; -import { generateGitHubAuthUrl } from "../../../../../modules/github/utils"; +// GitHub utility imports are loaded dynamically when needed const logger = createLogger("dispatcher"); @@ -74,6 +74,7 @@ export async function openRepositoryModal({ }, }); + const { generateGitHubAuthUrl } = await import("../../../../../modules/github/utils"); const authUrl = generateGitHubAuthUrl(userId); blocks.push({ type: "section", diff --git a/packages/dispatcher/src/slack/handlers/shortcut-command-handler.ts b/packages/dispatcher/src/slack/handlers/shortcut-command-handler.ts index 80b14498..2e8f8e4b 100644 --- a/packages/dispatcher/src/slack/handlers/shortcut-command-handler.ts +++ b/packages/dispatcher/src/slack/handlers/shortcut-command-handler.ts @@ -8,7 +8,7 @@ import { encrypt } from "@peerbot/shared"; import type { MessageHandler } from "./message-handler"; import type { ActionHandler } from "./action-handler"; import { openRepositoryModal } from "./repository-modal-utils"; -import { getUserGitHubInfo } from "../../../../../modules/github/handlers"; +// GitHub imports are loaded dynamically when needed export class ShortcutCommandHandler { constructor( @@ -59,6 +59,7 @@ export class ShortcutCommandHandler { const userId = body.user.id; logger.info(`Create project shortcut triggered by ${userId}`); + const { getUserGitHubInfo } = await import("../../../../../modules/github/handlers"); await openRepositoryModal({ userId, body, @@ -144,6 +145,7 @@ export class ShortcutCommandHandler { threadTs?: string ): Promise { // Check if user has GitHub connected + const { getUserGitHubInfo } = await import("../../../../../modules/github/handlers"); const githubUser = await getUserGitHubInfo(userId); const isGitHubConnected = !!githubUser.token; @@ -435,7 +437,8 @@ export class ShortcutCommandHandler { // Create new repository // Get GitHub user info // const username = await this.messageHandler.getOrCreateUserMapping(userId, client); // Currently unused - const githubUser = await getUserGitHubInfo(userId); + const { getUserGitHubInfo } = await import("../../../../../modules/github/handlers"); + const githubUser = await getUserGitHubInfo(userId); if (!githubUser.token) { throw new Error( diff --git a/packages/dispatcher/src/slack/slack-event-handlers.ts b/packages/dispatcher/src/slack/slack-event-handlers.ts index 693f8ba5..fddc566a 100644 --- a/packages/dispatcher/src/slack/slack-event-handlers.ts +++ b/packages/dispatcher/src/slack/slack-event-handlers.ts @@ -32,12 +32,12 @@ export class SlackEventHandlers { queueProducer: QueueProducer, private config: DispatcherConfig ) { - // Get repository manager from GitHub module + // Get repository manager from GitHub module (optional) const githubModule = moduleRegistry.getModule('github'); const repoManager = githubModule?.getRepositoryManager(); if (!repoManager) { - throw new Error('GitHub module not available or repository manager not found'); + logger.warn('GitHub module not available - some features may be limited'); } // Initialize specialized handlers diff --git a/packages/shared/src/errors/dispatcher-errors.ts b/packages/shared/src/errors/dispatcher-errors.ts index cd66c5d9..2c84d63c 100644 --- a/packages/shared/src/errors/dispatcher-errors.ts +++ b/packages/shared/src/errors/dispatcher-errors.ts @@ -1,25 +1,2 @@ -import { BaseError } from "./base-error"; - -/** - * Error class for GitHub repository operations - */ -export class GitHubRepositoryError extends BaseError { - readonly name = "GitHubRepositoryError"; - - constructor( - public operation: string, - public username: string, - message: string, - cause?: Error - ) { - super(message, cause); - } - - toJSON(): Record { - return { - ...super.toJSON(), - operation: this.operation, - username: this.username, - }; - } -} +// GitHub-specific errors moved to modules/github/errors.ts +// This file can be removed \ No newline at end of file diff --git a/packages/shared/src/errors/index.ts b/packages/shared/src/errors/index.ts index cddde263..02e0c0c3 100644 --- a/packages/shared/src/errors/index.ts +++ b/packages/shared/src/errors/index.ts @@ -13,5 +13,4 @@ export { CoreWorkerError, } from "./worker-errors"; -// Export dispatcher errors -export { GitHubRepositoryError } from "./dispatcher-errors"; +// Dispatcher errors - GitHub-specific errors moved to GitHub module From 4c8c6a3fbe48defb425689bc86f7921480f4cbaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Burak=20Emre=20Kabakc=C4=B1?= Date: Sat, 4 Oct 2025 23:11:25 +0200 Subject: [PATCH 07/12] fix: stabilize module registry integration --- integration-tests/src/mocks/claude-server.ts | 2 +- integration-tests/src/mocks/slack-server.ts | 4 +- modules/github/actions.ts | 2 +- modules/github/errors.ts | 2 +- modules/github/handlers.ts | 2 +- modules/github/index.ts | 135 +++--- modules/github/repository-manager.ts | 6 +- modules/github/utils.ts | 2 +- modules/github/workspace.ts | 41 +- modules/index.ts | 22 +- modules/types.ts | 23 +- .../src/converters/github-actions.ts | 2 +- .../src/queue/slack-thread-processor.ts | 45 +- packages/dispatcher/src/simple-http.ts | 5 +- .../src/slack/handlers/action-handler.ts | 408 ++++++++---------- .../slack/handlers/repository-modal-utils.ts | 4 +- .../handlers/shortcut-command-handler.ts | 14 +- .../src/slack/slack-event-handlers.ts | 28 +- packages/dispatcher/src/types.ts | 2 - .../src/base/BaseDeploymentManager.ts | 8 +- packages/orchestrator/src/index.ts | 4 +- .../orchestrator/src/module-integration.ts | 18 +- packages/shared/src/config/index.ts | 2 - .../shared/src/errors/dispatcher-errors.ts | 2 +- packages/worker/src/index.ts | 2 +- packages/worker/src/module-integration.ts | 39 +- packages/worker/src/task-queue-integration.ts | 31 +- packages/worker/src/workspace-manager.ts | 28 +- tsconfig.json | 16 +- 29 files changed, 497 insertions(+), 402 deletions(-) diff --git a/integration-tests/src/mocks/claude-server.ts b/integration-tests/src/mocks/claude-server.ts index a1b2f93e..f25bdd1c 100644 --- a/integration-tests/src/mocks/claude-server.ts +++ b/integration-tests/src/mocks/claude-server.ts @@ -75,7 +75,7 @@ export class MockClaudeServer { }); // Health check - this.app.get("/health", (req, res) => { + this.app.get("/health", (_req, res) => { res.json({ status: "ok", mock: true }); }); } diff --git a/integration-tests/src/mocks/slack-server.ts b/integration-tests/src/mocks/slack-server.ts index 48b16e3c..54b009c7 100644 --- a/integration-tests/src/mocks/slack-server.ts +++ b/integration-tests/src/mocks/slack-server.ts @@ -1,5 +1,5 @@ import express from "express"; -import { EventEmitter } from "events"; +import { EventEmitter } from "node:events"; interface SlackMessage { ts: string; @@ -97,7 +97,7 @@ export class MockSlackServer extends EventEmitter { }); // Mock auth.test - this.app.post("/api/auth.test", (req, res) => { + this.app.post("/api/auth.test", (_req, res) => { res.json({ ok: true, url: "https://test-workspace.slack.com/", diff --git a/modules/github/actions.ts b/modules/github/actions.ts index 9e157c4e..7692bc55 100644 --- a/modules/github/actions.ts +++ b/modules/github/actions.ts @@ -169,4 +169,4 @@ export async function generateGitHubActionButtons( // Return undefined on error - this will result in no action buttons being added return undefined; } -} \ No newline at end of file +} diff --git a/modules/github/errors.ts b/modules/github/errors.ts index cf249816..17feb2a6 100644 --- a/modules/github/errors.ts +++ b/modules/github/errors.ts @@ -22,4 +22,4 @@ export class GitHubRepositoryError extends BaseError { username: this.username, }; } -} \ No newline at end of file +} diff --git a/modules/github/handlers.ts b/modules/github/handlers.ts index 71ac272d..d63fcd7b 100644 --- a/modules/github/handlers.ts +++ b/modules/github/handlers.ts @@ -433,4 +433,4 @@ export async function getUserGitHubInfo(userId: string): Promise<{ logger.error(`Failed to get GitHub info for user ${userId}:`, error); return { token: null, username: null }; } -} \ No newline at end of file +} diff --git a/modules/github/index.ts b/modules/github/index.ts index fa504053..b1120dff 100644 --- a/modules/github/index.ts +++ b/modules/github/index.ts @@ -1,8 +1,16 @@ -import { z } from 'zod'; -import type { HomeTabModule, WorkerModule, OrchestratorModule, DispatcherModule, SessionContext, ActionButton, ThreadContext } from '../types'; -import { GitHubRepositoryManager } from './repository-manager'; -import { handleGitHubConnect, handleGitHubLogout, getUserGitHubInfo } from './handlers'; -import { generateGitHubAuthUrl } from './utils'; +import { z } from "zod"; +import type { + HomeTabModule, + WorkerModule, + OrchestratorModule, + DispatcherModule, + SessionContext, + ActionButton, + ThreadContext, +} from "../types"; +import { GitHubRepositoryManager } from "./repository-manager"; +import { getUserGitHubInfo } from "./handlers"; +import { generateGitHubAuthUrl } from "./utils"; // GitHub configuration schema (module-specific) export const GitHubConfigSchema = z.object({ @@ -36,8 +44,10 @@ export function loadGitHubConfig(): GitHubConfig { }); } -export class GitHubModule implements HomeTabModule, WorkerModule, OrchestratorModule, DispatcherModule { - name = 'github'; +export class GitHubModule + implements HomeTabModule, WorkerModule, OrchestratorModule, DispatcherModule +{ + name = "github"; private repoManager?: GitHubRepositoryManager; isEnabled(): boolean { @@ -46,7 +56,7 @@ export class GitHubModule implements HomeTabModule, WorkerModule, OrchestratorMo async init(): Promise { if (!this.isEnabled()) return; - + const config = loadGitHubConfig(); this.repoManager = new GitHubRepositoryManager( config, @@ -59,7 +69,7 @@ export class GitHubModule implements HomeTabModule, WorkerModule, OrchestratorMo const { token, username } = await getUserGitHubInfo(userId); const isGitHubConnected = !!token; - + if (!isGitHubConnected) { const authUrl = generateGitHubAuthUrl(userId); return [ @@ -88,12 +98,18 @@ export class GitHubModule implements HomeTabModule, WorkerModule, OrchestratorMo ]; } - const userRepo = await this.repoManager.getUserRepository(username!, userId); - + const userRepo = await this.repoManager.getUserRepository( + username!, + userId + ); + if (userRepo) { const repoUrl = userRepo.repositoryUrl.replace(/\.git$/, ""); - const repoDisplayName = repoUrl.replace(/^https?:\/\/(www\.)?github\.com\//, ""); - + const repoDisplayName = repoUrl.replace( + /^https?:\/\/(www\.)?github\.com\//, + "" + ); + return [ { type: "section", @@ -109,7 +125,7 @@ export class GitHubModule implements HomeTabModule, WorkerModule, OrchestratorMo }, ]; } - + return [ { type: "section", @@ -144,26 +160,24 @@ export class GitHubModule implements HomeTabModule, WorkerModule, OrchestratorMo ]; } - async handleHomeTabAction(actionId: string, userId: string, value?: any): Promise { - // Home tab actions are handled by the dispatcher action handler - // This method is called from the dispatcher for module-specific actions - } - - async initWorkspace(config: { repositoryUrl?: string; workspaceDir?: string }): Promise { + async initWorkspace(config: { + repositoryUrl?: string; + workspaceDir?: string; + }): Promise { if (!config.repositoryUrl || !config.workspaceDir) return; - + // Clone repository if not already present const repoName = this.extractRepoName(config.repositoryUrl); const targetDir = `${config.workspaceDir}/${repoName}`; - + // Check if repo already exists try { - const fs = await import('fs'); + const fs = await import("node:fs"); if (!fs.existsSync(targetDir)) { - const { execSync } = await import('child_process'); - execSync(`git clone ${config.repositoryUrl} ${targetDir}`, { - stdio: 'inherit', - cwd: config.workspaceDir + const { execSync } = await import("node:child_process"); + execSync(`git clone ${config.repositoryUrl} ${targetDir}`, { + stdio: "inherit", + cwd: config.workspaceDir, }); } } catch (error) { @@ -195,9 +209,12 @@ export class GitHubModule implements HomeTabModule, WorkerModule, OrchestratorMo ]; } - async buildEnvVars(userId: string, baseEnv: Record): Promise> { + async buildEnvVars( + userId: string, + baseEnv: Record + ): Promise> { const { token, username } = await getUserGitHubInfo(userId); - + if (token && username) { return { ...baseEnv, @@ -205,7 +222,7 @@ export class GitHubModule implements HomeTabModule, WorkerModule, OrchestratorMo GITHUB_USER: username, }; } - + return baseEnv; } @@ -241,7 +258,7 @@ export class GitHubModule implements HomeTabModule, WorkerModule, OrchestratorMo */ async isGitHubCLIAuthenticated(workingDir: string): Promise { try { - const { execSync } = await import('child_process'); + const { execSync } = await import("node:child_process"); execSync("gh auth status", { cwd: workingDir, stdio: "pipe", @@ -264,7 +281,7 @@ export class GitHubModule implements HomeTabModule, WorkerModule, OrchestratorMo return []; } - const { generateGitHubActionButtons } = await import('./actions'); + const { generateGitHubActionButtons } = await import("./actions"); const buttons = await generateGitHubActionButtons( context.userId, context.gitBranch, @@ -275,38 +292,50 @@ export class GitHubModule implements HomeTabModule, WorkerModule, OrchestratorMo context.slackClient ); - return buttons?.map(button => ({ - text: button.text?.text || '', - action_id: button.action_id, - style: button.style, - value: button.value - })) || []; + return ( + buttons?.map((button) => ({ + text: button.text?.text || "", + action_id: button.action_id, + style: button.style, + value: button.value, + })) || [] + ); } - async handleAction(actionId: string, userId: string, context: any): Promise { + async handleAction( + actionId: string, + userId: string, + context: any + ): Promise { // Handle GitHub-specific actions switch (actionId) { - case "github_login": - const { handleGitHubConnect } = await import('./handlers'); + case "github_login": { + const { handleGitHubConnect } = await import("./handlers"); await handleGitHubConnect(userId, context.channelId, context.client); return true; - - case "github_logout": - const { handleGitHubLogout } = await import('./handlers'); + } + + case "github_logout": { + const { handleGitHubLogout } = await import("./handlers"); await handleGitHubLogout(userId, context.client); // Update home tab after logout - delegate back to action handler if (context.updateAppHome) { await context.updateAppHome(userId, context.client); } return true; - + } + case "open_repository_modal": // This is handled by repository-modal-utils which should also be moved to module return false; // Let dispatcher handle for now - + default: // Check if it's a GitHub-specific action (prefixed with github_ or contains repo operations) - if (actionId.startsWith('github_') || actionId.includes('pr_') || actionId.includes('view_pr_')) { + if ( + actionId.startsWith("github_") || + actionId.includes("pr_") || + actionId.includes("view_pr_") + ) { // This is a GitHub action but not one we handle directly return false; } @@ -317,9 +346,13 @@ export class GitHubModule implements HomeTabModule, WorkerModule, OrchestratorMo getRepositoryManager(): GitHubRepositoryManager | undefined { return this.repoManager; } + + async getUserInfo(userId: string) { + return getUserGitHubInfo(userId); + } } -export * from './repository-manager'; -export * from './handlers'; -export * from './utils'; -export * from './errors'; \ No newline at end of file +export * from "./repository-manager"; +export * from "./handlers"; +export * from "./utils"; +export * from "./errors"; diff --git a/modules/github/repository-manager.ts b/modules/github/repository-manager.ts index 3df07483..ad0b61f9 100644 --- a/modules/github/repository-manager.ts +++ b/modules/github/repository-manager.ts @@ -7,8 +7,8 @@ const logger = createLogger("github-module"); // Import from shared package and local module import { getDbPool } from "@peerbot/shared"; -import { GitHubRepositoryError } from './errors'; -import type { GitHubConfig } from './index'; +import { GitHubRepositoryError } from "./errors"; +import type { GitHubConfig } from "./index"; export interface GitHubModuleConfig extends GitHubConfig { // All config is already in the base GitHubConfig type @@ -316,4 +316,4 @@ export class GitHubRepositoryManager { return null; } } -} \ No newline at end of file +} diff --git a/modules/github/utils.ts b/modules/github/utils.ts index 1a81c321..4999fff7 100644 --- a/modules/github/utils.ts +++ b/modules/github/utils.ts @@ -8,4 +8,4 @@ export function generateGitHubAuthUrl(userId: string): string { const baseUrl = process.env.INGRESS_URL || "http://localhost:8080"; return `${baseUrl}/api/github/oauth/authorize?user_id=${userId}`; -} \ No newline at end of file +} diff --git a/modules/github/workspace.ts b/modules/github/workspace.ts index 805bc421..0a0bdf2c 100644 --- a/modules/github/workspace.ts +++ b/modules/github/workspace.ts @@ -39,8 +39,7 @@ export class GitHubWorkspaceManager { async setupGitHubWorkspace( repositoryUrl: string, userDirectory: string, - username: string, - sessionKey?: string + username: string ): Promise { try { logger.info(`Setting up GitHub workspace for ${username}...`); @@ -54,7 +53,10 @@ export class GitHubWorkspaceManager { } // Get repository info - const repository = await this.getRepositoryInfo(userDirectory, repositoryUrl); + const repository = await this.getRepositoryInfo( + userDirectory, + repositoryUrl + ); return { baseDirectory: this.config.baseDirectory, @@ -117,7 +119,9 @@ export class GitHubWorkspaceManager { logger.info("Git configuration completed"); } catch (error) { - throw new Error(`Failed to setup git configuration for ${username}: ${error}`); + throw new Error( + `Failed to setup git configuration for ${username}: ${error}` + ); } } @@ -158,7 +162,10 @@ export class GitHubWorkspaceManager { /** * Create a new branch for the session */ - async createSessionBranch(userDirectory: string, sessionKey: string): Promise { + async createSessionBranch( + userDirectory: string, + sessionKey: string + ): Promise { try { const branchName = `claude/${sessionKey.replace(/\./g, "-")}`; @@ -170,7 +177,9 @@ export class GitHubWorkspaceManager { await execAsync(`git checkout "${branchName}"`, { cwd: userDirectory, }); - logger.info(`Session branch ${branchName} already exists locally, checked out`); + logger.info( + `Session branch ${branchName} already exists locally, checked out` + ); // Pull latest changes from remote to preserve previous work try { @@ -222,14 +231,20 @@ export class GitHubWorkspaceManager { return branchName; } catch (error) { - throw new Error(`Failed to create session branch for ${sessionKey}: ${error}`); + throw new Error( + `Failed to create session branch for ${sessionKey}: ${error}` + ); } } /** * Commit and push changes */ - async commitAndPush(userDirectory: string, branch: string, message: string): Promise { + async commitAndPush( + userDirectory: string, + branch: string, + message: string + ): Promise { try { // Add all changes await execAsync("git add .", { cwd: userDirectory }); @@ -237,8 +252,12 @@ export class GitHubWorkspaceManager { // Check if there are changes to commit let hasUnstagedChanges = false; try { - await execAsync("git diff --cached --exit-code", { cwd: userDirectory }); - logger.info("No staged changes to commit - checking for unpushed commits"); + await execAsync("git diff --cached --exit-code", { + cwd: userDirectory, + }); + logger.info( + "No staged changes to commit - checking for unpushed commits" + ); } catch (_error) { hasUnstagedChanges = true; } @@ -279,4 +298,4 @@ export class GitHubWorkspaceManager { throw new Error(`Failed to commit and push changes: ${error}`); } } -} \ No newline at end of file +} diff --git a/modules/index.ts b/modules/index.ts index 69eff799..c8a36177 100644 --- a/modules/index.ts +++ b/modules/index.ts @@ -1,5 +1,11 @@ -import type { ModuleInterface, HomeTabModule, WorkerModule, OrchestratorModule, DispatcherModule } from './types'; -import { GitHubModule } from './github'; +import type { + ModuleInterface, + HomeTabModule, + WorkerModule, + OrchestratorModule, + DispatcherModule, +} from "./types"; +import { GitHubModule } from "./github"; export class ModuleRegistry { private modules: Map = new Map(); @@ -13,7 +19,7 @@ export class ModuleRegistry { async initAll(): Promise { // Auto-register available modules if not already registered this.autoRegisterModules(); - + for (const module of this.modules.values()) { if (module.init) { await module.init(); @@ -31,25 +37,25 @@ export class ModuleRegistry { getHomeTabModules(): HomeTabModule[] { return Array.from(this.modules.values()).filter( - (m): m is HomeTabModule => 'renderHomeTab' in m + (m): m is HomeTabModule => "renderHomeTab" in m ); } getWorkerModules(): WorkerModule[] { return Array.from(this.modules.values()).filter( - (m): m is WorkerModule => 'onSessionStart' in m || 'onSessionEnd' in m + (m): m is WorkerModule => "onSessionStart" in m || "onSessionEnd" in m ); } getOrchestratorModules(): OrchestratorModule[] { return Array.from(this.modules.values()).filter( - (m): m is OrchestratorModule => 'buildEnvVars' in m + (m): m is OrchestratorModule => "buildEnvVars" in m ); } getDispatcherModules(): DispatcherModule[] { return Array.from(this.modules.values()).filter( - (m): m is DispatcherModule => 'generateActionButtons' in m + (m): m is DispatcherModule => "generateActionButtons" in m ); } @@ -61,4 +67,4 @@ export class ModuleRegistry { // Global registry instance export const moduleRegistry = new ModuleRegistry(); -export * from './types'; \ No newline at end of file +export * from "./types"; diff --git a/modules/types.ts b/modules/types.ts index dc81217b..67ef6630 100644 --- a/modules/types.ts +++ b/modules/types.ts @@ -14,7 +14,11 @@ export interface HomeTabModule extends ModuleInterface { renderHomeTab?(userId: string): Promise; /** Handle home tab interactions */ - handleHomeTabAction?(actionId: string, userId: string, value?: any): Promise; + handleHomeTabAction?( + actionId: string, + userId: string, + value?: any + ): Promise; } export interface WorkerModule extends ModuleInterface { @@ -30,7 +34,10 @@ export interface WorkerModule extends ModuleInterface { export interface OrchestratorModule extends ModuleInterface { /** Build environment variables for worker container */ - buildEnvVars?(userId: string, baseEnv: Record): Promise>; + buildEnvVars?( + userId: string, + baseEnv: Record + ): Promise>; /** Get container address for module-specific services */ getContainerAddress?(): string; @@ -39,9 +46,13 @@ export interface OrchestratorModule extends ModuleInterface { export interface DispatcherModule extends ModuleInterface { /** Generate action buttons for thread responses */ generateActionButtons?(context: ThreadContext): Promise; - + /** Handle action button clicks */ - handleAction?(actionId: string, userId: string, context: any): Promise; + handleAction?( + actionId: string, + userId: string, + context: any + ): Promise; } export interface SessionContext { @@ -55,7 +66,7 @@ export interface SessionContext { export interface ActionButton { text: string; action_id: string; - style?: 'primary' | 'danger'; + style?: "primary" | "danger"; value?: string; } @@ -68,4 +79,4 @@ export interface ThreadContext { pullRequestUrl?: string; userMappings: Map; slackClient?: any; -} \ No newline at end of file +} diff --git a/packages/dispatcher/src/converters/github-actions.ts b/packages/dispatcher/src/converters/github-actions.ts index fa69db3d..451e6f5f 100644 --- a/packages/dispatcher/src/converters/github-actions.ts +++ b/packages/dispatcher/src/converters/github-actions.ts @@ -1,2 +1,2 @@ // This file has been moved to modules/github/actions.ts -// Please remove this file \ No newline at end of file +// Please remove this file diff --git a/packages/dispatcher/src/queue/slack-thread-processor.ts b/packages/dispatcher/src/queue/slack-thread-processor.ts index a676a913..347c28ae 100644 --- a/packages/dispatcher/src/queue/slack-thread-processor.ts +++ b/packages/dispatcher/src/queue/slack-thread-processor.ts @@ -36,7 +36,6 @@ export class ThreadResponseConsumer { private pgBoss: PgBoss; private slackClient: WebClient; private isRunning = false; - private repoManager?: any; private userMappings: Map; // slackUserId -> githubUsername private sessionBotMessages: Map = new Map(); // sessionKey -> botMessageTs @@ -48,10 +47,6 @@ export class ThreadResponseConsumer { this.pgBoss = new PgBoss(connectionString); this.slackClient = new WebClient(slackToken); this.userMappings = userMappings; - - // Get repository manager from GitHub module - const githubModule = moduleRegistry.getModule('github'); - this.repoManager = githubModule?.getRepositoryManager(); } /** @@ -395,7 +390,7 @@ export class ThreadResponseConsumer { } // Get action buttons from modules - let actionButtons: any[] = []; + const actionButtons: any[] = []; const dispatcherModules = moduleRegistry.getDispatcherModules(); for (const module of dispatcherModules) { if (module.generateActionButtons) { @@ -407,15 +402,17 @@ export class ThreadResponseConsumer { hasGitChanges: data.hasGitChanges, pullRequestUrl: data.pullRequestUrl, userMappings: this.userMappings, - slackClient: this.slackClient + slackClient: this.slackClient, }); - actionButtons.push(...moduleButtons.map(btn => ({ - type: "button", - text: { type: "plain_text", text: btn.text }, - action_id: btn.action_id, - style: btn.style, - value: btn.value - }))); + actionButtons.push( + ...moduleButtons.map((btn) => ({ + type: "button", + text: { type: "plain_text", text: btn.text }, + action_id: btn.action_id, + style: btn.style, + value: btn.value, + })) + ); } } @@ -629,7 +626,7 @@ export class ThreadResponseConsumer { }; // Get action buttons from modules - let actionButtons: any[] = []; + const actionButtons: any[] = []; const dispatcherModules = moduleRegistry.getDispatcherModules(); for (const module of dispatcherModules) { if (module.generateActionButtons) { @@ -641,15 +638,17 @@ export class ThreadResponseConsumer { hasGitChanges: data.hasGitChanges, pullRequestUrl: data.pullRequestUrl, userMappings: this.userMappings, - slackClient: this.slackClient + slackClient: this.slackClient, }); - actionButtons.push(...moduleButtons.map(btn => ({ - type: "button", - text: { type: "plain_text", text: btn.text }, - action_id: btn.action_id, - style: btn.style, - value: btn.value - }))); + actionButtons.push( + ...moduleButtons.map((btn) => ({ + type: "button", + text: { type: "plain_text", text: btn.text }, + action_id: btn.action_id, + style: btn.style, + value: btn.value, + })) + ); } } diff --git a/packages/dispatcher/src/simple-http.ts b/packages/dispatcher/src/simple-http.ts index 102d97de..35a1b909 100644 --- a/packages/dispatcher/src/simple-http.ts +++ b/packages/dispatcher/src/simple-http.ts @@ -8,9 +8,7 @@ import type { AnthropicProxy } from "./proxy/anthropic-proxy"; let healthServer: http.Server | null = null; let proxyApp: express.Application | null = null; -export function setupHealthEndpoints( - anthropicProxy?: AnthropicProxy -) { +export function setupHealthEndpoints(anthropicProxy?: AnthropicProxy) { if (healthServer) return; // Create Express app for proxy and health endpoints @@ -39,7 +37,6 @@ export function setupHealthEndpoints( logger.info("✅ Anthropic proxy enabled at :8080/api/anthropic"); } - // Create HTTP server with Express app healthServer = http.createServer(proxyApp); diff --git a/packages/dispatcher/src/slack/handlers/action-handler.ts b/packages/dispatcher/src/slack/handlers/action-handler.ts index a96bcf6b..d6715125 100644 --- a/packages/dispatcher/src/slack/handlers/action-handler.ts +++ b/packages/dispatcher/src/slack/handlers/action-handler.ts @@ -3,9 +3,10 @@ import { createLogger } from "@peerbot/shared"; const logger = createLogger("dispatcher"); import type { QueueProducer } from "../../queue/task-queue-producer"; -import type { DispatcherConfig, SlackContext } from "../../types"; +import type { SlackContext } from "../../types"; import type { MessageHandler } from "./message-handler"; import { moduleRegistry } from "../../../../../modules"; +import type { GitHubModule } from "../../../../../modules/github"; import { handleTryDemo } from "./demo-handler"; import { openRepositoryModal } from "./repository-modal-utils"; import { @@ -16,13 +17,9 @@ import { export class ActionHandler { constructor( - private repoManager: any, // Made generic since GitHub module is optional - _queueProducer: QueueProducer, // Not used directly in ActionHandler - private config: DispatcherConfig, + _queueProducer: QueueProducer, private messageHandler: MessageHandler - ) { - // queueProducer passed for consistency but not used directly - } + ) {} /** * Handle block action events @@ -42,11 +39,11 @@ export class ActionHandler { const dispatcherModules = moduleRegistry.getDispatcherModules(); for (const module of dispatcherModules) { if (module.handleAction) { - const moduleHandled = await module.handleAction(actionId, userId, { + const moduleHandled = await module.handleAction(actionId, userId, { channelId, client, body, - updateAppHome: this.updateAppHome.bind(this) + updateAppHome: this.updateAppHome.bind(this), }); if (moduleHandled) { handled = true; @@ -57,197 +54,205 @@ export class ActionHandler { if (!handled) { switch (actionId) { - - case "open_repository_modal": { - // Get GitHub functions from module - const gitHubModule = moduleRegistry.getModule('github'); - if (gitHubModule) { - const { getUserGitHubInfo } = await import('../../../../../modules/github/handlers'); - await openRepositoryModal({ - userId, - body, - client, - checkAdminStatus: false, - getGitHubUserInfo: getUserGitHubInfo, - }); + case "open_repository_modal": { + // Get GitHub functions from module + const gitHubModule = moduleRegistry.getModule("github"); + if (gitHubModule) { + const { getUserGitHubInfo } = await import( + "../../../../../modules/github/handlers" + ); + await openRepositoryModal({ + userId, + body, + client, + checkAdminStatus: false, + getGitHubUserInfo: getUserGitHubInfo, + }); + } + break; } - break; - } - case "open_github_login_modal": { - // Get GitHub auth URL from module - const gitHubModule = moduleRegistry.getModule('github'); - if (gitHubModule) { - const { generateGitHubAuthUrl } = await import('../../../../../modules/github/utils'); - const authUrl = generateGitHubAuthUrl(userId); - await client.views.open({ - trigger_id: body.trigger_id, - view: { - type: "modal", - callback_id: "github_login_modal", - title: { - type: "plain_text", - text: "Connect GitHub", - }, - blocks: [ - { - type: "header", - text: { + case "open_github_login_modal": { + // Get GitHub auth URL from module + const gitHubModule = moduleRegistry.getModule("github"); + if (gitHubModule) { + const { generateGitHubAuthUrl } = await import( + "../../../../../modules/github/utils" + ); + const authUrl = generateGitHubAuthUrl(userId); + await client.views.open({ + trigger_id: body.trigger_id, + view: { + type: "modal", + callback_id: "github_login_modal", + title: { type: "plain_text", - text: "🔗 Connect Your GitHub Account", - emoji: true, - }, - }, - { - type: "section", - text: { - type: "mrkdwn", - text: - "Connect your GitHub account to:\n\n" + - "• Access your repositories\n" + - "• Create new projects\n" + - "• Manage code with AI assistance\n\n" + - "*Your connection is secure and encrypted.*", - }, - }, - { - type: "divider", - }, - { - type: "section", - text: { - type: "mrkdwn", - text: "Click the button below to authenticate with GitHub:", + text: "Connect GitHub", }, - }, - { - type: "actions", - elements: [ + blocks: [ { - type: "button", + type: "header", text: { type: "plain_text", - text: "🚀 Connect with GitHub", + text: "🔗 Connect Your GitHub Account", emoji: true, }, - url: authUrl, - style: "primary", }, - ], - }, - { - type: "context", - elements: [ { - type: "mrkdwn", - text: "💡 *Note:* After connecting, you can select which repositories to work with.", + type: "section", + text: { + type: "mrkdwn", + text: + "Connect your GitHub account to:\n\n" + + "• Access your repositories\n" + + "• Create new projects\n" + + "• Manage code with AI assistance\n\n" + + "*Your connection is secure and encrypted.*", + }, + }, + { + type: "divider", + }, + { + type: "section", + text: { + type: "mrkdwn", + text: "Click the button below to authenticate with GitHub:", + }, + }, + { + type: "actions", + elements: [ + { + type: "button", + text: { + type: "plain_text", + text: "🚀 Connect with GitHub", + emoji: true, + }, + url: authUrl, + style: "primary", + }, + ], + }, + { + type: "context", + elements: [ + { + type: "mrkdwn", + text: "💡 *Note:* After connecting, you can select which repositories to work with.", + }, + ], }, ], + close: { + type: "plain_text", + text: "Cancel", + }, }, - ], - close: { - type: "plain_text", - text: "Cancel", - }, - }, - }); + }); + } + break; } - break; - } - case "github_connect": { - // This should be handled by the GitHub module, but fallback for compatibility - const gitHubModule = moduleRegistry.getModule('github'); - if (gitHubModule) { - const { handleGitHubConnect } = await import('../../../../../modules/github/handlers'); - await handleGitHubConnect(userId, channelId, client); + case "github_connect": { + // This should be handled by the GitHub module, but fallback for compatibility + const gitHubModule = moduleRegistry.getModule("github"); + if (gitHubModule) { + const { handleGitHubConnect } = await import( + "../../../../../modules/github/handlers" + ); + await handleGitHubConnect(userId, channelId, client); + } + break; } - break; - } - case "try_demo": { - // Check if this is from the home tab (view type will be 'home') - const fromHomeTab = body.view?.type === "home"; + case "try_demo": { + // Check if this is from the home tab (view type will be 'home') + const fromHomeTab = body.view?.type === "home"; - // Get the message timestamp to keep demo response in same thread (if not from home) - const demoMessageTs = body.message?.ts; + // Get the message timestamp to keep demo response in same thread (if not from home) + const demoMessageTs = body.message?.ts; - // Pass the fromHomeTab flag to ensure DM is sent when clicked from home - await handleTryDemo( - userId, - channelId, - client, - demoMessageTs, - fromHomeTab - ); - - // Clear cache and update home tab after demo setup - const username = await this.messageHandler.getOrCreateUserMapping( - userId, - client - ); - this.messageHandler.clearCacheForUser(username); - await this.updateAppHome(userId, client); - break; - } - - default: - // Handle blockkit form button clicks - if (actionId.startsWith("blockkit_form_")) { - await handleBlockkitForm( - actionId, - userId, - channelId, - messageTs, - body, - client - ); - } - // Handle executable code block buttons - else if ( - actionId.match(/^(bash|python|javascript|js|typescript|ts|sql|sh)_/) - ) { - await handleExecutableCodeBlock( - actionId, + // Pass the fromHomeTab flag to ensure DM is sent when clicked from home + await handleTryDemo( userId, channelId, - messageTs, - body, client, - (context: SlackContext, userRequest: string, client: any) => - this.messageHandler.handleUserRequest( - context, - userRequest, - client - ) + demoMessageTs, + fromHomeTab ); - } - // Handle stop worker button clicks - else if (actionId.startsWith("stop_worker_")) { - const deploymentName = actionId.replace("stop_worker_", ""); - await handleStopWorker( - deploymentName, - userId, - channelId, - messageTs, - client - ); - } - // Handle GitHub Pull Request button clicks - else if (actionId.startsWith("github_pr_")) { - await this.handleGitHubPullRequestAction( - actionId, + + // Clear cache and update home tab after demo setup + const username = await this.messageHandler.getOrCreateUserMapping( userId, - channelId, - messageTs, - body, client ); - } else { - logger.info( - `Unsupported action: ${actionId} from user ${userId} in channel ${channelId}` - ); + this.messageHandler.clearCacheForUser(username); + await this.updateAppHome(userId, client); + break; } + + default: + // Handle blockkit form button clicks + if (actionId.startsWith("blockkit_form_")) { + await handleBlockkitForm( + actionId, + userId, + channelId, + messageTs, + body, + client + ); + } + // Handle executable code block buttons + else if ( + actionId.match(/^(bash|python|javascript|js|typescript|ts|sql|sh)_/) + ) { + await handleExecutableCodeBlock( + actionId, + userId, + channelId, + messageTs, + body, + client, + (context: SlackContext, userRequest: string, client: any) => + this.messageHandler.handleUserRequest( + context, + userRequest, + client + ) + ); + } + // Handle stop worker button clicks + else if (actionId.startsWith("stop_worker_")) { + const deploymentName = actionId.replace("stop_worker_", ""); + await handleStopWorker( + deploymentName, + userId, + channelId, + messageTs, + client + ); + } + // Handle GitHub Pull Request button clicks + else if (actionId.startsWith("github_pr_")) { + await this.handleGitHubPullRequestAction( + actionId, + userId, + channelId, + messageTs, + body, + client + ); + } else { + logger.info( + `Unsupported action: ${actionId} from user ${userId} in channel ${channelId}` + ); + } + + break; + } } } @@ -354,13 +359,13 @@ export class ActionHandler { ); try { - const username = await this.messageHandler.getOrCreateUserMapping( - userId, - client - ); + await this.messageHandler.getOrCreateUserMapping(userId, client); // Get GitHub connection status for demo purposes - const githubUser = await getUserGitHubInfo(userId); + const gitHubModule = moduleRegistry.getModule("github"); + const githubUser = gitHubModule + ? await gitHubModule.getUserInfo(userId) + : { token: null, username: null }; const isGitHubConnected = !!githubUser.token; const blocks: any[] = [ @@ -383,7 +388,10 @@ export class ActionHandler { blocks.push({ type: "divider" }); } } catch (error) { - logger.error(`Failed to render home tab for module ${module.name}:`, error); + logger.error( + `Failed to render home tab for module ${module.name}:`, + error + ); } } @@ -425,7 +433,6 @@ export class ActionHandler { }, }); - // Update the app home view await client.views.publish({ user_id: userId, @@ -440,47 +447,4 @@ export class ActionHandler { logger.error(`Failed to update app home for user ${userId}:`, error); } } - - - /** - * Fetch repository README content - */ - private async fetchRepositoryReadme( - repositoryUrl: string - ): Promise { - try { - const urlParts = repositoryUrl - .replace(/^https?:\/\//, "") - .replace(/\.git$/, "") - .split("/"); - - if (urlParts.length < 3) { - return null; - } - - const owner = urlParts[1]; - const repo = urlParts[2]; - const branch = "main"; - - const readmeUrl = `https://raw.githubusercontent.com/${owner}/${repo}/${branch}/README.md`; - - const response = await fetch(readmeUrl); - if (response.ok) { - const content = await response.text(); - return content.substring(0, 1000); - } - - // Try master branch - const masterUrl = `https://raw.githubusercontent.com/${owner}/${repo}/master/README.md`; - const masterResponse = await fetch(masterUrl); - if (masterResponse.ok) { - const content = await masterResponse.text(); - return content.substring(0, 1000); - } - } catch (error) { - logger.error(`Failed to fetch README for ${repositoryUrl}:`, error); - } - - return null; - } } diff --git a/packages/dispatcher/src/slack/handlers/repository-modal-utils.ts b/packages/dispatcher/src/slack/handlers/repository-modal-utils.ts index 766eb53c..6e6f1959 100644 --- a/packages/dispatcher/src/slack/handlers/repository-modal-utils.ts +++ b/packages/dispatcher/src/slack/handlers/repository-modal-utils.ts @@ -74,7 +74,9 @@ export async function openRepositoryModal({ }, }); - const { generateGitHubAuthUrl } = await import("../../../../../modules/github/utils"); + const { generateGitHubAuthUrl } = await import( + "../../../../../modules/github/utils" + ); const authUrl = generateGitHubAuthUrl(userId); blocks.push({ type: "section", diff --git a/packages/dispatcher/src/slack/handlers/shortcut-command-handler.ts b/packages/dispatcher/src/slack/handlers/shortcut-command-handler.ts index 2e8f8e4b..bb75d6e0 100644 --- a/packages/dispatcher/src/slack/handlers/shortcut-command-handler.ts +++ b/packages/dispatcher/src/slack/handlers/shortcut-command-handler.ts @@ -59,7 +59,9 @@ export class ShortcutCommandHandler { const userId = body.user.id; logger.info(`Create project shortcut triggered by ${userId}`); - const { getUserGitHubInfo } = await import("../../../../../modules/github/handlers"); + const { getUserGitHubInfo } = await import( + "../../../../../modules/github/handlers" + ); await openRepositoryModal({ userId, body, @@ -145,7 +147,9 @@ export class ShortcutCommandHandler { threadTs?: string ): Promise { // Check if user has GitHub connected - const { getUserGitHubInfo } = await import("../../../../../modules/github/handlers"); + const { getUserGitHubInfo } = await import( + "../../../../../modules/github/handlers" + ); const githubUser = await getUserGitHubInfo(userId); const isGitHubConnected = !!githubUser.token; @@ -437,8 +441,10 @@ export class ShortcutCommandHandler { // Create new repository // Get GitHub user info // const username = await this.messageHandler.getOrCreateUserMapping(userId, client); // Currently unused - const { getUserGitHubInfo } = await import("../../../../../modules/github/handlers"); - const githubUser = await getUserGitHubInfo(userId); + const { getUserGitHubInfo } = await import( + "../../../../../modules/github/handlers" + ); + const githubUser = await getUserGitHubInfo(userId); if (!githubUser.token) { throw new Error( diff --git a/packages/dispatcher/src/slack/slack-event-handlers.ts b/packages/dispatcher/src/slack/slack-event-handlers.ts index fddc566a..ba1dc014 100644 --- a/packages/dispatcher/src/slack/slack-event-handlers.ts +++ b/packages/dispatcher/src/slack/slack-event-handlers.ts @@ -17,6 +17,7 @@ import { MessageHandler } from "./handlers/message-handler"; import { ActionHandler } from "./handlers/action-handler"; import { ShortcutCommandHandler } from "./handlers/shortcut-command-handler"; import { moduleRegistry } from "../../../../modules"; +import type { GitHubModule } from "../../../../modules/github"; /** * Queue-based Slack event handlers that route messages to appropriate queues @@ -33,11 +34,11 @@ export class SlackEventHandlers { private config: DispatcherConfig ) { // Get repository manager from GitHub module (optional) - const githubModule = moduleRegistry.getModule('github'); + const githubModule = moduleRegistry.getModule("github"); const repoManager = githubModule?.getRepositoryManager(); - + if (!repoManager) { - logger.warn('GitHub module not available - some features may be limited'); + logger.warn("GitHub module not available - some features may be limited"); } // Initialize specialized handlers @@ -46,12 +47,7 @@ export class SlackEventHandlers { repoManager, config ); - this.actionHandler = new ActionHandler( - repoManager, - queueProducer, - config, - this.messageHandler - ); + this.actionHandler = new ActionHandler(queueProducer, this.messageHandler); this.shortcutCommandHandler = new ShortcutCommandHandler( app, config, @@ -80,6 +76,11 @@ export class SlackEventHandlers { const query = options?.value || ""; const userId = body.user?.id; + if (!userId) { + await ack({ options: [] }); + return; + } + logger.info( `Repository search triggered - query: "${query}", user: ${userId}` ); @@ -87,7 +88,14 @@ export class SlackEventHandlers { try { // Get user's GitHub token logger.info(`Fetching GitHub info for user ${userId}`); - const githubUser = await getUserGitHubInfo(userId); + const gitHubModule = moduleRegistry.getModule("github"); + if (!gitHubModule) { + logger.warn("GitHub module not available - returning empty options"); + await ack({ options: [] }); + return; + } + + const githubUser = await gitHubModule.getUserInfo(userId); logger.info( `GitHub user info retrieved: token=${!!githubUser.token}, username=${githubUser.username}` ); diff --git a/packages/dispatcher/src/types.ts b/packages/dispatcher/src/types.ts index a568a50a..29dd8610 100644 --- a/packages/dispatcher/src/types.ts +++ b/packages/dispatcher/src/types.ts @@ -19,7 +19,6 @@ export interface SlackConfig { allowPrivateChannels?: boolean; } - export interface QueueConfig { directMessage: string; messageQueue: string; @@ -36,7 +35,6 @@ export interface AnthropicProxyConfig { anthropicBaseUrl?: string; } - export interface DispatcherConfig { slack: SlackConfig; claude: Partial; diff --git a/packages/orchestrator/src/base/BaseDeploymentManager.ts b/packages/orchestrator/src/base/BaseDeploymentManager.ts index c227aa0d..0326a03b 100644 --- a/packages/orchestrator/src/base/BaseDeploymentManager.ts +++ b/packages/orchestrator/src/base/BaseDeploymentManager.ts @@ -226,7 +226,7 @@ export abstract class BaseDeploymentManager { const dbHost = dbUrl.hostname; const dbPort = dbUrl.port || "5432"; // Default PostgreSQL port - const envVars: { [key: string]: string } = { + let envVars: { [key: string]: string } = { USER_ID: userId, USERNAME: username, DEPLOYMENT_NAME: deploymentName, @@ -258,12 +258,12 @@ export abstract class BaseDeploymentManager { envVars.GITHUB_TOKEN = process.env.GITHUB_TOKEN; } // OAuth token is now always handled by the proxy in dispatcher - + // Add module-specific environment variables try { - envVars = await buildModuleEnvVars(messageData?.userId || '', envVars); + envVars = await buildModuleEnvVars(messageData?.userId || "", envVars); } catch (error) { - logger.warn('Failed to build module environment variables:', error); + logger.warn("Failed to build module environment variables:", error); } } diff --git a/packages/orchestrator/src/index.ts b/packages/orchestrator/src/index.ts index 7b048772..e1d75ad7 100644 --- a/packages/orchestrator/src/index.ts +++ b/packages/orchestrator/src/index.ts @@ -30,7 +30,7 @@ class PeerbotOrchestrator { constructor(config: OrchestratorConfig) { this.config = config; - + // Register modules moduleRegistry.register(new GitHubModule()); this.dbPool = new DatabasePool(config.database); @@ -187,7 +187,7 @@ class PeerbotOrchestrator { // Initialize modules await moduleRegistry.initAll(); logger.info("✅ Modules initialized"); - + // Run database migrations using dbmate (this will create database and run migrations) await this.runDbmateMigrations(); diff --git a/packages/orchestrator/src/module-integration.ts b/packages/orchestrator/src/module-integration.ts index 87a7a616..f2c5e5cf 100644 --- a/packages/orchestrator/src/module-integration.ts +++ b/packages/orchestrator/src/module-integration.ts @@ -1,18 +1,24 @@ -import { moduleRegistry } from '../../../modules'; +import { moduleRegistry } from "../../../modules"; -export async function buildModuleEnvVars(userId: string, baseEnv: Record): Promise> { +export async function buildModuleEnvVars( + userId: string, + baseEnv: Record +): Promise> { let envVars = { ...baseEnv }; - + const orchestratorModules = moduleRegistry.getOrchestratorModules(); for (const module of orchestratorModules) { if (module.buildEnvVars) { try { envVars = await module.buildEnvVars(userId, envVars); } catch (error) { - console.error(`Failed to build env vars for module ${module.name}:`, error); + console.error( + `Failed to build env vars for module ${module.name}:`, + error + ); } } } - + return envVars; -} \ No newline at end of file +} diff --git a/packages/shared/src/config/index.ts b/packages/shared/src/config/index.ts index f73d60af..bc972a92 100644 --- a/packages/shared/src/config/index.ts +++ b/packages/shared/src/config/index.ts @@ -24,7 +24,6 @@ export const SlackConfigSchema = z.object({ .default("INFO"), }); - // Claude configuration schema export const ClaudeConfigSchema = z.object({ apiKey: z.string().optional(), @@ -112,7 +111,6 @@ export function loadSlackConfig(): SlackConfig { return SlackConfigSchema.parse(config); } - /** * Loads Claude configuration from environment variables */ diff --git a/packages/shared/src/errors/dispatcher-errors.ts b/packages/shared/src/errors/dispatcher-errors.ts index 2c84d63c..7c986159 100644 --- a/packages/shared/src/errors/dispatcher-errors.ts +++ b/packages/shared/src/errors/dispatcher-errors.ts @@ -1,2 +1,2 @@ // GitHub-specific errors moved to modules/github/errors.ts -// This file can be removed \ No newline at end of file +// This file can be removed diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts index 1d39f890..0396bef5 100644 --- a/packages/worker/src/index.ts +++ b/packages/worker/src/index.ts @@ -28,7 +28,7 @@ async function main() { // Initialize available modules await moduleRegistry.initAll(); logger.info("✅ Modules initialized"); - + logger.info( "🔄 Starting in queue mode (dynamic deployment-based persistent worker)" ); diff --git a/packages/worker/src/module-integration.ts b/packages/worker/src/module-integration.ts index 59dd21e4..3208fac4 100644 --- a/packages/worker/src/module-integration.ts +++ b/packages/worker/src/module-integration.ts @@ -1,25 +1,36 @@ -import { moduleRegistry, type SessionContext, type ActionButton } from '../../../modules'; +import { + moduleRegistry, + type SessionContext, + type ActionButton, +} from "../../../modules"; -export async function onSessionStart(context: SessionContext): Promise { +export async function onSessionStart( + context: SessionContext +): Promise { let updatedContext = context; - + const workerModules = moduleRegistry.getWorkerModules(); for (const module of workerModules) { if (module.onSessionStart) { try { updatedContext = await module.onSessionStart(updatedContext); } catch (error) { - console.error(`Failed to execute onSessionStart for module ${module.name}:`, error); + console.error( + `Failed to execute onSessionStart for module ${module.name}:`, + error + ); } } } - + return updatedContext; } -export async function onSessionEnd(context: SessionContext): Promise { +export async function onSessionEnd( + context: SessionContext +): Promise { const allButtons: ActionButton[] = []; - + const workerModules = moduleRegistry.getWorkerModules(); for (const module of workerModules) { if (module.onSessionEnd) { @@ -27,11 +38,14 @@ export async function onSessionEnd(context: SessionContext): Promise { try { await module.initWorkspace(config); } catch (error) { - console.error(`Failed to initialize workspace for module ${module.name}:`, error); + console.error( + `Failed to initialize workspace for module ${module.name}:`, + error + ); } } } -} \ No newline at end of file +} diff --git a/packages/worker/src/task-queue-integration.ts b/packages/worker/src/task-queue-integration.ts index 6f986e74..96e42356 100644 --- a/packages/worker/src/task-queue-integration.ts +++ b/packages/worker/src/task-queue-integration.ts @@ -2,6 +2,7 @@ import PgBoss from "pg-boss"; import { createLogger } from "@peerbot/shared"; +import type { GitHubModule } from "../../../modules/github"; const logger = createLogger("worker"); @@ -280,11 +281,16 @@ export class QueueIntegration { // Check if GitHub CLI is authenticated through module let isAuthenticated = false; try { - const { moduleRegistry } = await import('../../../modules'); - const githubModule = moduleRegistry.getModule('github'); - if (githubModule && 'isGitHubCLIAuthenticated' in githubModule) { - isAuthenticated = await (githubModule as any).isGitHubCLIAuthenticated(workingDir); - logger.info(`GitHub CLI authentication status: ${isAuthenticated}`); + const { moduleRegistry } = await import("../../../modules"); + const githubModule = + moduleRegistry.getModule("github"); + if (githubModule && "isGitHubCLIAuthenticated" in githubModule) { + isAuthenticated = await ( + githubModule as any + ).isGitHubCLIAuthenticated(workingDir); + logger.info( + `GitHub CLI authentication status: ${isAuthenticated}` + ); } else { // Fallback to direct check logger.info("Checking GitHub CLI authentication (fallback)..."); @@ -598,13 +604,18 @@ export class QueueIntegration { // Generate GitHub OAuth URL for authentication through module let authUrl = `${process.env.INGRESS_URL || "http://localhost:8080"}/login`; try { - const { moduleRegistry } = await import('../../../modules'); - const githubModule = moduleRegistry.getModule('github'); - if (githubModule && 'generateOAuthUrl' in githubModule) { - authUrl = (githubModule as any).generateOAuthUrl(process.env.USER_ID || ''); + const { moduleRegistry } = await import("../../../modules"); + const githubModule = moduleRegistry.getModule("github"); + if (githubModule && "generateOAuthUrl" in githubModule) { + authUrl = (githubModule as any).generateOAuthUrl( + process.env.USER_ID || "" + ); } } catch (moduleError) { - console.warn('Failed to get GitHub OAuth URL from module, using fallback:', moduleError); + console.warn( + "Failed to get GitHub OAuth URL from module, using fallback:", + moduleError + ); } // Create a rich message with buttons diff --git a/packages/worker/src/workspace-manager.ts b/packages/worker/src/workspace-manager.ts index 14c838c2..5b59f253 100644 --- a/packages/worker/src/workspace-manager.ts +++ b/packages/worker/src/workspace-manager.ts @@ -5,6 +5,7 @@ import { mkdir, stat } from "node:fs/promises"; import { join } from "node:path"; import { promisify } from "node:util"; import { createLogger } from "@peerbot/shared"; +import type { GitHubModule } from "../../../modules/github"; import type { GitRepository, WorkspaceInfo, @@ -117,16 +118,19 @@ export class WorkspaceManager { await this.setupGitConfig(userDirectory, username); // Setup GitHub CLI authentication through module if available - if (process.env.GITHUB_TOKEN && repositoryUrl.includes('github.com')) { + if (process.env.GITHUB_TOKEN && repositoryUrl.includes("github.com")) { try { - const { moduleRegistry } = await import('../../../modules'); - const githubModule = moduleRegistry.getModule('github'); - if (githubModule && 'init' in githubModule) { + const { moduleRegistry } = await import("../../../modules"); + const githubModule = moduleRegistry.getModule("github"); + if (githubModule && "init" in githubModule) { // GitHub module will handle CLI authentication during its own setup logger.info("GitHub module will handle CLI authentication"); } } catch (error) { - logger.warn("Failed to setup GitHub CLI authentication through module:", error); + logger.warn( + "Failed to setup GitHub CLI authentication through module:", + error + ); // Non-fatal - continue without gh CLI } } @@ -180,11 +184,14 @@ export class WorkspaceManager { // Use GitHub token for authentication through module let authenticatedUrl = repositoryUrl; - if (this.config.githubToken && repositoryUrl.includes('github.com')) { - const { moduleRegistry } = await import('../../../modules'); - const githubModule = moduleRegistry.getModule('github'); - if (githubModule && 'addGitHubAuth' in githubModule) { - authenticatedUrl = (githubModule as any).addGitHubAuth(repositoryUrl, this.config.githubToken); + if (this.config.githubToken && repositoryUrl.includes("github.com")) { + const { moduleRegistry } = await import("../../../modules"); + const githubModule = moduleRegistry.getModule("github"); + if (githubModule && "addGitHubAuth" in githubModule) { + authenticatedUrl = (githubModule as any).addGitHubAuth( + repositoryUrl, + this.config.githubToken + ); } } @@ -393,7 +400,6 @@ export class WorkspaceManager { } } - /** * Check if directory exists */ diff --git a/tsconfig.json b/tsconfig.json index 090fe17e..20f7d697 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -23,9 +23,23 @@ // Some stricter flags "noUnusedLocals": true, "noUnusedParameters": true, - "noPropertyAccessFromIndexSignature": false + "noPropertyAccessFromIndexSignature": false, + + // Workspace module resolution + "baseUrl": ".", + "paths": { + "@peerbot/shared": ["packages/shared/src/index.ts"], + "@peerbot/shared/*": ["packages/shared/src/*"], + "@peerbot/dispatcher": ["packages/dispatcher/src/index.ts"], + "@peerbot/dispatcher/*": ["packages/dispatcher/src/*"], + "@peerbot/orchestrator": ["packages/orchestrator/src/index.ts"], + "@peerbot/orchestrator/*": ["packages/orchestrator/src/*"], + "@peerbot/worker": ["packages/worker/src/index.ts"], + "@peerbot/worker/*": ["packages/worker/src/*"] + } }, "include": [ + "modules/**/*", "packages/*/src/**/*", "packages/*/__tests__/**/*", "src/**/*", From 2b11395c18f97277882dac84082ae9e4fc0fe6dd Mon Sep 17 00:00:00 2001 From: "claude[bot]" <209825114+claude[bot]@users.noreply.github.com> Date: Sat, 4 Oct 2025 21:32:13 +0000 Subject: [PATCH 08/12] feat: complete module system implementation with endpoint registration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add module HTTP endpoint registration system - Move OAuth implementation to GitHub module - Remove all GitHub/git code from core packages (dispatcher, orchestrator, worker) - Fix type safety with GitHubModuleInterface - Add proper error handling and validation for module buttons - Add null checks for optional repository manager - Restore OAuth endpoints (/api/github/oauth/*) via module system Co-authored-by: Burak Emre Kabakcı --- modules/github/handlers.ts | 9 +++- modules/github/index.ts | 38 ++++++++++++++- modules/index.ts | 12 +++++ modules/types.ts | 20 ++++++++ .../src/queue/slack-thread-processor.ts | 46 +++++++++++++------ packages/dispatcher/src/simple-http.ts | 5 ++ .../src/slack/handlers/message-handler.ts | 5 +- .../src/base/BaseDeploymentManager.ts | 7 +-- packages/orchestrator/src/index.ts | 3 -- .../src/k8s/K8sDeploymentManager.ts | 12 +---- packages/worker/src/task-queue-integration.ts | 16 +++---- packages/worker/src/workspace-manager.ts | 10 ++-- 12 files changed, 131 insertions(+), 52 deletions(-) diff --git a/modules/github/handlers.ts b/modules/github/handlers.ts index d63fcd7b..5ac1fee7 100644 --- a/modules/github/handlers.ts +++ b/modules/github/handlers.ts @@ -273,7 +273,7 @@ export class GitHubOAuthHandler { } /** - * Handle logout + * Handle logout/revoke */ async handleLogout(req: Request, res: Response): Promise { try { @@ -298,6 +298,13 @@ export class GitHubOAuthHandler { } } + /** + * Handle OAuth revoke (alias for logout) + */ + async handleRevoke(req: Request, res: Response): Promise { + return this.handleLogout(req, res); + } + /** * Cleanup resources */ diff --git a/modules/github/index.ts b/modules/github/index.ts index b1120dff..398c45ff 100644 --- a/modules/github/index.ts +++ b/modules/github/index.ts @@ -4,12 +4,13 @@ import type { WorkerModule, OrchestratorModule, DispatcherModule, + GitHubModuleInterface, SessionContext, ActionButton, ThreadContext, } from "../types"; import { GitHubRepositoryManager } from "./repository-manager"; -import { getUserGitHubInfo } from "./handlers"; +import { getUserGitHubInfo, GitHubOAuthHandler } from "./handlers"; import { generateGitHubAuthUrl } from "./utils"; // GitHub configuration schema (module-specific) @@ -45,10 +46,11 @@ export function loadGitHubConfig(): GitHubConfig { } export class GitHubModule - implements HomeTabModule, WorkerModule, OrchestratorModule, DispatcherModule + implements HomeTabModule, WorkerModule, OrchestratorModule, DispatcherModule, GitHubModuleInterface { name = "github"; private repoManager?: GitHubRepositoryManager; + private oauthHandler?: GitHubOAuthHandler; isEnabled(): boolean { return !!(process.env.GITHUB_CLIENT_ID && process.env.GITHUB_CLIENT_SECRET); @@ -62,6 +64,38 @@ export class GitHubModule config, process.env.DATABASE_URL ); + this.oauthHandler = new GitHubOAuthHandler(process.env.DATABASE_URL!); + } + + registerEndpoints(app: any): void { + if (!this.isEnabled() || !this.oauthHandler) { + console.warn("GitHub module not enabled or OAuth handler not initialized - skipping endpoint registration"); + return; + } + + if (!app) { + throw new Error("Express app is required for endpoint registration"); + } + + try { + // Register OAuth endpoints + app.get("/api/github/oauth/authorize", (req: any, res: any) => { + this.oauthHandler!.handleAuthorize(req, res); + }); + + app.get("/api/github/oauth/callback", (req: any, res: any) => { + this.oauthHandler!.handleCallback(req, res); + }); + + app.post("/api/github/oauth/revoke", (req: any, res: any) => { + this.oauthHandler!.handleRevoke(req, res); + }); + + console.info("✅ GitHub OAuth endpoints registered successfully"); + } catch (error) { + console.error("Failed to register GitHub OAuth endpoints:", error); + throw error; + } } async renderHomeTab(userId: string): Promise { diff --git a/modules/index.ts b/modules/index.ts index c8a36177..b232ee32 100644 --- a/modules/index.ts +++ b/modules/index.ts @@ -27,6 +27,18 @@ export class ModuleRegistry { } } + registerEndpoints(app: any): void { + for (const module of this.modules.values()) { + if (module.registerEndpoints) { + try { + module.registerEndpoints(app); + } catch (error) { + console.error(`Failed to register endpoints for module ${module.name}:`, error); + } + } + } + } + private autoRegisterModules(): void { // Auto-register GitHub module const gitHubModule = new GitHubModule(); diff --git a/modules/types.ts b/modules/types.ts index 67ef6630..7c2919df 100644 --- a/modules/types.ts +++ b/modules/types.ts @@ -7,6 +7,9 @@ export interface ModuleInterface { /** Initialize module - called once at startup */ init?(): Promise; + + /** Register HTTP endpoints with Express app */ + registerEndpoints?(app: any): void; } export interface HomeTabModule extends ModuleInterface { @@ -80,3 +83,20 @@ export interface ThreadContext { userMappings: Map; slackClient?: any; } + +export interface GitHubModuleInterface extends ModuleInterface { + /** Add GitHub authentication to repository URL */ + addGitHubAuth(repositoryUrl: string, token: string): string; + + /** Generate OAuth URL for user authentication */ + generateOAuthUrl(userId: string): string; + + /** Check if GitHub CLI is authenticated */ + isGitHubCLIAuthenticated(workingDir: string): Promise; + + /** Get repository manager instance */ + getRepositoryManager(): any; + + /** Get user GitHub info */ + getUserInfo(userId: string): Promise<{ token: string | null; username: string | null }>; +} diff --git a/packages/dispatcher/src/queue/slack-thread-processor.ts b/packages/dispatcher/src/queue/slack-thread-processor.ts index 347c28ae..f4862745 100644 --- a/packages/dispatcher/src/queue/slack-thread-processor.ts +++ b/packages/dispatcher/src/queue/slack-thread-processor.ts @@ -405,13 +405,22 @@ export class ThreadResponseConsumer { slackClient: this.slackClient, }); actionButtons.push( - ...moduleButtons.map((btn) => ({ - type: "button", - text: { type: "plain_text", text: btn.text }, - action_id: btn.action_id, - style: btn.style, - value: btn.value, - })) + ...moduleButtons + .filter((btn) => { + // Validate required button properties + if (!btn.text || !btn.action_id) { + logger.warn(`Invalid button from module ${module.name}: missing text or action_id`, btn); + return false; + } + return true; + }) + .map((btn) => ({ + type: "button", + text: { type: "plain_text", text: btn.text }, + action_id: btn.action_id, + style: btn.style, + value: btn.value, + })) ); } } @@ -641,13 +650,22 @@ export class ThreadResponseConsumer { slackClient: this.slackClient, }); actionButtons.push( - ...moduleButtons.map((btn) => ({ - type: "button", - text: { type: "plain_text", text: btn.text }, - action_id: btn.action_id, - style: btn.style, - value: btn.value, - })) + ...moduleButtons + .filter((btn) => { + // Validate required button properties + if (!btn.text || !btn.action_id) { + logger.warn(`Invalid button from module ${module.name}: missing text or action_id`, btn); + return false; + } + return true; + }) + .map((btn) => ({ + type: "button", + text: { type: "plain_text", text: btn.text }, + action_id: btn.action_id, + style: btn.style, + value: btn.value, + })) ); } } diff --git a/packages/dispatcher/src/simple-http.ts b/packages/dispatcher/src/simple-http.ts index 35a1b909..db228a36 100644 --- a/packages/dispatcher/src/simple-http.ts +++ b/packages/dispatcher/src/simple-http.ts @@ -1,6 +1,7 @@ import http from "node:http"; import express from "express"; import { createLogger } from "@peerbot/shared"; +import { moduleRegistry } from "../../../modules"; const logger = createLogger("http"); import type { AnthropicProxy } from "./proxy/anthropic-proxy"; @@ -37,6 +38,10 @@ export function setupHealthEndpoints(anthropicProxy?: AnthropicProxy) { logger.info("✅ Anthropic proxy enabled at :8080/api/anthropic"); } + // Register module endpoints + moduleRegistry.registerEndpoints(proxyApp); + logger.info("✅ Module endpoints registered"); + // Create HTTP server with Express app healthServer = http.createServer(proxyApp); diff --git a/packages/dispatcher/src/slack/handlers/message-handler.ts b/packages/dispatcher/src/slack/handlers/message-handler.ts index f73be26e..007ce1f8 100644 --- a/packages/dispatcher/src/slack/handlers/message-handler.ts +++ b/packages/dispatcher/src/slack/handlers/message-handler.ts @@ -247,12 +247,15 @@ export class MessageHandler { if (cachedRepo && Date.now() - cachedRepo.timestamp < this.CACHE_TTL) { repository = cachedRepo.repository; logger.info(`Using cached repository for ${username}`); - } else { + } else if (this.repoManager) { repository = await this.repoManager.ensureUserRepository(username); this.repositoryCache.set(username, { repository, timestamp: Date.now(), }); + } else { + logger.warn("Repository manager not available - proceeding without repository information"); + repository = null; } } diff --git a/packages/orchestrator/src/base/BaseDeploymentManager.ts b/packages/orchestrator/src/base/BaseDeploymentManager.ts index 0326a03b..d5500c6e 100644 --- a/packages/orchestrator/src/base/BaseDeploymentManager.ts +++ b/packages/orchestrator/src/base/BaseDeploymentManager.ts @@ -254,14 +254,9 @@ export abstract class BaseDeploymentManager { // Include secrets from process.env for Docker deployments if (includeSecrets) { - if (process.env.GITHUB_TOKEN) { - envVars.GITHUB_TOKEN = process.env.GITHUB_TOKEN; - } - // OAuth token is now always handled by the proxy in dispatcher - // Add module-specific environment variables try { - envVars = await buildModuleEnvVars(messageData?.userId || "", envVars); + envVars = await buildModuleEnvVars(userId, envVars); } catch (error) { logger.warn("Failed to build module environment variables:", error); } diff --git a/packages/orchestrator/src/index.ts b/packages/orchestrator/src/index.ts index e1d75ad7..b18fb649 100644 --- a/packages/orchestrator/src/index.ts +++ b/packages/orchestrator/src/index.ts @@ -6,7 +6,6 @@ import { initSentry } from "@peerbot/shared"; initSentry(); import { moduleRegistry } from "../../../modules"; -import { GitHubModule } from "../../../modules/github"; import { join } from "node:path"; import { config as dotenvConfig } from "dotenv"; @@ -31,8 +30,6 @@ class PeerbotOrchestrator { constructor(config: OrchestratorConfig) { this.config = config; - // Register modules - moduleRegistry.register(new GitHubModule()); this.dbPool = new DatabasePool(config.database); this.deploymentManager = this.createDeploymentManager(config); this.queueConsumer = new QueueConsumer(config, this.deploymentManager); diff --git a/packages/orchestrator/src/k8s/K8sDeploymentManager.ts b/packages/orchestrator/src/k8s/K8sDeploymentManager.ts index ee7efceb..018fcc43 100644 --- a/packages/orchestrator/src/k8s/K8sDeploymentManager.ts +++ b/packages/orchestrator/src/k8s/K8sDeploymentManager.ts @@ -341,17 +341,7 @@ export class K8sDeploymentManager extends BaseDeploymentManager { name: "NODE_ENV", value: process.env.NODE_ENV || "production", }, - // K8s-specific secrets that can't be handled in base class - { - name: "GITHUB_TOKEN", - valueFrom: { - secretKeyRef: { - name: "peerbot-secrets", - key: "github-token", - optional: true, - } as any, - }, - }, + // Module-specific environment variables are added through base class ], resources: { requests: this.config.worker.resources.requests, diff --git a/packages/worker/src/task-queue-integration.ts b/packages/worker/src/task-queue-integration.ts index 96e42356..a9cb7df0 100644 --- a/packages/worker/src/task-queue-integration.ts +++ b/packages/worker/src/task-queue-integration.ts @@ -2,7 +2,7 @@ import PgBoss from "pg-boss"; import { createLogger } from "@peerbot/shared"; -import type { GitHubModule } from "../../../modules/github"; +import type { GitHubModuleInterface } from "../../../modules/types"; const logger = createLogger("worker"); @@ -283,11 +283,9 @@ export class QueueIntegration { try { const { moduleRegistry } = await import("../../../modules"); const githubModule = - moduleRegistry.getModule("github"); - if (githubModule && "isGitHubCLIAuthenticated" in githubModule) { - isAuthenticated = await ( - githubModule as any - ).isGitHubCLIAuthenticated(workingDir); + moduleRegistry.getModule("github"); + if (githubModule) { + isAuthenticated = await githubModule.isGitHubCLIAuthenticated(workingDir); logger.info( `GitHub CLI authentication status: ${isAuthenticated}` ); @@ -605,9 +603,9 @@ export class QueueIntegration { let authUrl = `${process.env.INGRESS_URL || "http://localhost:8080"}/login`; try { const { moduleRegistry } = await import("../../../modules"); - const githubModule = moduleRegistry.getModule("github"); - if (githubModule && "generateOAuthUrl" in githubModule) { - authUrl = (githubModule as any).generateOAuthUrl( + const githubModule = moduleRegistry.getModule("github"); + if (githubModule) { + authUrl = githubModule.generateOAuthUrl( process.env.USER_ID || "" ); } diff --git a/packages/worker/src/workspace-manager.ts b/packages/worker/src/workspace-manager.ts index 5b59f253..cacf6d4c 100644 --- a/packages/worker/src/workspace-manager.ts +++ b/packages/worker/src/workspace-manager.ts @@ -5,7 +5,7 @@ import { mkdir, stat } from "node:fs/promises"; import { join } from "node:path"; import { promisify } from "node:util"; import { createLogger } from "@peerbot/shared"; -import type { GitHubModule } from "../../../modules/github"; +import type { GitHubModuleInterface } from "../../../modules/types"; import type { GitRepository, WorkspaceInfo, @@ -121,7 +121,7 @@ export class WorkspaceManager { if (process.env.GITHUB_TOKEN && repositoryUrl.includes("github.com")) { try { const { moduleRegistry } = await import("../../../modules"); - const githubModule = moduleRegistry.getModule("github"); + const githubModule = moduleRegistry.getModule("github"); if (githubModule && "init" in githubModule) { // GitHub module will handle CLI authentication during its own setup logger.info("GitHub module will handle CLI authentication"); @@ -186,9 +186,9 @@ export class WorkspaceManager { let authenticatedUrl = repositoryUrl; if (this.config.githubToken && repositoryUrl.includes("github.com")) { const { moduleRegistry } = await import("../../../modules"); - const githubModule = moduleRegistry.getModule("github"); - if (githubModule && "addGitHubAuth" in githubModule) { - authenticatedUrl = (githubModule as any).addGitHubAuth( + const githubModule = moduleRegistry.getModule("github"); + if (githubModule) { + authenticatedUrl = githubModule.addGitHubAuth( repositoryUrl, this.config.githubToken ); From 0970f8a96999e9ad210dde7e147e00e1da713c08 Mon Sep 17 00:00:00 2001 From: "claude[bot]" <209825114+claude[bot]@users.noreply.github.com> Date: Sun, 5 Oct 2025 11:28:24 +0000 Subject: [PATCH 09/12] refactor: clean module system architecture - remove GitHub dependencies from core MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Move GitHubModuleInterface to GitHub module where it belongs - Remove githubToken from worker types (handled by GitHub module) - Make ThreadContext generic with moduleFields for module-specific data - Remove hardcoded GitHub fields (gitBranch, hasGitChanges, pullRequestUrl, userMappings) - Remove GitHub token environment handling from workspace-manager - Update thread processor to use generic moduleFields structure - Remove hardcoded GitHub references from prompts - Clean up imports and unused GitHub type references Core packages (dispatcher, orchestrator, worker) now have minimal GitHub dependencies and only interact through proper module interfaces. Co-authored-by: Burak Emre Kabakcı --- modules/github/index.ts | 31 ++++++++++++++++--- modules/types.ts | 22 +------------ .../src/queue/slack-thread-processor.ts | 24 +++++++++----- packages/worker/src/core/prompt-generation.ts | 4 +-- packages/worker/src/queue/queue-consumer.ts | 1 - packages/worker/src/task-queue-integration.ts | 2 +- packages/worker/src/types.ts | 2 -- packages/worker/src/workspace-manager.ts | 31 ++----------------- 8 files changed, 48 insertions(+), 69 deletions(-) diff --git a/modules/github/index.ts b/modules/github/index.ts index 398c45ff..507e1495 100644 --- a/modules/github/index.ts +++ b/modules/github/index.ts @@ -1,10 +1,10 @@ import { z } from "zod"; import type { + ModuleInterface, HomeTabModule, WorkerModule, OrchestratorModule, DispatcherModule, - GitHubModuleInterface, SessionContext, ActionButton, ThreadContext, @@ -13,6 +13,24 @@ import { GitHubRepositoryManager } from "./repository-manager"; import { getUserGitHubInfo, GitHubOAuthHandler } from "./handlers"; import { generateGitHubAuthUrl } from "./utils"; +// GitHub-specific module interface (defined in GitHub module) +export interface GitHubModuleInterface extends ModuleInterface { + /** Add GitHub authentication to repository URL */ + addGitHubAuth(repositoryUrl: string, token: string): string; + + /** Generate OAuth URL for user authentication */ + generateOAuthUrl(userId: string): string; + + /** Check if GitHub CLI is authenticated */ + isGitHubCLIAuthenticated(workingDir: string): Promise; + + /** Get repository manager instance */ + getRepositoryManager(): any; + + /** Get user GitHub info */ + getUserInfo(userId: string): Promise<{ token: string | null; username: string | null }>; +} + // GitHub configuration schema (module-specific) export const GitHubConfigSchema = z.object({ appId: z.string().optional(), @@ -315,13 +333,16 @@ export class GitHubModule return []; } + // Extract GitHub-specific fields from moduleFields + const githubFields = context.moduleFields?.github || {}; + const { generateGitHubActionButtons } = await import("./actions"); const buttons = await generateGitHubActionButtons( context.userId, - context.gitBranch, - context.hasGitChanges, - context.pullRequestUrl, - context.userMappings, + githubFields.gitBranch, + githubFields.hasGitChanges, + githubFields.pullRequestUrl, + githubFields.userMappings || new Map(), this.repoManager, context.slackClient ); diff --git a/modules/types.ts b/modules/types.ts index 7c2919df..94b85db5 100644 --- a/modules/types.ts +++ b/modules/types.ts @@ -77,26 +77,6 @@ export interface ThreadContext { userId: string; channelId: string; threadTs: string; - gitBranch?: string; - hasGitChanges?: boolean; - pullRequestUrl?: string; - userMappings: Map; slackClient?: any; -} - -export interface GitHubModuleInterface extends ModuleInterface { - /** Add GitHub authentication to repository URL */ - addGitHubAuth(repositoryUrl: string, token: string): string; - - /** Generate OAuth URL for user authentication */ - generateOAuthUrl(userId: string): string; - - /** Check if GitHub CLI is authenticated */ - isGitHubCLIAuthenticated(workingDir: string): Promise; - - /** Get repository manager instance */ - getRepositoryManager(): any; - - /** Get user GitHub info */ - getUserInfo(userId: string): Promise<{ token: string | null; username: string | null }>; + moduleFields?: Record; // Generic fields for modules to use } diff --git a/packages/dispatcher/src/queue/slack-thread-processor.ts b/packages/dispatcher/src/queue/slack-thread-processor.ts index f4862745..1f7c4075 100644 --- a/packages/dispatcher/src/queue/slack-thread-processor.ts +++ b/packages/dispatcher/src/queue/slack-thread-processor.ts @@ -398,11 +398,15 @@ export class ThreadResponseConsumer { userId, channelId: data.channelId, threadTs: data.threadTs, - gitBranch: data.gitBranch, - hasGitChanges: data.hasGitChanges, - pullRequestUrl: data.pullRequestUrl, - userMappings: this.userMappings, slackClient: this.slackClient, + moduleFields: { + github: { + gitBranch: data.gitBranch, + hasGitChanges: data.hasGitChanges, + pullRequestUrl: data.pullRequestUrl, + userMappings: this.userMappings, + } + } }); actionButtons.push( ...moduleButtons @@ -643,11 +647,15 @@ export class ThreadResponseConsumer { userId, channelId: data.channelId, threadTs: data.threadTs, - gitBranch: data.gitBranch, - hasGitChanges: data.hasGitChanges, - pullRequestUrl: data.pullRequestUrl, - userMappings: this.userMappings, slackClient: this.slackClient, + moduleFields: { + github: { + gitBranch: data.gitBranch, + hasGitChanges: data.hasGitChanges, + pullRequestUrl: data.pullRequestUrl, + userMappings: this.userMappings, + } + } }); actionButtons.push( ...moduleButtons diff --git a/packages/worker/src/core/prompt-generation.ts b/packages/worker/src/core/prompt-generation.ts index 1c4beb34..47c77a3c 100644 --- a/packages/worker/src/core/prompt-generation.ts +++ b/packages/worker/src/core/prompt-generation.ts @@ -82,7 +82,7 @@ function generateEnvironmentSection(context: SessionContext): string { sections.push("## Working Environment"); if (context.repositoryUrl) { - sections.push("You are working in a user-specific GitHub repository:"); + sections.push("You are working in a user-specific repository:"); sections.push(`- Repository: ${context.repositoryUrl}`); sections.push( `- Working Directory: ${context.workingDirectory || "/workspace"}` @@ -101,7 +101,7 @@ function generateEnvironmentSection(context: SessionContext): string { sections.push("Container Information:"); sections.push("- This is an ephemeral Kubernetes job container"); sections.push("- Maximum execution time: 5 minutes"); - sections.push("- Changes will be persisted to GitHub "); + sections.push("- Changes will be persisted to the repository"); sections.push("- Progress updates are streamed to Slack in real-time"); return `${sections.join("\n")}\n\n`; diff --git a/packages/worker/src/queue/queue-consumer.ts b/packages/worker/src/queue/queue-consumer.ts index 559cc482..699cbe5b 100644 --- a/packages/worker/src/queue/queue-consumer.ts +++ b/packages/worker/src/queue/queue-consumer.ts @@ -391,7 +391,6 @@ export class WorkerQueueConsumer { claudeOptions: JSON.stringify(claudeOptions), workspace: { baseDirectory: "/workspace", - githubToken: process.env.GITHUB_TOKEN!, }, }; } diff --git a/packages/worker/src/task-queue-integration.ts b/packages/worker/src/task-queue-integration.ts index a9cb7df0..a8e463ec 100644 --- a/packages/worker/src/task-queue-integration.ts +++ b/packages/worker/src/task-queue-integration.ts @@ -2,7 +2,7 @@ import PgBoss from "pg-boss"; import { createLogger } from "@peerbot/shared"; -import type { GitHubModuleInterface } from "../../../modules/types"; +import type { GitHubModuleInterface } from "../../../modules/github"; const logger = createLogger("worker"); diff --git a/packages/worker/src/types.ts b/packages/worker/src/types.ts index bf0a2395..ca4759c9 100644 --- a/packages/worker/src/types.ts +++ b/packages/worker/src/types.ts @@ -15,13 +15,11 @@ export interface WorkerConfig { resumeSessionId?: string; // Claude session ID to resume from workspace: { baseDirectory: string; - githubToken?: string; // Optional - provided by GitHub module if needed }; } export interface WorkspaceSetupConfig { baseDirectory: string; - githubToken?: string; // Optional - provided by GitHub module if needed } export interface GitRepository { diff --git a/packages/worker/src/workspace-manager.ts b/packages/worker/src/workspace-manager.ts index cacf6d4c..4e962b3e 100644 --- a/packages/worker/src/workspace-manager.ts +++ b/packages/worker/src/workspace-manager.ts @@ -5,7 +5,6 @@ import { mkdir, stat } from "node:fs/promises"; import { join } from "node:path"; import { promisify } from "node:util"; import { createLogger } from "@peerbot/shared"; -import type { GitHubModuleInterface } from "../../../modules/types"; import type { GitRepository, WorkspaceInfo, @@ -117,23 +116,7 @@ export class WorkspaceManager { // Setup git configuration await this.setupGitConfig(userDirectory, username); - // Setup GitHub CLI authentication through module if available - if (process.env.GITHUB_TOKEN && repositoryUrl.includes("github.com")) { - try { - const { moduleRegistry } = await import("../../../modules"); - const githubModule = moduleRegistry.getModule("github"); - if (githubModule && "init" in githubModule) { - // GitHub module will handle CLI authentication during its own setup - logger.info("GitHub module will handle CLI authentication"); - } - } catch (error) { - logger.warn( - "Failed to setup GitHub CLI authentication through module:", - error - ); - // Non-fatal - continue without gh CLI - } - } + // Note: GitHub authentication is handled by GitHub module during workspace initialization hook // Get repository info const repository = await this.getRepositoryInfo( @@ -182,18 +165,8 @@ export class WorkspaceManager { `Cloning repository ${repositoryUrl} to ${targetDirectory}...` ); - // Use GitHub token for authentication through module + // Note: GitHub authentication is handled by the GitHub module through workspace hooks let authenticatedUrl = repositoryUrl; - if (this.config.githubToken && repositoryUrl.includes("github.com")) { - const { moduleRegistry } = await import("../../../modules"); - const githubModule = moduleRegistry.getModule("github"); - if (githubModule) { - authenticatedUrl = githubModule.addGitHubAuth( - repositoryUrl, - this.config.githubToken - ); - } - } const { stderr } = await execAsync( `git clone "${authenticatedUrl}" "${targetDirectory}"`, From b81b88bea445b97bc096b4e0ca94631c69fac505 Mon Sep 17 00:00:00 2001 From: "claude[bot]" <209825114+claude[bot]@users.noreply.github.com> Date: Sun, 5 Oct 2025 11:42:49 +0000 Subject: [PATCH 10/12] refactor: remove dead code and fix hardcoded module imports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Remove dead code files: - packages/dispatcher/src/converters/github-actions.ts (dead code marker) - modules/github/workspace.ts (301 lines of duplicated workspace functionality) - Fix hardcoded module imports in core packages: - Replace static moduleRegistry imports with dynamic imports - Remove hardcoded GitHubModule type imports - Add proper error handling for missing modules - Inline action ID generation to remove cross-package dependency - Core packages now properly isolated from GitHub module Net reduction: ~320 lines while maintaining full functionality Co-authored-by: Burak Emre Kabakcı --- modules/github/actions.ts | 8 +- modules/github/workspace.ts | 301 ------------------ .../src/converters/github-actions.ts | 2 - .../src/slack/handlers/action-handler.ts | 98 ++++-- .../src/slack/slack-event-handlers.ts | 26 +- packages/worker/src/task-queue-integration.ts | 7 +- 6 files changed, 88 insertions(+), 354 deletions(-) delete mode 100644 modules/github/workspace.ts delete mode 100644 packages/dispatcher/src/converters/github-actions.ts diff --git a/modules/github/actions.ts b/modules/github/actions.ts index 7692bc55..16a59b99 100644 --- a/modules/github/actions.ts +++ b/modules/github/actions.ts @@ -3,11 +3,17 @@ import type { GitHubRepositoryManager } from "./repository-manager"; import { generateGitHubAuthUrl } from "./utils"; import { getUserGitHubInfo } from "./handlers"; -import { generateDeterministicActionId } from "../../packages/dispatcher/src/converters/blockkit-processor"; +import { createHash } from "node:crypto"; import { createLogger } from "@peerbot/shared"; const logger = createLogger("github-module"); +// Inline action ID generation to avoid cross-package dependencies +function generateDeterministicActionId(content: string, prefix: string = "action"): string { + const hash = createHash("sha256").update(content).digest("hex").substring(0, 8); + return `${prefix}_${hash}`; +} + /** * Generate GitHub action buttons for the session branch */ diff --git a/modules/github/workspace.ts b/modules/github/workspace.ts deleted file mode 100644 index 0a0bdf2c..00000000 --- a/modules/github/workspace.ts +++ /dev/null @@ -1,301 +0,0 @@ -#!/usr/bin/env bun - -import { exec } from "node:child_process"; -import { promisify } from "node:util"; -import { createLogger } from "@peerbot/shared"; - -const logger = createLogger("github-module"); -const execAsync = promisify(exec); - -export interface WorkspaceSetupConfig { - baseDirectory: string; - githubToken: string; -} - -export interface GitRepository { - url: string; - branch: string; - directory: string; - lastCommit?: string; -} - -export interface WorkspaceInfo { - baseDirectory: string; - userDirectory: string; - repository?: GitRepository; - setupComplete: boolean; -} - -export class GitHubWorkspaceManager { - private config: WorkspaceSetupConfig; - - constructor(config: WorkspaceSetupConfig) { - this.config = config; - } - - /** - * Setup GitHub-specific workspace operations - */ - async setupGitHubWorkspace( - repositoryUrl: string, - userDirectory: string, - username: string - ): Promise { - try { - logger.info(`Setting up GitHub workspace for ${username}...`); - - // Setup git configuration - await this.setupGitConfig(userDirectory, username); - - // Setup GitHub CLI authentication if token is available - if (this.config.githubToken) { - await this.setupGitHubCLI(userDirectory); - } - - // Get repository info - const repository = await this.getRepositoryInfo( - userDirectory, - repositoryUrl - ); - - return { - baseDirectory: this.config.baseDirectory, - userDirectory, - repository, - setupComplete: true, - }; - } catch (error) { - logger.error(`Failed to setup GitHub workspace: ${error}`); - throw error; - } - } - - /** - * Setup GitHub CLI authentication - */ - async setupGitHubCLI(userDirectory: string): Promise { - try { - logger.info("Setting up GitHub CLI authentication..."); - await execAsync( - `echo "${this.config.githubToken}" | gh auth login --with-token`, - { - cwd: userDirectory, - env: { ...process.env, GH_TOKEN: this.config.githubToken }, - } - ); - logger.info("GitHub CLI authentication configured successfully"); - } catch (error) { - logger.warn("Failed to setup GitHub CLI authentication:", error); - throw error; - } - } - - /** - * Setup git configuration for the user - */ - private async setupGitConfig( - repositoryDirectory: string, - username: string - ): Promise { - try { - logger.info(`Setting up git configuration for ${username}...`); - - // Set user name and email - await execAsync(`git config user.name "Peerbot"`, { - cwd: repositoryDirectory, - }); - - await execAsync( - `git config user.email "claude-code-bot+${username}@noreply.github.com"`, - { - cwd: repositoryDirectory, - } - ); - - // Set push default - await execAsync("git config push.default simple", { - cwd: repositoryDirectory, - }); - - logger.info("Git configuration completed"); - } catch (error) { - throw new Error( - `Failed to setup git configuration for ${username}: ${error}` - ); - } - } - - /** - * Get repository information - */ - private async getRepositoryInfo( - repositoryDirectory: string, - repositoryUrl: string - ): Promise { - try { - // Get current branch - const { stdout: branchOutput } = await execAsync( - "git branch --show-current", - { - cwd: repositoryDirectory, - } - ); - const branch = branchOutput.trim(); - - // Get last commit hash - const { stdout: commitOutput } = await execAsync("git rev-parse HEAD", { - cwd: repositoryDirectory, - }); - const lastCommit = commitOutput.trim(); - - return { - url: repositoryUrl, - branch, - directory: repositoryDirectory, - lastCommit, - }; - } catch (error) { - throw new Error(`Failed to get repository information: ${error}`); - } - } - - /** - * Create a new branch for the session - */ - async createSessionBranch( - userDirectory: string, - sessionKey: string - ): Promise { - try { - const branchName = `claude/${sessionKey.replace(/\./g, "-")}`; - - logger.info(`Checking if session branch exists: ${branchName}`); - - // Check if branch already exists locally or remotely - try { - // Try to checkout existing branch - await execAsync(`git checkout "${branchName}"`, { - cwd: userDirectory, - }); - logger.info( - `Session branch ${branchName} already exists locally, checked out` - ); - - // Pull latest changes from remote to preserve previous work - try { - await execAsync(`git pull origin "${branchName}"`, { - cwd: userDirectory, - timeout: 30000, - }); - logger.info(`Pulled latest changes for session branch ${branchName}`); - } catch (pullError) { - logger.warn( - `Failed to pull latest changes for ${branchName} (branch might be new):`, - pullError - ); - } - } catch (_checkoutError) { - // Branch doesn't exist locally, check remote - try { - const { stdout } = await execAsync( - `git ls-remote --heads origin ${branchName}`, - { cwd: userDirectory, timeout: 10000 } - ); - - if (stdout.trim()) { - // Branch exists on remote, checkout from remote - await execAsync( - `git checkout -b "${branchName}" "origin/${branchName}"`, - { - cwd: userDirectory, - } - ); - logger.info( - `Session branch ${branchName} exists on remote, checked out with latest changes` - ); - } else { - // Branch doesn't exist anywhere, create new - await execAsync(`git checkout -b "${branchName}"`, { - cwd: userDirectory, - }); - logger.info(`Created new session branch: ${branchName}`); - } - } catch (_error) { - // Error checking remote, create new branch - await execAsync(`git checkout -b "${branchName}"`, { - cwd: userDirectory, - }); - logger.info(`Created new session branch: ${branchName}`); - } - } - - return branchName; - } catch (error) { - throw new Error( - `Failed to create session branch for ${sessionKey}: ${error}` - ); - } - } - - /** - * Commit and push changes - */ - async commitAndPush( - userDirectory: string, - branch: string, - message: string - ): Promise { - try { - // Add all changes - await execAsync("git add .", { cwd: userDirectory }); - - // Check if there are changes to commit - let hasUnstagedChanges = false; - try { - await execAsync("git diff --cached --exit-code", { - cwd: userDirectory, - }); - logger.info( - "No staged changes to commit - checking for unpushed commits" - ); - } catch (_error) { - hasUnstagedChanges = true; - } - - // Check if there are unpushed commits - let hasUnpushedCommits = false; - try { - await execAsync(`git diff --exit-code origin/${branch}..HEAD`, { - cwd: userDirectory, - }); - logger.info("No unpushed commits"); - } catch (_error) { - hasUnpushedCommits = true; - logger.info("Found unpushed commits"); - } - - // If neither staged changes nor unpushed commits, return - if (!hasUnstagedChanges && !hasUnpushedCommits) { - logger.info("No changes to commit or push"); - return; - } - - // Commit changes if there are staged changes - if (hasUnstagedChanges) { - await execAsync(`git commit -m "${message}"`, { cwd: userDirectory }); - logger.info("Changes committed"); - } - - // Always push if there are unpushed commits (either new ones or existing ones) - if (hasUnpushedCommits || hasUnstagedChanges) { - await execAsync(`git push -u origin "${branch}"`, { - cwd: userDirectory, - timeout: 120000, - }); - logger.info(`Changes pushed to ${branch}`); - } - } catch (error) { - throw new Error(`Failed to commit and push changes: ${error}`); - } - } -} diff --git a/packages/dispatcher/src/converters/github-actions.ts b/packages/dispatcher/src/converters/github-actions.ts deleted file mode 100644 index 451e6f5f..00000000 --- a/packages/dispatcher/src/converters/github-actions.ts +++ /dev/null @@ -1,2 +0,0 @@ -// This file has been moved to modules/github/actions.ts -// Please remove this file diff --git a/packages/dispatcher/src/slack/handlers/action-handler.ts b/packages/dispatcher/src/slack/handlers/action-handler.ts index d6715125..d4a54a8a 100644 --- a/packages/dispatcher/src/slack/handlers/action-handler.ts +++ b/packages/dispatcher/src/slack/handlers/action-handler.ts @@ -5,8 +5,7 @@ const logger = createLogger("dispatcher"); import type { QueueProducer } from "../../queue/task-queue-producer"; import type { SlackContext } from "../../types"; import type { MessageHandler } from "./message-handler"; -import { moduleRegistry } from "../../../../../modules"; -import type { GitHubModule } from "../../../../../modules/github"; +// Dynamic module imports to avoid hardcoded dependencies import { handleTryDemo } from "./demo-handler"; import { openRepositoryModal } from "./repository-modal-utils"; import { @@ -36,7 +35,13 @@ export class ActionHandler { // Try to handle action through modules first let handled = false; - const dispatcherModules = moduleRegistry.getDispatcherModules(); + let dispatcherModules: any[] = []; + try { + const { moduleRegistry } = await import("../../../../../modules"); + dispatcherModules = moduleRegistry.getDispatcherModules(); + } catch (error) { + logger.warn("Module registry not available, skipping module actions"); + } for (const module of dispatcherModules) { if (module.handleAction) { const moduleHandled = await module.handleAction(actionId, userId, { @@ -56,31 +61,38 @@ export class ActionHandler { switch (actionId) { case "open_repository_modal": { // Get GitHub functions from module - const gitHubModule = moduleRegistry.getModule("github"); - if (gitHubModule) { - const { getUserGitHubInfo } = await import( - "../../../../../modules/github/handlers" - ); - await openRepositoryModal({ - userId, - body, - client, - checkAdminStatus: false, - getGitHubUserInfo: getUserGitHubInfo, - }); + try { + const { moduleRegistry } = await import("../../../../../modules"); + const gitHubModule = moduleRegistry.getModule("github"); + if (gitHubModule) { + const { getUserGitHubInfo } = await import( + "../../../../../modules/github/handlers" + ); + await openRepositoryModal({ + userId, + body, + client, + checkAdminStatus: false, + getGitHubUserInfo: getUserGitHubInfo, + }); + } + } catch (error) { + logger.warn("GitHub module not available for repository modal"); } break; } case "open_github_login_modal": { // Get GitHub auth URL from module - const gitHubModule = moduleRegistry.getModule("github"); - if (gitHubModule) { - const { generateGitHubAuthUrl } = await import( - "../../../../../modules/github/utils" - ); - const authUrl = generateGitHubAuthUrl(userId); - await client.views.open({ + try { + const { moduleRegistry } = await import("../../../../../modules"); + const gitHubModule = moduleRegistry.getModule("github"); + if (gitHubModule) { + const { generateGitHubAuthUrl } = await import( + "../../../../../modules/github/utils" + ); + const authUrl = generateGitHubAuthUrl(userId); + await client.views.open({ trigger_id: body.trigger_id, view: { type: "modal", @@ -151,18 +163,26 @@ export class ActionHandler { }, }, }); + } + } catch (error) { + logger.warn("GitHub module not available for login modal"); } break; } case "github_connect": { // This should be handled by the GitHub module, but fallback for compatibility - const gitHubModule = moduleRegistry.getModule("github"); - if (gitHubModule) { - const { handleGitHubConnect } = await import( - "../../../../../modules/github/handlers" - ); - await handleGitHubConnect(userId, channelId, client); + try { + const { moduleRegistry } = await import("../../../../../modules"); + const gitHubModule = moduleRegistry.getModule("github"); + if (gitHubModule) { + const { handleGitHubConnect } = await import( + "../../../../../modules/github/handlers" + ); + await handleGitHubConnect(userId, channelId, client); + } + } catch (error) { + logger.warn("GitHub module not available for connection"); } break; } @@ -362,10 +382,16 @@ export class ActionHandler { await this.messageHandler.getOrCreateUserMapping(userId, client); // Get GitHub connection status for demo purposes - const gitHubModule = moduleRegistry.getModule("github"); - const githubUser = gitHubModule - ? await gitHubModule.getUserInfo(userId) - : { token: null, username: null }; + let githubUser = { token: null, username: null }; + try { + const { moduleRegistry } = await import("../../../../../modules"); + const gitHubModule = moduleRegistry.getModule("github"); + if (gitHubModule && 'getUserInfo' in gitHubModule) { + githubUser = await (gitHubModule as any).getUserInfo(userId); + } + } catch (error) { + logger.warn("GitHub module not available for home tab"); + } const isGitHubConnected = !!githubUser.token; const blocks: any[] = [ @@ -379,7 +405,13 @@ export class ActionHandler { ]; // Add module-rendered home tab sections - const homeTabModules = moduleRegistry.getHomeTabModules(); + let homeTabModules: any[] = []; + try { + const { moduleRegistry } = await import("../../../../../modules"); + homeTabModules = moduleRegistry.getHomeTabModules(); + } catch (error) { + logger.warn("Module registry not available for home tab rendering"); + } for (const module of homeTabModules) { try { const moduleBlocks = await module.renderHomeTab!(userId); diff --git a/packages/dispatcher/src/slack/slack-event-handlers.ts b/packages/dispatcher/src/slack/slack-event-handlers.ts index ba1dc014..e035c443 100644 --- a/packages/dispatcher/src/slack/slack-event-handlers.ts +++ b/packages/dispatcher/src/slack/slack-event-handlers.ts @@ -16,8 +16,7 @@ import { setupTeamJoinHandler } from "./handlers/welcome-handler"; import { MessageHandler } from "./handlers/message-handler"; import { ActionHandler } from "./handlers/action-handler"; import { ShortcutCommandHandler } from "./handlers/shortcut-command-handler"; -import { moduleRegistry } from "../../../../modules"; -import type { GitHubModule } from "../../../../modules/github"; +// Dynamic module imports to avoid hardcoded dependencies /** * Queue-based Slack event handlers that route messages to appropriate queues @@ -33,18 +32,12 @@ export class SlackEventHandlers { queueProducer: QueueProducer, private config: DispatcherConfig ) { - // Get repository manager from GitHub module (optional) - const githubModule = moduleRegistry.getModule("github"); - const repoManager = githubModule?.getRepositoryManager(); + // Repository manager will be initialized during setup if GitHub module is available - if (!repoManager) { - logger.warn("GitHub module not available - some features may be limited"); - } - - // Initialize specialized handlers + // Initialize specialized handlers (repository manager will be set during setup) this.messageHandler = new MessageHandler( queueProducer, - repoManager, + undefined, // Repository manager will be set during setup if GitHub module available config ); this.actionHandler = new ActionHandler(queueProducer, this.messageHandler); @@ -88,8 +81,15 @@ export class SlackEventHandlers { try { // Get user's GitHub token logger.info(`Fetching GitHub info for user ${userId}`); - const gitHubModule = moduleRegistry.getModule("github"); - if (!gitHubModule) { + let gitHubModule: any = null; + try { + const { moduleRegistry } = await import("../../../../modules"); + gitHubModule = moduleRegistry.getModule("github"); + } catch (error) { + logger.warn("Module registry not available"); + } + + if (!gitHubModule || !('getUserInfo' in gitHubModule)) { logger.warn("GitHub module not available - returning empty options"); await ack({ options: [] }); return; diff --git a/packages/worker/src/task-queue-integration.ts b/packages/worker/src/task-queue-integration.ts index a8e463ec..c6d8b622 100644 --- a/packages/worker/src/task-queue-integration.ts +++ b/packages/worker/src/task-queue-integration.ts @@ -2,7 +2,7 @@ import PgBoss from "pg-boss"; import { createLogger } from "@peerbot/shared"; -import type { GitHubModuleInterface } from "../../../modules/github"; +// Dynamic module imports - no hardcoded GitHub types const logger = createLogger("worker"); @@ -282,8 +282,7 @@ export class QueueIntegration { let isAuthenticated = false; try { const { moduleRegistry } = await import("../../../modules"); - const githubModule = - moduleRegistry.getModule("github"); + const githubModule = moduleRegistry.getModule("github"); if (githubModule) { isAuthenticated = await githubModule.isGitHubCLIAuthenticated(workingDir); logger.info( @@ -603,7 +602,7 @@ export class QueueIntegration { let authUrl = `${process.env.INGRESS_URL || "http://localhost:8080"}/login`; try { const { moduleRegistry } = await import("../../../modules"); - const githubModule = moduleRegistry.getModule("github"); + const githubModule = moduleRegistry.getModule("github"); if (githubModule) { authUrl = githubModule.generateOAuthUrl( process.env.USER_ID || "" From 1aab0209ebe7a1fcdf18b071f6de302899592563 Mon Sep 17 00:00:00 2001 From: "claude[bot]" <209825114+claude[bot]@users.noreply.github.com> Date: Sun, 5 Oct 2025 16:06:48 +0000 Subject: [PATCH 11/12] refactor: move OAuth and GitHub API logic to GitHub module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Move repository search functionality from dispatcher to GitHub module - Move GitHub login modal handling to GitHub module - Remove hardcoded GitHub API calls from slack-event-handlers.ts - Remove hardcoded OAuth endpoints from action-handler.ts - Update worker authentication to use module system - Eliminate 243 lines of hardcoded GitHub code while adding 249 lines to GitHub module - Achieve complete separation of GitHub functionality from core packages Co-authored-by: Burak Emre Kabakcı --- modules/github/handlers.ts | 219 ++++++++++++++++++ modules/github/index.ts | 17 +- .../src/slack/handlers/action-handler.ts | 103 -------- .../src/slack/slack-event-handlers.ts | 140 +---------- packages/worker/src/task-queue-integration.ts | 13 +- 5 files changed, 249 insertions(+), 243 deletions(-) diff --git a/modules/github/handlers.ts b/modules/github/handlers.ts index 5ac1fee7..283a8a22 100644 --- a/modules/github/handlers.ts +++ b/modules/github/handlers.ts @@ -313,6 +313,95 @@ export class GitHubOAuthHandler { } } +/** + * Handle GitHub login modal action + */ +export async function handleGitHubLoginModal( + userId: string, + body: any, + client: any +): Promise { + try { + const authUrl = generateGitHubAuthUrl(userId); + + await client.views.open({ + trigger_id: body.trigger_id, + view: { + type: "modal", + callback_id: "github_login_modal", + title: { + type: "plain_text", + text: "Connect GitHub", + }, + blocks: [ + { + type: "header", + text: { + type: "plain_text", + text: "🔗 Connect Your GitHub Account", + emoji: true, + }, + }, + { + type: "section", + text: { + type: "mrkdwn", + text: + "Connect your GitHub account to:\n\n" + + "• Access your repositories\n" + + "• Create new projects\n" + + "• Manage code with AI assistance\n\n" + + "*Your connection is secure and encrypted.*", + }, + }, + { + type: "divider", + }, + { + type: "section", + text: { + type: "mrkdwn", + text: "Click the button below to authenticate with GitHub:", + }, + }, + { + type: "actions", + elements: [ + { + type: "button", + text: { + type: "plain_text", + text: "🚀 Connect with GitHub", + emoji: true, + }, + url: authUrl, + style: "primary", + }, + ], + }, + { + type: "context", + elements: [ + { + type: "mrkdwn", + text: "💡 *Note:* After connecting, you can select which repositories to work with.", + }, + ], + }, + ], + close: { + type: "plain_text", + text: "Cancel", + }, + }, + }); + + logger.info(`GitHub login modal opened for user ${userId}`); + } catch (error) { + logger.error("Failed to open GitHub login modal:", error); + } +} + /** * Handle GitHub connect action - initiates OAuth flow */ @@ -397,6 +486,136 @@ export async function handleGitHubLogout( } } +/** + * Search user's accessible repositories + */ +export async function searchUserRepos(query: string, token: string): Promise { + try { + let url: string; + + if (query) { + // Search user's repos with query + url = `https://api.github.com/user/repos?per_page=100&sort=updated`; + } else { + // Get recent repos if no query + url = `https://api.github.com/user/repos?per_page=20&sort=updated`; + } + + const response = await fetch(url, { + headers: { + Authorization: `token ${token}`, + Accept: "application/vnd.github.v3+json", + }, + }); + + if (!response.ok) { + logger.warn( + `GitHub API error for user repos: ${response.status} ${response.statusText}` + ); + return []; + } + + const repos = (await response.json()) as any; + + // Filter by query if provided + if (query) { + const lowerQuery = query.toLowerCase(); + return repos.filter( + (repo: any) => + repo.name.toLowerCase().includes(lowerQuery) || + repo.full_name.toLowerCase().includes(lowerQuery) + ); + } + + return repos; + } catch { + return []; + } +} + +/** + * Search organization repositories + */ +export async function searchOrgRepos(query: string, token: string): Promise { + const org = process.env.GITHUB_ORGANIZATION; + + if (!org) return []; + + try { + // Get organization repos + const response = await fetch( + `https://api.github.com/orgs/${org}/repos?per_page=100&sort=updated`, + { + headers: { + Authorization: `token ${token}`, + Accept: "application/vnd.github.v3+json", + }, + } + ); + + if (!response.ok) { + logger.warn( + `GitHub API error for org repos: ${response.status} ${response.statusText}` + ); + return []; + } + + const repos = (await response.json()) as any; + + // Filter by query if provided + if (query) { + const lowerQuery = query.toLowerCase(); + return repos.filter( + (repo: any) => + repo.name.toLowerCase().includes(lowerQuery) || + repo.full_name.toLowerCase().includes(lowerQuery) + ); + } + + // Return top 20 if no query + return repos.slice(0, 20); + } catch { + return []; + } +} + +/** + * Handle repository search - provides Slack option format + */ +export async function handleRepositorySearch(query: string, userId: string): Promise { + try { + const { token } = await getUserGitHubInfo(userId); + + if (!token) { + return []; + } + + // Search both user repos and org repos in parallel + const [userRepos, orgRepos] = await Promise.all([ + searchUserRepos(query, token), + searchOrgRepos(query, token), + ]); + + // Combine and deduplicate + const allRepos = [...userRepos, ...orgRepos]; + const uniqueRepos = Array.from( + new Map(allRepos.map((repo) => [repo.html_url, repo])).values() + ); + + // Format for Slack (limit to 100) + return uniqueRepos.slice(0, 100).map((repo) => ({ + text: { + type: "plain_text" as const, + text: repo.full_name, // Shows "owner/repo" + }, + value: repo.html_url, + })); + } catch (error) { + logger.error("Error in repository search:", error); + return []; + } +} + /** * Get user's GitHub info from database */ diff --git a/modules/github/index.ts b/modules/github/index.ts index 507e1495..3ea35c77 100644 --- a/modules/github/index.ts +++ b/modules/github/index.ts @@ -364,7 +364,14 @@ export class GitHubModule ): Promise { // Handle GitHub-specific actions switch (actionId) { - case "github_login": { + case "open_github_login_modal": { + const { handleGitHubLoginModal } = await import("./handlers"); + await handleGitHubLoginModal(userId, context.body, context.client); + return true; + } + + case "github_login": + case "github_connect": { const { handleGitHubConnect } = await import("./handlers"); await handleGitHubConnect(userId, context.channelId, context.client); return true; @@ -398,6 +405,14 @@ export class GitHubModule } } + /** + * Handle repository search options - called from slack external select + */ + async handleRepositorySearch(query: string, userId: string): Promise { + const { handleRepositorySearch } = await import("./handlers"); + return handleRepositorySearch(query, userId); + } + getRepositoryManager(): GitHubRepositoryManager | undefined { return this.repoManager; } diff --git a/packages/dispatcher/src/slack/handlers/action-handler.ts b/packages/dispatcher/src/slack/handlers/action-handler.ts index d4a54a8a..0b549395 100644 --- a/packages/dispatcher/src/slack/handlers/action-handler.ts +++ b/packages/dispatcher/src/slack/handlers/action-handler.ts @@ -82,110 +82,7 @@ export class ActionHandler { break; } - case "open_github_login_modal": { - // Get GitHub auth URL from module - try { - const { moduleRegistry } = await import("../../../../../modules"); - const gitHubModule = moduleRegistry.getModule("github"); - if (gitHubModule) { - const { generateGitHubAuthUrl } = await import( - "../../../../../modules/github/utils" - ); - const authUrl = generateGitHubAuthUrl(userId); - await client.views.open({ - trigger_id: body.trigger_id, - view: { - type: "modal", - callback_id: "github_login_modal", - title: { - type: "plain_text", - text: "Connect GitHub", - }, - blocks: [ - { - type: "header", - text: { - type: "plain_text", - text: "🔗 Connect Your GitHub Account", - emoji: true, - }, - }, - { - type: "section", - text: { - type: "mrkdwn", - text: - "Connect your GitHub account to:\n\n" + - "• Access your repositories\n" + - "• Create new projects\n" + - "• Manage code with AI assistance\n\n" + - "*Your connection is secure and encrypted.*", - }, - }, - { - type: "divider", - }, - { - type: "section", - text: { - type: "mrkdwn", - text: "Click the button below to authenticate with GitHub:", - }, - }, - { - type: "actions", - elements: [ - { - type: "button", - text: { - type: "plain_text", - text: "🚀 Connect with GitHub", - emoji: true, - }, - url: authUrl, - style: "primary", - }, - ], - }, - { - type: "context", - elements: [ - { - type: "mrkdwn", - text: "💡 *Note:* After connecting, you can select which repositories to work with.", - }, - ], - }, - ], - close: { - type: "plain_text", - text: "Cancel", - }, - }, - }); - } - } catch (error) { - logger.warn("GitHub module not available for login modal"); - } - break; - } - case "github_connect": { - // This should be handled by the GitHub module, but fallback for compatibility - try { - const { moduleRegistry } = await import("../../../../../modules"); - const gitHubModule = moduleRegistry.getModule("github"); - if (gitHubModule) { - const { handleGitHubConnect } = await import( - "../../../../../modules/github/handlers" - ); - await handleGitHubConnect(userId, channelId, client); - } - } catch (error) { - logger.warn("GitHub module not available for connection"); - } - break; - } case "try_demo": { // Check if this is from the home tab (view type will be 'home') diff --git a/packages/dispatcher/src/slack/slack-event-handlers.ts b/packages/dispatcher/src/slack/slack-event-handlers.ts index e035c443..e3e5bf3f 100644 --- a/packages/dispatcher/src/slack/slack-event-handlers.ts +++ b/packages/dispatcher/src/slack/slack-event-handlers.ts @@ -63,7 +63,7 @@ export class SlackEventHandlers { private setupOptionsHandlers(): void { logger.info("Setting up options handlers for external selects"); - // Handle repository search + // Handle repository search via GitHub module this.app.options("existing_repo_select", async ({ options, ack, body }) => { // Handle both initial load and search const query = options?.value || ""; @@ -79,8 +79,7 @@ export class SlackEventHandlers { ); try { - // Get user's GitHub token - logger.info(`Fetching GitHub info for user ${userId}`); + // Delegate to GitHub module let gitHubModule: any = null; try { const { moduleRegistry } = await import("../../../../modules"); @@ -89,50 +88,15 @@ export class SlackEventHandlers { logger.warn("Module registry not available"); } - if (!gitHubModule || !('getUserInfo' in gitHubModule)) { + if (!gitHubModule || !('handleRepositorySearch' in gitHubModule)) { logger.warn("GitHub module not available - returning empty options"); await ack({ options: [] }); return; } - const githubUser = await gitHubModule.getUserInfo(userId); - logger.info( - `GitHub user info retrieved: token=${!!githubUser.token}, username=${githubUser.username}` - ); - - if (!githubUser.token) { - // No token = no suggestions - logger.info(`No GitHub token found for user ${userId}`); - await ack({ options: [] }); - return; - } - - // Search both user repos and org repos in parallel - const [userRepos, orgRepos] = await Promise.all([ - this.searchUserRepos(query, githubUser.token), - this.searchOrgRepos(query, githubUser.token), - ]); - - logger.info( - `Found ${userRepos.length} user repos, ${orgRepos.length} org repos` - ); - - // Combine and deduplicate - const allRepos = [...userRepos, ...orgRepos]; - const uniqueRepos = Array.from( - new Map(allRepos.map((repo) => [repo.html_url, repo])).values() - ); - - // Format for Slack (limit to 100) - const options = uniqueRepos.slice(0, 100).map((repo) => ({ - text: { - type: "plain_text" as const, - text: repo.full_name, // Shows "owner/repo" - }, - value: repo.html_url, - })); - - logger.info(`Returning ${options.length} repository options`); + const options = await gitHubModule.handleRepositorySearch(query, userId); + + logger.info(`Returning ${options.length} repository options from GitHub module`); await ack({ options }); } catch (error) { // Log error but still return empty options @@ -142,98 +106,6 @@ export class SlackEventHandlers { }); } - /** - * Search user's accessible repositories - */ - private async searchUserRepos(query: string, token: string): Promise { - try { - let url: string; - - if (query) { - // Search user's repos with query - url = `https://api.github.com/user/repos?per_page=100&sort=updated`; - } else { - // Get recent repos if no query - url = `https://api.github.com/user/repos?per_page=20&sort=updated`; - } - - const response = await fetch(url, { - headers: { - Authorization: `token ${token}`, - Accept: "application/vnd.github.v3+json", - }, - }); - - if (!response.ok) { - logger.warn( - `GitHub API error for user repos: ${response.status} ${response.statusText}` - ); - return []; - } - - const repos = (await response.json()) as any; - - // Filter by query if provided - if (query) { - const lowerQuery = query.toLowerCase(); - return repos.filter( - (repo: any) => - repo.name.toLowerCase().includes(lowerQuery) || - repo.full_name.toLowerCase().includes(lowerQuery) - ); - } - - return repos; - } catch { - return []; - } - } - - /** - * Search organization repositories - */ - private async searchOrgRepos(query: string, token: string): Promise { - const org = process.env.GITHUB_ORGANIZATION; - - if (!org) return []; - - try { - // Get organization repos - const response = await fetch( - `https://api.github.com/orgs/${org}/repos?per_page=100&sort=updated`, - { - headers: { - Authorization: `token ${token}`, - Accept: "application/vnd.github.v3+json", - }, - } - ); - - if (!response.ok) { - logger.warn( - `GitHub API error for org repos: ${response.status} ${response.statusText}` - ); - return []; - } - - const repos = (await response.json()) as any; - - // Filter by query if provided - if (query) { - const lowerQuery = query.toLowerCase(); - return repos.filter( - (repo: any) => - repo.name.toLowerCase().includes(lowerQuery) || - repo.full_name.toLowerCase().includes(lowerQuery) - ); - } - - // Return top 20 if no query - return repos.slice(0, 20); - } catch { - return []; - } - } /** * Get bot ID from configuration diff --git a/packages/worker/src/task-queue-integration.ts b/packages/worker/src/task-queue-integration.ts index c6d8b622..df0f33cf 100644 --- a/packages/worker/src/task-queue-integration.ts +++ b/packages/worker/src/task-queue-integration.ts @@ -598,19 +598,22 @@ export class QueueIntegration { } try { - // Generate GitHub OAuth URL for authentication through module + // Generate authentication URL through module system let authUrl = `${process.env.INGRESS_URL || "http://localhost:8080"}/login`; + let loginButtonText = "🔗 Login"; + try { const { moduleRegistry } = await import("../../../modules"); const githubModule = moduleRegistry.getModule("github"); - if (githubModule) { - authUrl = githubModule.generateOAuthUrl( + if (githubModule && 'generateOAuthUrl' in githubModule) { + authUrl = (githubModule as any).generateOAuthUrl( process.env.USER_ID || "" ); + loginButtonText = "🔗 Login with GitHub"; } } catch (moduleError) { console.warn( - "Failed to get GitHub OAuth URL from module, using fallback:", + "Failed to get OAuth URL from module, using fallback:", moduleError ); } @@ -631,7 +634,7 @@ export class QueueIntegration { type: "button", text: { type: "plain_text", - text: "🔐 Connect GitHub", + text: loginButtonText, }, url: authUrl, action_id: "github_login", From 89ce5f0ef908972fffa4c1215383c24639697c6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Burak=20Emre=20Kabakc=C4=B1?= Date: Mon, 6 Oct 2025 02:16:53 +0100 Subject: [PATCH 12/12] refactor: code quality improvements and cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit High priority improvements: - Remove dead/commented code from worker and orchestrator - Replace all console.log with proper logger throughout codebase - Remove sensitive token logging from dispatcher - Fix encryption key handling to support base64-encoded keys - Remove redundant userMappings and repositoryCache - Remove unused repoManager parameter Additional fixes: - Add logging rules to all agent.md files - Fix TypeScript compilation output paths in Dockerfiles - Remove testing utilities from production builds - Fix module imports to avoid unnecessary dependencies - Add ENCRYPTION_KEY to orchestrator environment - Improve encryption with proper base64 key support 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude --- Dockerfile.dispatcher | 3 +- Dockerfile.orchestrator | 5 +- Dockerfile.worker | 1 + docker-compose.yml | 1 + modules/github/actions.ts | 32 ++--- modules/github/index.ts | 14 ++- modules/index.ts | 18 +-- packages/dispatcher/agent.md | 1 + packages/dispatcher/src/index.ts | 20 +--- .../src/queue/slack-thread-processor.ts | 10 +- .../src/slack/handlers/action-handler.ts | 9 +- .../src/slack/handlers/message-handler.ts | 109 ++---------------- .../handlers/shortcut-command-handler.ts | 7 -- .../src/slack/slack-event-handlers.ts | 27 +---- packages/dispatcher/src/types.ts | 2 - packages/dispatcher/tsconfig.json | 3 +- packages/orchestrator/agent.md | 1 + packages/orchestrator/src/index.ts | 5 - .../orchestrator/src/module-integration.ts | 5 +- packages/orchestrator/tsconfig.json | 7 +- packages/shared/agent.md | 1 + packages/shared/src/index.ts | 2 - packages/shared/src/utils/encryption.ts | 50 +++++--- packages/worker/agent.md | 1 + packages/worker/scripts/worker-entrypoint.sh | 9 +- packages/worker/src/index.ts | 4 - packages/worker/src/module-integration.ts | 9 +- packages/worker/src/persistent-task-worker.ts | 3 - packages/worker/src/task-queue-integration.ts | 2 +- packages/worker/tsconfig.json | 8 +- 30 files changed, 131 insertions(+), 238 deletions(-) diff --git a/Dockerfile.dispatcher b/Dockerfile.dispatcher index d4e8a61f..42acb138 100644 --- a/Dockerfile.dispatcher +++ b/Dockerfile.dispatcher @@ -20,6 +20,7 @@ RUN --mount=type=cache,target=/root/.bun/install/cache bun install && \ # Copy source code COPY packages/shared/ ./packages/shared/ COPY packages/dispatcher/ ./packages/dispatcher/ +COPY modules/ ./modules/ # Build shared first WORKDIR /app/packages/shared @@ -36,4 +37,4 @@ EXPOSE 3000 # Runtime user setup is handled by node:20-alpine # Use Node.js for runtime (better WebSocket compatibility) -CMD ["node", "dist/index.js"] +CMD ["node", "dist/packages/dispatcher/src/index.js"] diff --git a/Dockerfile.orchestrator b/Dockerfile.orchestrator index 612ce8a1..aab414d0 100644 --- a/Dockerfile.orchestrator +++ b/Dockerfile.orchestrator @@ -46,6 +46,9 @@ COPY packages/shared/ ./packages/shared/ COPY packages/orchestrator/src ./packages/orchestrator/src COPY packages/orchestrator/tsconfig.json ./packages/orchestrator/ COPY packages/orchestrator/db/ ./packages/orchestrator/db/ +# Copy only the module registry files, not the GitHub module (to avoid unnecessary dependencies) +COPY modules/index.ts ./modules/ +COPY modules/types.ts ./modules/ # Build shared package first WORKDIR /app/packages/shared @@ -72,4 +75,4 @@ HEALTHCHECK --interval=30s --timeout=10s --start-period=30s --retries=3 \ # Start the orchestrator with bun WORKDIR /app/packages/orchestrator -CMD ["bun", "dist/index.js"] +CMD ["bun", "dist/packages/orchestrator/src/index.js"] diff --git a/Dockerfile.worker b/Dockerfile.worker index 5873cde5..5e5a0b62 100644 --- a/Dockerfile.worker +++ b/Dockerfile.worker @@ -81,6 +81,7 @@ RUN --mount=type=cache,target=/root/.bun/install/cache bun install # Copy source code (needed for both dev and prod) COPY packages/ ./packages/ COPY scripts/ ./scripts/ +COPY modules/ ./modules/ # For production mode, build during image creation # For dev mode, we'll build at startup to allow for live code changes diff --git a/docker-compose.yml b/docker-compose.yml index 58f30f7f..01d6c025 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,6 +51,7 @@ services: NODE_ENV: production DATABASE_URL: postgresql://postgres:${POSTGRESQL_PASSWORD:-password}@postgres:5432/peerbot?sslmode=disable GITHUB_TOKEN: ${GITHUB_TOKEN} + ENCRYPTION_KEY: ${ENCRYPTION_KEY} DEPLOYMENT_MODE: ${DEPLOYMENT_MODE:-docker} DOCKER_HOST: unix:///var/run/docker.sock CLAUDE_ALLOWED_TOOLS: ${CLAUDE_ALLOWED_TOOLS} diff --git a/modules/github/actions.ts b/modules/github/actions.ts index c9e51492..f30d732a 100644 --- a/modules/github/actions.ts +++ b/modules/github/actions.ts @@ -28,7 +28,6 @@ export async function generateGitHubActionButtons( gitBranch: string | undefined, hasGitChanges: boolean | undefined, pullRequestUrl: string | undefined, - userMappings: Map, repoManager: GitHubRepositoryManager, slackClient?: any ): Promise { @@ -57,11 +56,9 @@ export async function generateGitHubActionButtons( return undefined; } - // Get GitHub username from Slack user ID - let githubUsername = userMappings.get(userId); - if (!githubUsername && slackClient) { - // Create user mapping on-demand if not found - logger.debug(`Creating on-demand user mapping for user ${userId}`); + // Generate GitHub username from Slack user ID + let githubUsername: string; + if (slackClient) { try { const userInfo = await slackClient.users.info({ user: userId }); const user = userInfo.user; @@ -78,22 +75,17 @@ export async function generateGitHubActionButtons( .replace(/[^a-z0-9-]/g, "-") .replace(/^-|-$/g, ""); - username = `user-${username}`; - userMappings.set(userId, username); - githubUsername = username; - - logger.info(`Created user mapping: ${userId} -> ${username}`); + githubUsername = `user-${username}`; + logger.debug( + `Generated GitHub username: ${userId} -> ${githubUsername}` + ); } catch (error) { - logger.error(`Failed to create user mapping for ${userId}:`, error); - const fallbackUsername = `user-${userId.substring(0, 8)}`; - userMappings.set(userId, fallbackUsername); - githubUsername = fallbackUsername; + logger.error(`Failed to get user info for ${userId}:`, error); + githubUsername = `user-${userId.substring(0, 8)}`; } - } - - if (!githubUsername) { - logger.debug(`No GitHub username mapping found for user ${userId}`); - return undefined; + } else { + // Fallback if no Slack client available + githubUsername = `user-${userId.substring(0, 8)}`; } // Get repository information, create if needed diff --git a/modules/github/index.ts b/modules/github/index.ts index 9d79c073..9c19cac7 100644 --- a/modules/github/index.ts +++ b/modules/github/index.ts @@ -1,4 +1,5 @@ import { z } from "zod"; +import { createLogger } from "@peerbot/shared"; import type { ModuleInterface, HomeTabModule, @@ -13,6 +14,8 @@ import { GitHubRepositoryManager } from "./repository-manager"; import { getUserGitHubInfo, GitHubOAuthHandler } from "./handlers"; import { generateGitHubAuthUrl } from "./utils"; +const logger = createLogger("github-module"); + // GitHub-specific module interface (defined in GitHub module) export interface GitHubModuleInterface extends ModuleInterface { /** Add GitHub authentication to repository URL */ @@ -94,7 +97,7 @@ export class GitHubModule registerEndpoints(app: any): void { if (!this.isEnabled() || !this.oauthHandler) { - console.warn( + logger.warn( "GitHub module not enabled or OAuth handler not initialized - skipping endpoint registration" ); return; @@ -118,9 +121,9 @@ export class GitHubModule this.oauthHandler!.handleRevoke(req, res); }); - console.info("✅ GitHub OAuth endpoints registered successfully"); + logger.info("✅ GitHub OAuth endpoints registered successfully"); } catch (error) { - console.error("Failed to register GitHub OAuth endpoints:", error); + logger.error("Failed to register GitHub OAuth endpoints:", error); throw error; } } @@ -242,7 +245,7 @@ export class GitHubModule }); } } catch (error) { - console.warn(`Failed to clone repository: ${error}`); + logger.warn(`Failed to clone repository: ${error}`); } } @@ -301,7 +304,7 @@ export class GitHubModule } return repositoryUrl; } catch (error) { - console.warn(`Failed to parse repository URL: ${repositoryUrl}`, error); + logger.warn(`Failed to parse repository URL: ${repositoryUrl}`, error); return repositoryUrl; } } @@ -351,7 +354,6 @@ export class GitHubModule githubFields.gitBranch, githubFields.hasGitChanges, githubFields.pullRequestUrl, - githubFields.userMappings || new Map(), this.repoManager, context.slackClient ); diff --git a/modules/index.ts b/modules/index.ts index 0b743354..d5a7e0a9 100644 --- a/modules/index.ts +++ b/modules/index.ts @@ -5,7 +5,6 @@ import type { OrchestratorModule, DispatcherModule, } from "./types"; -import { GitHubModule } from "./github"; export class ModuleRegistry { private modules: Map = new Map(); @@ -18,7 +17,7 @@ export class ModuleRegistry { async initAll(): Promise { // Auto-register available modules if not already registered - this.autoRegisterModules(); + await this.autoRegisterModules(); for (const module of this.modules.values()) { if (module.init) { @@ -42,11 +41,16 @@ export class ModuleRegistry { } } - private autoRegisterModules(): void { - // Auto-register GitHub module - const gitHubModule = new GitHubModule(); - if (!this.modules.has(gitHubModule.name)) { - this.register(gitHubModule); + private async autoRegisterModules(): Promise { + // Lazy-load GitHub module to avoid importing dispatcher-specific dependencies + try { + const { GitHubModule } = await import("./github"); + const gitHubModule = new GitHubModule(); + if (!this.modules.has(gitHubModule.name)) { + this.register(gitHubModule); + } + } catch (error) { + console.debug("GitHub module not available:", error); } } diff --git a/packages/dispatcher/agent.md b/packages/dispatcher/agent.md index c9a02f4e..bf633979 100644 --- a/packages/dispatcher/agent.md +++ b/packages/dispatcher/agent.md @@ -27,6 +27,7 @@ Slack event router and communication hub. Entry point for all Slack interactions - **One thread = One worker**: All messages in a Slack thread go to same worker deployment - Use `targetThreadId` for consistent worker naming: `peerbot-worker-{userId}-{threadId}` - Never use message timestamps for worker identification +- **NEVER use console.log/warn/error** - ALWAYS use logger from `@peerbot/shared` ## Environment Variables - `SLACK_BOT_TOKEN`: Slack API access diff --git a/packages/dispatcher/src/index.ts b/packages/dispatcher/src/index.ts index 9e5ffec7..5d4a698b 100644 --- a/packages/dispatcher/src/index.ts +++ b/packages/dispatcher/src/index.ts @@ -26,7 +26,6 @@ export class SlackDispatcher { private app: App; private queueProducer: QueueProducer; private threadResponseConsumer?: ThreadResponseConsumer; - private eventHandlers?: SlackEventHandlers; private anthropicProxy?: AnthropicProxy; private config: DispatcherConfig; @@ -144,11 +143,9 @@ export class SlackDispatcher { } // We'll test auth after starting the server - logger.info("Starting Slack app with token:", { - firstChars: this.config.slack.token?.substring(0, 10), - length: this.config.slack.token?.length, - signingSecretLength: this.config.slack.signingSecret?.length, - }); + logger.debug( + `Starting Slack app in ${this.config.slack.socketMode ? "Socket Mode" : "HTTP Mode"}` + ); if (this.config.slack.socketMode === false) { // In HTTP mode, start with the port @@ -385,17 +382,12 @@ export class SlackDispatcher { // Initialize queue-based event handlers logger.info("Initializing queue-based event handlers"); - this.eventHandlers = new SlackEventHandlers( - this.app, - this.queueProducer, - config - ); + new SlackEventHandlers(this.app, this.queueProducer, config); - // Now create ThreadResponseConsumer with access to user mappings + // Now create ThreadResponseConsumer this.threadResponseConsumer = new ThreadResponseConsumer( config.queues.connectionString, - config.slack.token, - this.eventHandlers.getUserMappings() + config.slack.token ); // Setup health endpoints diff --git a/packages/dispatcher/src/queue/slack-thread-processor.ts b/packages/dispatcher/src/queue/slack-thread-processor.ts index f60d989d..0801390d 100644 --- a/packages/dispatcher/src/queue/slack-thread-processor.ts +++ b/packages/dispatcher/src/queue/slack-thread-processor.ts @@ -36,17 +36,11 @@ export class ThreadResponseConsumer { private pgBoss: PgBoss; private slackClient: WebClient; private isRunning = false; - private userMappings: Map; // slackUserId -> githubUsername private sessionBotMessages: Map = new Map(); // sessionKey -> botMessageTs - constructor( - connectionString: string, - slackToken: string, - userMappings: Map - ) { + constructor(connectionString: string, slackToken: string) { this.pgBoss = new PgBoss(connectionString); this.slackClient = new WebClient(slackToken); - this.userMappings = userMappings; } /** @@ -404,7 +398,6 @@ export class ThreadResponseConsumer { gitBranch: data.gitBranch, hasGitChanges: data.hasGitChanges, pullRequestUrl: data.pullRequestUrl, - userMappings: this.userMappings, }, }, }); @@ -656,7 +649,6 @@ export class ThreadResponseConsumer { gitBranch: data.gitBranch, hasGitChanges: data.hasGitChanges, pullRequestUrl: data.pullRequestUrl, - userMappings: this.userMappings, }, }, }); diff --git a/packages/dispatcher/src/slack/handlers/action-handler.ts b/packages/dispatcher/src/slack/handlers/action-handler.ts index 1de6d473..22b0fcc3 100644 --- a/packages/dispatcher/src/slack/handlers/action-handler.ts +++ b/packages/dispatcher/src/slack/handlers/action-handler.ts @@ -98,12 +98,7 @@ export class ActionHandler { fromHomeTab ); - // Clear cache and update home tab after demo setup - const username = await this.messageHandler.getOrCreateUserMapping( - userId, - client - ); - this.messageHandler.clearCacheForUser(username); + // Update home tab after demo setup await this.updateAppHome(userId, client); break; } @@ -274,8 +269,6 @@ export class ActionHandler { ); try { - await this.messageHandler.getOrCreateUserMapping(userId, client); - // Get GitHub connection status for demo purposes let githubUser = { token: null, username: null }; try { diff --git a/packages/dispatcher/src/slack/handlers/message-handler.ts b/packages/dispatcher/src/slack/handlers/message-handler.ts index 2d7ef2cc..c0420e74 100644 --- a/packages/dispatcher/src/slack/handlers/message-handler.ts +++ b/packages/dispatcher/src/slack/handlers/message-handler.ts @@ -18,19 +18,11 @@ import { getDbPool } from "@peerbot/shared"; export class MessageHandler { private activeSessions = new Map(); - private userMappings = new Map(); // slackUserId -> githubUsername - private repositoryCache = new Map< - string, - { repository: any; timestamp: number } - >(); // username -> {repository, timestamp} - private readonly CACHE_TTL = 5 * 60 * 1000; // 5 minutes cache TTL private readonly SESSION_TTL = 24 * 60 * 60 * 1000; // 24 hours session TTL - // private readonly USER_MAPPING_TTL = 60 * 60 * 1000; // 1 hour user mapping TTL - Currently unused private lastCleanupTime = Date.now(); constructor( private queueProducer: QueueProducer, - private repoManager: any, // Made generic since GitHub module is optional private config: DispatcherConfig ) { this.startCachePrewarming(); @@ -206,20 +198,11 @@ export class MessageHandler { ); try { - // Get user's GitHub username mapping - const username = await this.getOrCreateUserMapping( - context.userId, - client - ); - - // Check if this is a new session - const isNewSession = !context.threadTs; - - // First get a preliminary check for repository without context + // Get repository from environment variables (stored via GitHub OAuth flow) const preliminaryEnv = await this.getUserEnvironment( context.userId, context.channelId, - undefined // Don't pass repository yet as we need to determine it first + undefined ); const overrideRepo = preliminaryEnv.GITHUB_REPOSITORY as | string @@ -227,7 +210,7 @@ export class MessageHandler { let repository; if (overrideRepo) { - // User has overridden the repository URL + // User has configured a repository URL via environment variable const repoUrl = overrideRepo; const parts = repoUrl.split("/"); const repoName = parts[parts.length - 1]; @@ -240,25 +223,12 @@ export class MessageHandler { lastUsed: Date.now(), }; - logger.info(`Using overridden repository for ${username}: ${repoUrl}`); + logger.info(`Using repository for user ${context.userId}: ${repoUrl}`); } else { - // Normal flow - check cache then fetch - const cachedRepo = this.repositoryCache.get(username); - if (cachedRepo && Date.now() - cachedRepo.timestamp < this.CACHE_TTL) { - repository = cachedRepo.repository; - logger.info(`Using cached repository for ${username}`); - } else if (this.repoManager) { - repository = await this.repoManager.ensureUserRepository(username); - this.repositoryCache.set(username, { - repository, - timestamp: Date.now(), - }); - } else { - logger.warn( - "Repository manager not available - proceeding without repository information" - ); - repository = null; - } + logger.info( + `No repository configured for user ${context.userId} in channel ${context.channelId}` + ); + repository = null; } const threadTs = normalizedThreadTs; @@ -270,7 +240,6 @@ export class MessageHandler { channelId: context.channelId, userId: context.userId, threadCreator: context.userId, // Store the thread creator - username, repositoryUrl: repository?.repositoryUrl || "", lastActivity: Date.now(), status: "pending", @@ -299,7 +268,7 @@ export class MessageHandler { } // Determine if this is a new conversation - const isNewConversation = !context.threadTs || isNewSession; + const isNewConversation = !context.threadTs || !existingSession; if (isNewConversation) { const deploymentPayload: WorkerDeploymentPayload = { @@ -456,42 +425,6 @@ export class MessageHandler { return userList.includes(userId); } - /** - * Get or create mapping between Slack user ID and GitHub username - */ - async getOrCreateUserMapping( - slackUserId: string, - client: any - ): Promise { - // Check cache first (with TTL) - const cached = this.userMappings.get(slackUserId); - if (cached) { - return cached; - } - - try { - const userInfo = await client.users.info({ user: slackUserId }); - const userProfile = userInfo?.user?.profile; - - let username = - userProfile?.display_name || userProfile?.real_name || slackUserId; - username = username.toLowerCase().replace(/[^a-z0-9-]/g, "-"); - - if (!username.match(/^[a-z0-9]/)) { - username = `user-${username}`; - } - - this.userMappings.set(slackUserId, username); - logger.info(`Created user mapping: ${slackUserId} -> ${username}`); - return username; - } catch (error) { - logger.error(`Failed to get user info for ${slackUserId}:`, error); - const fallback = `user-${slackUserId.toLowerCase()}`; - this.userMappings.set(slackUserId, fallback); - return fallback; - } - } - /** * Start cache prewarming */ @@ -522,18 +455,8 @@ export class MessageHandler { } } - // Cleanup expired user mappings - this.userMappings.clear(); - - // Cleanup expired repository cache - for (const [key, cached] of this.repositoryCache.entries()) { - if (now - cached.timestamp > this.CACHE_TTL) { - this.repositoryCache.delete(key); - } - } - logger.info( - `Cleanup completed - Active sessions: ${this.activeSessions.size}, User mappings: ${this.userMappings.size}, Repo cache: ${this.repositoryCache.size}` + `Cleanup completed - Active sessions: ${this.activeSessions.size}` ); } @@ -542,18 +465,6 @@ export class MessageHandler { return this.activeSessions; } - getUserMappings(): Map { - return this.userMappings; - } - - getRepositoryCache(): Map { - return this.repositoryCache; - } - - clearCacheForUser(username: string): void { - this.repositoryCache.delete(username); - } - setShortcutCommandHandler(_handler: any): void { // Reference to ShortcutCommandHandler - currently not used } diff --git a/packages/dispatcher/src/slack/handlers/shortcut-command-handler.ts b/packages/dispatcher/src/slack/handlers/shortcut-command-handler.ts index bb75d6e0..a10af40e 100644 --- a/packages/dispatcher/src/slack/handlers/shortcut-command-handler.ts +++ b/packages/dispatcher/src/slack/handlers/shortcut-command-handler.ts @@ -477,13 +477,6 @@ export class ShortcutCommandHandler { // Save the selected repository await this.saveSelectedRepository(userId, repositoryUrl, channelId); - // Clear cache for the user - const username = await this.messageHandler.getOrCreateUserMapping( - userId, - client - ); - this.messageHandler.clearCacheForUser(username); - // Send confirmation const repoName = repositoryUrl.split("/").pop()?.replace(".git", "") || "repository"; diff --git a/packages/dispatcher/src/slack/slack-event-handlers.ts b/packages/dispatcher/src/slack/slack-event-handlers.ts index 33b77189..9c0e8eb8 100644 --- a/packages/dispatcher/src/slack/slack-event-handlers.ts +++ b/packages/dispatcher/src/slack/slack-event-handlers.ts @@ -32,14 +32,8 @@ export class SlackEventHandlers { queueProducer: QueueProducer, private config: DispatcherConfig ) { - // Repository manager will be initialized during setup if GitHub module is available - - // Initialize specialized handlers (repository manager will be set during setup) - this.messageHandler = new MessageHandler( - queueProducer, - undefined, // Repository manager will be set during setup if GitHub module available - config - ); + // Initialize specialized handlers + this.messageHandler = new MessageHandler(queueProducer, config); this.actionHandler = new ActionHandler(queueProducer, this.messageHandler); this.shortcutCommandHandler = new ShortcutCommandHandler( app, @@ -435,21 +429,4 @@ export class SlackEventHandlers { logger.info("Cleaning up Slack event handlers"); this.messageHandler.cleanupExpiredData(); } - - /** - * Get user mappings (required by ThreadResponseConsumer) - */ - getUserMappings(): Map { - return this.messageHandler.getUserMappings(); - } - - /** - * Get or create user mapping (required by external components) - */ - async getOrCreateUserMapping( - slackUserId: string, - client: any - ): Promise { - return this.messageHandler.getOrCreateUserMapping(slackUserId, client); - } } diff --git a/packages/dispatcher/src/types.ts b/packages/dispatcher/src/types.ts index 29dd8610..9bfce54a 100644 --- a/packages/dispatcher/src/types.ts +++ b/packages/dispatcher/src/types.ts @@ -58,7 +58,6 @@ export interface SlackContext { export interface WorkerJobRequest { sessionKey: string; userId: string; - username: string; channelId: string; threadTs?: string; userPrompt: string; @@ -76,7 +75,6 @@ export interface ThreadSession { channelId: string; userId: string; threadCreator?: string; // Track the original thread creator - username: string; jobName?: string; repositoryUrl: string; lastActivity: number; diff --git a/packages/dispatcher/tsconfig.json b/packages/dispatcher/tsconfig.json index 941f7085..e8ffaa17 100644 --- a/packages/dispatcher/tsconfig.json +++ b/packages/dispatcher/tsconfig.json @@ -2,7 +2,6 @@ "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "dist", - "rootDir": "src", "declaration": true, "declarationMap": true, "sourceMap": true, @@ -18,6 +17,6 @@ "noUnusedLocals": false, "noUnusedParameters": false }, - "include": ["src/**/*"], + "include": ["src/**/*", "../../modules/**/*"], "exclude": ["dist", "node_modules", "**/*.test.ts", "**/__tests__/**"] } diff --git a/packages/orchestrator/agent.md b/packages/orchestrator/agent.md index 669809f0..0584a51a 100644 --- a/packages/orchestrator/agent.md +++ b/packages/orchestrator/agent.md @@ -28,6 +28,7 @@ Worker deployment and lifecycle management. Handles Docker/Kubernetes orchestrat - **One thread = One worker**: Creates `peerbot-worker-{userId}-{threadId}` deployments - Workers get persistent volumes at `/workspace` for session continuity - Auto-cleanup idle workers to prevent resource leaks +- **NEVER use console.log/warn/error** - ALWAYS use logger from `@peerbot/shared` ## Environment Variables - `DATABASE_URL`: PostgreSQL connection diff --git a/packages/orchestrator/src/index.ts b/packages/orchestrator/src/index.ts index 36d54af8..7a49ede8 100644 --- a/packages/orchestrator/src/index.ts +++ b/packages/orchestrator/src/index.ts @@ -468,11 +468,6 @@ async function main() { // Create and start orchestrator const orchestrator = new PeerbotOrchestrator(config); await orchestrator.start(); - - // Keep the process alive - process.on("SIGUSR1", () => { - // const _status = orchestrator.getStatus(); - }); } catch (error) { logger.error("💥 Failed to start Peerbot Orchestrator:", error); process.exit(1); diff --git a/packages/orchestrator/src/module-integration.ts b/packages/orchestrator/src/module-integration.ts index f2c5e5cf..ebd0a382 100644 --- a/packages/orchestrator/src/module-integration.ts +++ b/packages/orchestrator/src/module-integration.ts @@ -1,4 +1,7 @@ import { moduleRegistry } from "../../../modules"; +import { createLogger } from "@peerbot/shared"; + +const logger = createLogger("orchestrator"); export async function buildModuleEnvVars( userId: string, @@ -12,7 +15,7 @@ export async function buildModuleEnvVars( try { envVars = await module.buildEnvVars(userId, envVars); } catch (error) { - console.error( + logger.error( `Failed to build env vars for module ${module.name}:`, error ); diff --git a/packages/orchestrator/tsconfig.json b/packages/orchestrator/tsconfig.json index 813b8c9c..6f195f3d 100644 --- a/packages/orchestrator/tsconfig.json +++ b/packages/orchestrator/tsconfig.json @@ -4,7 +4,6 @@ "module": "commonjs", "lib": ["ES2022"], "outDir": "./dist", - "rootDir": "./src", "strict": true, "esModuleInterop": true, "skipLibCheck": true, @@ -22,6 +21,10 @@ "@/*": ["src/*"] } }, - "include": ["src/**/*"], + "include": [ + "src/**/*", + "../../../modules/index.ts", + "../../../modules/types.ts" + ], "exclude": ["node_modules", "dist", "**/*.test.ts"] } diff --git a/packages/shared/agent.md b/packages/shared/agent.md index 69986213..9a7f43db 100644 --- a/packages/shared/agent.md +++ b/packages/shared/agent.md @@ -35,6 +35,7 @@ Common utilities and infrastructure for all packages. Foundation for logging, da - All packages use shared error types and logging configuration - Database access through shared connection pooling - Encryption utilities for storing sensitive data (GitHub tokens, API keys) +- **NEVER use console.log/warn/error** - ALWAYS use the logger created via `createLogger()` ## Environment Variables - `DATABASE_URL`: PostgreSQL connection string diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.ts index caf75a93..2a774e3d 100644 --- a/packages/shared/src/index.ts +++ b/packages/shared/src/index.ts @@ -17,7 +17,5 @@ export * from "./database"; // Export encryption utilities export * from "./utils/encryption"; -// Export testing utilities -export * from "./testing"; // Export error classes export * from "./errors"; diff --git a/packages/shared/src/utils/encryption.ts b/packages/shared/src/utils/encryption.ts index 36fb2ec7..7de29ee1 100644 --- a/packages/shared/src/utils/encryption.ts +++ b/packages/shared/src/utils/encryption.ts @@ -3,16 +3,48 @@ import * as crypto from "node:crypto"; const IV_LENGTH = 12; // 96-bit nonce for AES-GCM /** - * Get encryption key from environment, properly padded + * Get encryption key from environment with validation + * + * IMPORTANT: The ENCRYPTION_KEY must be exactly 32 bytes (256 bits) for AES-256. + * Generate a secure key using: `openssl rand -base64 32` or `openssl rand -hex 32` */ -function getEncryptionKey(): string { +function getEncryptionKey(): Buffer { const key = process.env.ENCRYPTION_KEY || ""; if (!key) { throw new Error( "ENCRYPTION_KEY environment variable is required for secure operation" ); } - return key.padEnd(32).slice(0, 32); + + // Try to decode as base64 first (most common format) + let keyBuffer: Buffer; + try { + keyBuffer = Buffer.from(key, "base64"); + if (keyBuffer.length === 32) { + return keyBuffer; + } + } catch { + // Not valid base64, try other formats + } + + // Try as hex + if (/^[0-9a-fA-F]{64}$/.test(key)) { + keyBuffer = Buffer.from(key, "hex"); + if (keyBuffer.length === 32) { + return keyBuffer; + } + } + + // Try as UTF-8 (for backward compatibility with existing keys) + keyBuffer = Buffer.from(key, "utf8"); + if (keyBuffer.length === 32) { + return keyBuffer; + } + + throw new Error( + `ENCRYPTION_KEY must be exactly 32 bytes (256 bits) when decoded, got ${keyBuffer.length} bytes. ` + + `Generate a valid key with: openssl rand -base64 32` + ); } /** @@ -21,11 +53,7 @@ function getEncryptionKey(): string { export function encrypt(text: string): string { const encryptionKey = getEncryptionKey(); const iv = crypto.randomBytes(IV_LENGTH); - const cipher = crypto.createCipheriv( - "aes-256-gcm", - Buffer.from(encryptionKey, "utf8"), - iv - ); + const cipher = crypto.createCipheriv("aes-256-gcm", encryptionKey, iv); const encrypted = Buffer.concat([ cipher.update(text, "utf8"), cipher.final(), @@ -44,11 +72,7 @@ export function decrypt(text: string): string { const iv = Buffer.from(parts[0]!, "hex"); const tag = Buffer.from(parts[1]!, "hex"); const encryptedText = Buffer.from(parts[2]!, "hex"); - const decipher = crypto.createDecipheriv( - "aes-256-gcm", - Buffer.from(encryptionKey, "utf8"), - iv - ); + const decipher = crypto.createDecipheriv("aes-256-gcm", encryptionKey, iv); decipher.setAuthTag(tag); const decrypted = Buffer.concat([ decipher.update(encryptedText), diff --git a/packages/worker/agent.md b/packages/worker/agent.md index dd2fe706..f0031c98 100644 --- a/packages/worker/agent.md +++ b/packages/worker/agent.md @@ -29,6 +29,7 @@ Claude Code execution environment. Processes user requests in isolated container - **Workspace persistence**: Uses `/workspace` volume for session continuity - **Auto-resume**: Claude CLI `--resume` flag maintains conversation context - **Thread isolation**: Workers only process messages for their assigned thread +- **NEVER use console.log/warn/error** - ALWAYS use logger from `@peerbot/shared` ## Environment Variables - `USER_ID`: Slack user ID for session association diff --git a/packages/worker/scripts/worker-entrypoint.sh b/packages/worker/scripts/worker-entrypoint.sh index c634f9d2..4a43016b 100644 --- a/packages/worker/scripts/worker-entrypoint.sh +++ b/packages/worker/scripts/worker-entrypoint.sh @@ -192,4 +192,11 @@ echo "🚀 Executing Claude Worker..." if [ "$(pwd)" != "/app/packages/worker" ]; then cd /app/packages/worker || { echo "❌ Failed to cd to /app/packages/worker"; exit 1; } fi -exec bun run dist/src/index.js \ No newline at end of file + +# In development mode, run from source to avoid path resolution issues with modules +if [ "${NODE_ENV}" = "development" ]; then + echo "📝 Running in development mode from source..." + exec bun run src/index.ts +else + exec bun run dist/src/index.js +fi \ No newline at end of file diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts index 0396bef5..165d1af6 100644 --- a/packages/worker/src/index.ts +++ b/packages/worker/src/index.ts @@ -2,8 +2,6 @@ import { initSentry, createLogger } from "@peerbot/shared"; -// Force rebuild to deploy MCP config fix - timestamp: 1756399400 - // Initialize Sentry monitoring initSentry(); @@ -141,5 +139,3 @@ async function appendTerminationMessage(signal: string): Promise { export type { WorkerConfig } from "./types"; main(); - -// Cache bust Sat Aug 30 18:38:05 BST 2025 diff --git a/packages/worker/src/module-integration.ts b/packages/worker/src/module-integration.ts index 3208fac4..c8d250b6 100644 --- a/packages/worker/src/module-integration.ts +++ b/packages/worker/src/module-integration.ts @@ -3,6 +3,9 @@ import { type SessionContext, type ActionButton, } from "../../../modules"; +import { createLogger } from "@peerbot/shared"; + +const logger = createLogger("worker"); export async function onSessionStart( context: SessionContext @@ -15,7 +18,7 @@ export async function onSessionStart( try { updatedContext = await module.onSessionStart(updatedContext); } catch (error) { - console.error( + logger.error( `Failed to execute onSessionStart for module ${module.name}:`, error ); @@ -38,7 +41,7 @@ export async function onSessionEnd( const buttons = await module.onSessionEnd(context); allButtons.push(...buttons); } catch (error) { - console.error( + logger.error( `Failed to execute onSessionEnd for module ${module.name}:`, error ); @@ -56,7 +59,7 @@ export async function initModuleWorkspace(config: any): Promise { try { await module.initWorkspace(config); } catch (error) { - console.error( + logger.error( `Failed to initialize workspace for module ${module.name}:`, error ); diff --git a/packages/worker/src/persistent-task-worker.ts b/packages/worker/src/persistent-task-worker.ts index 0548066a..f0b88003 100644 --- a/packages/worker/src/persistent-task-worker.ts +++ b/packages/worker/src/persistent-task-worker.ts @@ -26,9 +26,6 @@ export class QueuePersistentClaudeWorker { this.userId = userId; this.targetThreadId = targetThreadId; - // Load initial configuration from environment - // this.config = this.loadConfigFromEnv(); - // Get deployment name from environment const deploymentName = process.env.DEPLOYMENT_NAME; if (!deploymentName) { diff --git a/packages/worker/src/task-queue-integration.ts b/packages/worker/src/task-queue-integration.ts index 7c21cd22..1425ff31 100644 --- a/packages/worker/src/task-queue-integration.ts +++ b/packages/worker/src/task-queue-integration.ts @@ -614,7 +614,7 @@ export class QueueIntegration { loginButtonText = "🔗 Login with GitHub"; } } catch (moduleError) { - console.warn( + logger.warn( "Failed to get OAuth URL from module, using fallback:", moduleError ); diff --git a/packages/worker/tsconfig.json b/packages/worker/tsconfig.json index 0212a837..e05ac48d 100644 --- a/packages/worker/tsconfig.json +++ b/packages/worker/tsconfig.json @@ -2,7 +2,6 @@ "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "dist", - "rootDir": ".", "declaration": true, "declarationMap": true, "sourceMap": true, @@ -13,6 +12,11 @@ "noEmit": false, "allowImportingTsExtensions": false }, - "include": ["src/**/*", "mcp/**/*"], + "include": [ + "src/**/*", + "mcp/**/*", + "../../modules/**/*", + "../shared/src/**/*" + ], "exclude": ["dist", "node_modules", "**/*.test.ts", "**/__tests__/**"] }