Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/agents/shared/promptContext.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { getTrelloConfig } from '../../pm/config.js';
import { getPMProvider } from '../../pm/index.js';
import type { ProjectConfig } from '../../types/index.js';
import type { PromptContext } from '../prompts/index.js';
Expand Down Expand Up @@ -29,8 +30,8 @@ export function buildPromptContext(
cardUrl: cardId ? pmProvider.getWorkItemUrl(cardId) : undefined,
projectId: project.id,
baseBranch: project.baseBranch,
storiesListId: project.trello?.lists?.stories,
processedLabelId: project.trello?.labels?.processed,
storiesListId: getTrelloConfig(project)?.lists?.stories,
processedLabelId: getTrelloConfig(project)?.labels?.processed,
pmType: pmProvider.type,
workItemNoun: isJira ? 'issue' : 'card',
workItemNounPlural: isJira ? 'issues' : 'cards',
Expand All @@ -50,7 +51,7 @@ export function buildPromptContext(
originalCardName: debugContext.originalCardName,
originalCardUrl: debugContext.originalCardUrl,
detectedAgentType: debugContext.detectedAgentType,
debugListId: project.trello?.lists?.debug,
debugListId: getTrelloConfig(project)?.lists?.debug,
}),
};
}
19 changes: 11 additions & 8 deletions src/api/routers/webhooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { getAllProjectCredentials } from '../../config/provider.js';
import { getDb } from '../../db/client.js';
import { findProjectByIdFromDb } from '../../db/repositories/configRepository.js';
import { projects } from '../../db/schema/index.js';
import { getJiraConfig, getTrelloConfig } from '../../pm/config.js';
import { parseRepoFullName } from '../../utils/repo.js';
import { protectedProcedure, router } from '../trpc.js';

Expand Down Expand Up @@ -78,12 +79,14 @@ async function resolveProjectContext(
const creds = await getAllProjectCredentials(projectId);

// Resolve JIRA label names from config (with defaults)
const jiraLabels = project.jira
const jiraConfig = getJiraConfig(project);
const trelloConfig = getTrelloConfig(project);
const jiraLabels = jiraConfig
? [
project.jira.labels?.processing ?? 'cascade-processing',
project.jira.labels?.processed ?? 'cascade-processed',
project.jira.labels?.error ?? 'cascade-error',
project.jira.labels?.readyToProcess ?? 'cascade-ready',
jiraConfig.labels?.processing ?? 'cascade-processing',
jiraConfig.labels?.processed ?? 'cascade-processed',
jiraConfig.labels?.error ?? 'cascade-error',
jiraConfig.labels?.readyToProcess ?? 'cascade-ready',
]
: undefined;

Expand All @@ -92,9 +95,9 @@ async function resolveProjectContext(
orgId: project.orgId,
repo: project.repo,
pmType: project.pm?.type ?? 'trello',
boardId: project.trello?.boardId,
jiraBaseUrl: project.jira?.baseUrl,
jiraProjectKey: project.jira?.projectKey,
boardId: trelloConfig?.boardId,
jiraBaseUrl: jiraConfig?.baseUrl,
jiraProjectKey: jiraConfig?.projectKey,
jiraLabels,
trelloApiKey: creds.TRELLO_API_KEY ?? '',
trelloToken: creds.TRELLO_TOKEN ?? '',
Expand Down
12 changes: 7 additions & 5 deletions src/backends/secretBuilder.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { getAllProjectCredentials } from '../config/provider.js';
import { getPersonaToken } from '../github/personas.js';
import { getJiraConfig } from '../pm/config.js';
import type { AgentInput, ProjectConfig } from '../types/index.js';
import { parseRepoFullName } from '../utils/repo.js';
import type { AgentProfile } from './agent-profiles.js';
Expand Down Expand Up @@ -41,11 +42,12 @@ export async function augmentProjectSecrets(
}

// Inject JIRA integration config so cascade-tools can construct JiraPMProvider
if (project.jira) {
projectSecrets.CASCADE_JIRA_PROJECT_KEY = project.jira.projectKey;
projectSecrets.CASCADE_JIRA_BASE_URL = project.jira.baseUrl;
if (project.jira.statuses) {
projectSecrets.CASCADE_JIRA_STATUSES = JSON.stringify(project.jira.statuses);
const jiraConfig = getJiraConfig(project);
if (jiraConfig) {
projectSecrets.CASCADE_JIRA_PROJECT_KEY = jiraConfig.projectKey;
projectSecrets.CASCADE_JIRA_BASE_URL = jiraConfig.baseUrl;
if (jiraConfig.statuses) {
projectSecrets.CASCADE_JIRA_STATUSES = JSON.stringify(jiraConfig.statuses);
}
}

Expand Down
12 changes: 0 additions & 12 deletions src/gadgets/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,5 @@ export { VerifyChanges } from './VerifyChanges.js';
// Search gadgets
export { RipGrep } from './RipGrep.js';
export { AstGrep } from './AstGrep.js';

// Trello gadgets
export {
ReadTrelloCard,
PostTrelloComment,
UpdateTrelloCard,
CreateTrelloCard,
ListTrelloCards,
GetMyRecentActivity,
AddChecklistToCard,
} from './trello/index.js';

// GitHub gadgets
export { GetPRDetails, GetPRComments, ReplyToReviewComment } from './github/index.js';
52 changes: 0 additions & 52 deletions src/gadgets/trello/AddChecklistToCard.ts

This file was deleted.

52 changes: 0 additions & 52 deletions src/gadgets/trello/CreateTrelloCard.ts

This file was deleted.

82 changes: 0 additions & 82 deletions src/gadgets/trello/GetMyRecentActivity.ts

This file was deleted.

22 changes: 0 additions & 22 deletions src/gadgets/trello/ListTrelloCards.ts

This file was deleted.

26 changes: 0 additions & 26 deletions src/gadgets/trello/PostTrelloComment.ts

This file was deleted.

34 changes: 0 additions & 34 deletions src/gadgets/trello/ReadTrelloCard.ts

This file was deleted.

Loading