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
14 changes: 14 additions & 0 deletions .codex/environments/environment.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# THIS IS AUTOGENERATED. DO NOT EDIT MANUALLY
version = 1
name = "ADE"

[setup]
script = ""

[[actions]]
name = "Run"
icon = "run"
command = '''
cd apps/desktop
npm run dev
'''
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
.ade/
.DS_Store
*.pem
infra/node_modules/
infra/.sst/
infra/.pulumi/
/infra/.home
70 changes: 63 additions & 7 deletions apps/desktop/src/main/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ import { createGitOperationsService } from "./services/git/gitOperationsService"
import { createPackService } from "./services/packs/packService";
import { createJobEngine } from "./services/jobs/jobEngine";
import { createHostedAgentService } from "./services/hosted/hostedAgentService";
import { createByokLlmService } from "./services/byok/byokLlmService";
import { createGithubService } from "./services/github/githubService";
import { createPrService } from "./services/prs/prService";
import { createPrPollingService } from "./services/prs/prPollingService";
import { detectDefaultBaseRef, ensureAdeExcluded, resolveRepoRoot, toProjectInfo, upsertProjectRow } from "./services/projects/projectService";
import { IPC } from "../shared/ipc";
import type { AppContext } from "./services/ipc/registerIpc";
Expand Down Expand Up @@ -139,13 +143,17 @@ app.whenReady().then(async () => {
onHeadChanged: ({ laneId, reason }) => {
jobEngine?.onHeadChanged({ laneId, reason });
}
});
await laneService.ensurePrimaryLane();
const sessionService = createSessionService({ db });
const diffService = createDiffService({ laneService });
const projectConfigService = createProjectConfigService({
projectRoot,
adeDir: adePaths.adeDir,
});
await laneService.ensurePrimaryLane();
const sessionService = createSessionService({ db });
const reconciledSessions = sessionService.reconcileStaleRunningSessions({ status: "disposed" });
if (reconciledSessions > 0) {
logger.warn("sessions.reconciled_stale_running", { count: reconciledSessions });
}
const diffService = createDiffService({ laneService });
const projectConfigService = createProjectConfigService({
projectRoot,
adeDir: adePaths.adeDir,
projectId,
db,
logger
Expand Down Expand Up @@ -176,14 +184,29 @@ app.whenReady().then(async () => {
}
});

const byokLlmService = createByokLlmService({
logger,
projectConfigService
});

const githubService = createGithubService({
logger,
adeDir: adePaths.adeDir,
projectRoot,
projectConfigService,
hostedAgentService
});

const conflictService = createConflictService({
db,
logger,
projectId,
projectRoot,
laneService,
projectConfigService,
operationService,
hostedAgentService,
byokLlmService,
conflictPacksDir: path.join(adePaths.packsDir, "conflicts"),
onEvent: (event) => broadcast(IPC.conflictsEvent, event)
});
Expand All @@ -195,6 +218,30 @@ app.whenReady().then(async () => {
hostedAgentService
});

const prService = createPrService({
db,
logger,
projectId,
projectRoot,
laneService,
operationService,
githubService,
packService,
hostedAgentService,
byokLlmService,
projectConfigService,
openExternal: async (url) => {
await shell.openExternal(url);
}
});

const prPollingService = createPrPollingService({
logger,
prService,
projectConfigService,
onEvent: (event) => broadcast(IPC.prsEvent, event)
});

const fileService = createFileService({
laneService,
onLaneWorktreeMutation: ({ laneId, reason }) => {
Expand Down Expand Up @@ -271,6 +318,10 @@ app.whenReady().then(async () => {
gitService,
conflictService,
hostedAgentService,
byokLlmService,
githubService,
prService,
prPollingService,
jobEngine,
packService,
projectConfigService,
Expand All @@ -280,6 +331,11 @@ app.whenReady().then(async () => {
};

const closeContext = () => {
try {
ctxRef.prPollingService.dispose();
} catch {
// ignore
}
try {
ctxRef.jobEngine.dispose();
} catch {
Expand Down
Loading