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
1 change: 1 addition & 0 deletions .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
pull_request:
branches:
- main
- chat
types:
- opened
- synchronize
Expand Down
24 changes: 12 additions & 12 deletions docs/ai-chat-context-and-payload-strategy.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Each request includes a system prompt with policy guidance, then augments that p

Primary implementation:

- src/modules/github/chat/payload.js
- src/modules/chat/payload.js

### 2. Repository context

Expand All @@ -29,7 +29,7 @@ Each request includes repository targeting context as a dedicated system message

Primary implementation:

- src/modules/github/chat/drawer.js
- src/modules/chat/drawer.js

### 3. Editor context (Send tab content)

Expand All @@ -44,8 +44,8 @@ This context is designed to support dynamic proposal targeting by tab id/path an

Primary implementation:

- src/modules/github/chat/active-tab-context.js
- src/modules/github/chat/drawer.js
- src/modules/chat/active-tab-context.js
- src/modules/chat/drawer.js

### 4. Tooling model

Expand All @@ -62,9 +62,9 @@ Contract:

Primary implementation:

- src/modules/github/chat/proposals.js
- src/modules/github/chat/tab-target-resolver.js
- src/modules/github/chat/drawer.js
- src/modules/chat/proposals.js
- src/modules/chat/tab-target-resolver.js
- src/modules/chat/drawer.js

### 5. Apply and undo behavior

Expand All @@ -74,8 +74,8 @@ Primary implementation:

Primary implementation:

- src/modules/github/chat/drawer.js
- src/modules/github/chat/tab-scoped-undo-state.js
- src/modules/chat/drawer.js
- src/modules/chat/tab-scoped-undo-state.js

### 6. Payload size controls and summary strategy

Expand All @@ -88,7 +88,7 @@ The payload builder includes bounded-conversation controls:

Primary implementation:

- src/modules/github/chat/payload.js
- src/modules/chat/payload.js

### 7. Fallback and transport behavior

Expand All @@ -98,8 +98,8 @@ Primary implementation:

Primary implementation:

- src/modules/github/chat/drawer.js
- src/modules/github/api/chat.js
- src/modules/chat/drawer.js
- src/modules/chat/api/completions.js

## Why this approach

Expand Down
4 changes: 2 additions & 2 deletions playwright/github-byot-ai.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect, test } from '@playwright/test'
import { defaultGitHubChatModel } from '../src/modules/github/api/chat.js'
import { defaultChatModel } from '../src/modules/chat/api/completions.js'
import type { ChatRequestBody, ChatRequestMessage } from './helpers/app-test-helpers.js'
import {
appEntryPath,
Expand Down Expand Up @@ -867,7 +867,7 @@ test('AI chat prefers streaming responses when available', async ({ page }) => {
await expect(page.getByText('Streaming response ready')).toBeVisible()

expect(streamRequestBody?.metadata).toBeUndefined()
expect(streamRequestBody?.model).toBe(defaultGitHubChatModel)
expect(streamRequestBody?.model).toBe(defaultChatModel)
expect(streamRequestBody?.tool_choice).toBe('auto')
expect(
streamRequestBody?.tools?.some(
Expand Down
50 changes: 32 additions & 18 deletions src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ import { persistClosedPrContextRecords } from './modules/app-core/pr-context-rec
import { createPrContextStateChangeHandler } from './modules/app-core/pr-context-state-change-handler.js'
import { createWorkspaceContextStatusController } from './modules/app-core/workspace-context-status-controller.js'
import { createWorkspaceRecordAppliedHandler } from './modules/app-core/workspace-record-applied-handler.js'
import { createGitHubChatWorkspaceActions } from './modules/app-core/github-chat-workspace-actions.js'
import { createChatWorkspaceActions } from './modules/chat/workspace-actions.js'
import { createShareCurrentLocalWorkspace } from './modules/app-core/workspace-share-action.js'
import { createDiagnosticsUiController } from './modules/diagnostics/diagnostics-ui.js'
import { createGitHubChatDrawer } from './modules/github/chat/drawer.js'
import { initializeChatWorkflows } from './modules/app-core/chat-workflows.js'
import { createGitHubByotControls } from './modules/github/byot-controls.js'
import {
formatActivePrReference,
Expand Down Expand Up @@ -1172,7 +1172,7 @@ const onPrContextStateChange = createPrContextStateChangeHandler({
editedIndicatorVisibilityController,
})

const githubChatWorkspaceActions = createGitHubChatWorkspaceActions({
const githubChatWorkspaceActions = createChatWorkspaceActions({
getActiveWorkspaceTab,
isStyleWorkspaceTab,
getCssSource: () => getCssSource(),
Expand All @@ -1187,7 +1187,6 @@ const githubChatWorkspaceActions = createGitHubChatWorkspaceActions({
const githubWorkflows = createGitHubWorkflowsSetup({
factories: {
createGitHubPrEditorSyncController,
createGitHubChatDrawer,
createGitHubPrDrawer,
createWorkspacesDrawer,
},
Expand All @@ -1210,17 +1209,6 @@ const githubWorkflows = createGitHubWorkflowsSetup({
byotControls.clearSelectedRepositoryPreference(),
},
ui: {
aiChatToggle,
aiChatDrawer,
aiChatClose,
aiChatPrompt,
aiChatModel,
aiChatIncludeEditors,
aiChatSend,
aiChatClear,
aiChatStatus,
aiChatRepository,
aiChatMessages,
githubPrToggle,
githubPrDrawer,
githubPrClose,
Expand Down Expand Up @@ -1351,7 +1339,6 @@ const githubWorkflows = createGitHubWorkflowsSetup({
/* Save failures are already surfaced through saver onError. */
})
},
getPersistedActivePrContext,
getTokenForVisibility: () => githubAiContextState.token,
getActivePrEditorSyncKey: () => githubAiContextState.activePrEditorSyncKey,
syncFromActiveContext: ({ tabTargets }) => {
Expand All @@ -1373,7 +1360,6 @@ const githubWorkflows = createGitHubWorkflowsSetup({
setStatus,
showAppToast,
shareCurrentLocalWorkspace,
...githubChatWorkspaceActions,
scheduleRender: () => {
if (
autoRenderToggle?.checked &&
Expand All @@ -1385,7 +1371,35 @@ const githubWorkflows = createGitHubWorkflowsSetup({
},
})

chatDrawerController = githubWorkflows.chatDrawerController
const chatWorkflows = initializeChatWorkflows({
aiChatToggle,
aiChatDrawer,
aiChatClose,
aiChatPrompt,
aiChatModel,
aiChatIncludeEditors,
aiChatSend,
aiChatClear,
aiChatStatus,
aiChatRepository,
aiChatMessages,
getToken: getCurrentGitHubToken,
getSelectedRepository: getCurrentSelectedRepository,
...githubChatWorkspaceActions,
getRenderMode: () => renderMode.value,
getStyleMode: () => styleMode.value,
getPersistedActivePrContext,
scheduleRender: () => {
if (
autoRenderToggle?.checked &&
typeof renderRuntime?.scheduleRender === 'function'
) {
renderRuntime.scheduleRender()
}
},
})

chatDrawerController = chatWorkflows.chatDrawerController
prDrawerController = githubWorkflows.prDrawerController
workspacesDrawerController = githubWorkflows.workspacesDrawerController

Expand Down
54 changes: 54 additions & 0 deletions src/modules/app-core/chat-workflows.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
import { createChatDrawer } from '../chat/drawer.js'

const initializeChatWorkflows = ({
aiChatToggle,
aiChatDrawer,
aiChatClose,
aiChatPrompt,
aiChatModel,
aiChatIncludeEditors,
aiChatSend,
aiChatClear,
aiChatStatus,
aiChatRepository,
aiChatMessages,
getToken,
getSelectedRepository,
getActiveWorkspaceTabContext,
getWorkspaceTabContexts,
applyWorkspaceTabContent,
scheduleRender,
getRenderMode,
getStyleMode,
getPersistedActivePrContext,
}) => {
const chatDrawerController = createChatDrawer({
toggleButton: aiChatToggle,
drawer: aiChatDrawer,
closeButton: aiChatClose,
promptInput: aiChatPrompt,
modelSelect: aiChatModel,
includeEditorsContextToggle: aiChatIncludeEditors,
sendButton: aiChatSend,
clearButton: aiChatClear,
statusNode: aiChatStatus,
repositoryNode: aiChatRepository,
messagesNode: aiChatMessages,
getToken,
getSelectedRepository,
getActiveWorkspaceTabContext,
getWorkspaceTabContexts,
applyWorkspaceTabContent,
scheduleRender,
getRenderMode,
getStyleMode,
getDrawerSide: () => {
return 'right'
},
getPersistedActivePrContext,
})

return { chatDrawerController }
}

export { initializeChatWorkflows }
4 changes: 0 additions & 4 deletions src/modules/app-core/github-workflows-setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ const createGitHubWorkflowsSetup = ({
getEditorSyncTargets: workspace.getEditorSyncTargets,
getRenderMode: runtime.getRenderMode,
getStyleMode: runtime.getStyleMode,
getPersistedActivePrContext: runtime.getPersistedActivePrContext,
setCurrentSelectedRepository: byot.setCurrentSelectedRepository,
clearCurrentSelectedRepository: byot.clearCurrentSelectedRepository,
reconcileWorkspaceTabsWithPushUpdates:
Expand All @@ -56,9 +55,6 @@ const createGitHubWorkflowsSetup = ({
setStatus: actions.setStatus,
showAppToast: actions.showAppToast,
shareCurrentLocalWorkspace: actions.shareCurrentLocalWorkspace,
getActiveWorkspaceTabContext: actions.getActiveWorkspaceTabContext,
getWorkspaceTabContexts: actions.getWorkspaceTabContexts,
applyWorkspaceTabContent: actions.applyWorkspaceTabContent,
scheduleRender: actions.scheduleRender,
applyWorkspaceFontCssUrl: workspace.applyWorkspaceFontCssUrl,
})
Expand Down
43 changes: 0 additions & 43 deletions src/modules/app-core/github-workflows.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { toWorkspaceRecordKey } from '../workspace/workspace-tab-helpers.js'

const initializeGitHubWorkflows = ({
createGitHubPrEditorSyncController,
createGitHubChatDrawer,
createGitHubPrDrawer,
createWorkspacesDrawer,
ensureJsxTransformSource,
Expand All @@ -13,17 +12,6 @@ const initializeGitHubWorkflows = ({
byotControls,
getCurrentGitHubToken,
getCurrentSelectedRepository,
aiChatToggle,
aiChatDrawer,
aiChatClose,
aiChatPrompt,
aiChatModel,
aiChatIncludeEditors,
aiChatSend,
aiChatClear,
aiChatStatus,
aiChatRepository,
aiChatMessages,
githubPrToggle,
githubPrDrawer,
githubPrClose,
Expand Down Expand Up @@ -71,7 +59,6 @@ const initializeGitHubWorkflows = ({
getStyleMode,
setCurrentSelectedRepository,
clearCurrentSelectedRepository,
getPersistedActivePrContext,
reconcileWorkspaceTabsWithPushUpdates,
getActivePrContextSyncKey,
prContextUi,
Expand All @@ -89,9 +76,6 @@ const initializeGitHubWorkflows = ({
setStatus,
showAppToast,
shareCurrentLocalWorkspace,
getActiveWorkspaceTabContext,
getWorkspaceTabContexts,
applyWorkspaceTabContent,
scheduleRender,
}) => {
const getCurrentWritableRepositories = () =>
Expand Down Expand Up @@ -192,32 +176,6 @@ const initializeGitHubWorkflows = ({
shouldApplySyncResult: shouldApplyActivePrEditorSync,
})

const chatDrawerController = createGitHubChatDrawer({
toggleButton: aiChatToggle,
drawer: aiChatDrawer,
closeButton: aiChatClose,
promptInput: aiChatPrompt,
modelSelect: aiChatModel,
includeEditorsContextToggle: aiChatIncludeEditors,
sendButton: aiChatSend,
clearButton: aiChatClear,
statusNode: aiChatStatus,
repositoryNode: aiChatRepository,
messagesNode: aiChatMessages,
getToken: getCurrentGitHubToken,
getSelectedRepository: getCurrentSelectedRepository,
getActiveWorkspaceTabContext,
getWorkspaceTabContexts,
applyWorkspaceTabContent,
scheduleRender,
getRenderMode,
getStyleMode,
getDrawerSide: () => {
return 'right'
},
getPersistedActivePrContext,
})

const prDrawerController = createGitHubPrDrawer({
toggleButton: githubPrToggle,
drawer: githubPrDrawer,
Expand Down Expand Up @@ -792,7 +750,6 @@ const initializeGitHubWorkflows = ({
})

return {
chatDrawerController,
prDrawerController,
workspacesDrawerController,
}
Expand Down
Loading
Loading