mirror of
https://github.com/davidkaya/aryx.git
synced 2026-11-21 00:31:27 +01:00
feat(workflows): add phase 5 backend templates and export support
- add shared workflow template and serialization helpers for YAML, Mermaid, and DOT export - add pattern-to-workflow upgrade and template application flows in AryxAppService - persist built-in and custom workflow templates in workspace state and expose new IPC/preload methods - cover the new backend slice with shared and app-service tests Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
1 parent
f05ec8ac7f
commit
4971dcf9fc
17 files changed
+1094
-6
No files matched your search
@@ -43,6 +43,20 @@ import {
|
||||
type WorkflowDefinition,
|
||||
type WorkflowReference,
|
||||
} from '@shared/domain/workflow';
|
||||
import {
|
||||
exportWorkflowDefinition,
|
||||
importWorkflowDefinition,
|
||||
type WorkflowExportFormat,
|
||||
type WorkflowExportResult,
|
||||
} from '@shared/domain/workflowSerialization';
|
||||
import {
|
||||
applyWorkflowTemplate,
|
||||
buildWorkflowFromPattern,
|
||||
createWorkflowTemplateFromWorkflow,
|
||||
normalizeWorkflowTemplateDefinition,
|
||||
type WorkflowTemplateCategory,
|
||||
type WorkflowTemplateDefinition,
|
||||
} from '@shared/domain/workflowTemplate';
|
||||
import {
|
||||
normalizeWorkspaceAgentDefinition,
|
||||
resolvePatternAgents,
|
||||
@@ -657,6 +671,116 @@ export class AryxAppService extends EventEmitter<AppServiceEvents> {
|
||||
return this.persistAndBroadcast(workspace);
|
||||
}
|
||||
|
||||
async saveWorkflowTemplate(
|
||||
workflowId: string,
|
||||
options?: {
|
||||
templateId?: string;
|
||||
name?: string;
|
||||
description?: string;
|
||||
category?: WorkflowTemplateCategory;
|
||||
},
|
||||
): Promise<WorkspaceState> {
|
||||
const workspace = await this.loadWorkspace();
|
||||
const workflow = this.requireWorkflow(workspace, workflowId);
|
||||
const candidate = createWorkflowTemplateFromWorkflow(workflow, options);
|
||||
const existingIndex = workspace.workflowTemplates.findIndex((template) => template.id === candidate.id);
|
||||
const existingTemplate = existingIndex >= 0 ? workspace.workflowTemplates[existingIndex] : undefined;
|
||||
if (existingTemplate?.source === 'builtin') {
|
||||
throw new Error(`Workflow template "${candidate.id}" is reserved by a built-in template.`);
|
||||
}
|
||||
|
||||
const normalizedCandidate: WorkflowTemplateDefinition = normalizeWorkflowTemplateDefinition({
|
||||
...candidate,
|
||||
createdAt: existingTemplate?.createdAt ?? candidate.createdAt,
|
||||
updatedAt: nowIso(),
|
||||
});
|
||||
|
||||
if (existingIndex >= 0) {
|
||||
workspace.workflowTemplates[existingIndex] = normalizedCandidate;
|
||||
} else {
|
||||
workspace.workflowTemplates.push(normalizedCandidate);
|
||||
}
|
||||
|
||||
return this.persistAndBroadcast(workspace);
|
||||
}
|
||||
|
||||
async createWorkflowFromTemplate(
|
||||
templateId: string,
|
||||
options?: {
|
||||
workflowId?: string;
|
||||
name?: string;
|
||||
description?: string;
|
||||
},
|
||||
): Promise<WorkspaceState> {
|
||||
const workspace = await this.loadWorkspace();
|
||||
const template = this.requireWorkflowTemplate(workspace, templateId);
|
||||
const workflowId = options?.workflowId?.trim()
|
||||
|| this.createUniqueWorkflowId(workspace, template.workflow.id);
|
||||
const workflow = applyWorkflowTemplate(template, {
|
||||
...options,
|
||||
workflowId,
|
||||
});
|
||||
|
||||
return this.saveWorkflow(workflow);
|
||||
}
|
||||
|
||||
async exportWorkflow(workflowId: string, format: WorkflowExportFormat): Promise<WorkflowExportResult> {
|
||||
const workspace = await this.loadWorkspace();
|
||||
const workflow = this.requireWorkflow(workspace, workflowId);
|
||||
return exportWorkflowDefinition(workflow, format);
|
||||
}
|
||||
|
||||
async importWorkflow(
|
||||
content: string,
|
||||
format: 'yaml' | 'json',
|
||||
options?: { save?: boolean },
|
||||
): Promise<{ workflow: WorkflowDefinition; workspace?: WorkspaceState }> {
|
||||
const workflow = importWorkflowDefinition(content, format);
|
||||
if (!options?.save) {
|
||||
return { workflow };
|
||||
}
|
||||
|
||||
const workspace = await this.saveWorkflow(workflow);
|
||||
return {
|
||||
workflow,
|
||||
workspace,
|
||||
};
|
||||
}
|
||||
|
||||
async upgradePatternToWorkflow(
|
||||
patternId: string,
|
||||
options?: {
|
||||
workflowId?: string;
|
||||
name?: string;
|
||||
description?: string;
|
||||
save?: boolean;
|
||||
},
|
||||
): Promise<{ workflow: WorkflowDefinition; workspace?: WorkspaceState }> {
|
||||
const workspace = await this.loadWorkspace();
|
||||
const pattern = this.requirePattern(workspace, patternId);
|
||||
const baseWorkflow = buildWorkflowFromPattern(pattern);
|
||||
const workflowId = options?.workflowId?.trim()
|
||||
|| this.createUniqueWorkflowId(workspace, baseWorkflow.id);
|
||||
const workflow = normalizeWorkflowDefinition({
|
||||
...baseWorkflow,
|
||||
id: workflowId,
|
||||
name: options?.name?.trim() || baseWorkflow.name,
|
||||
description: options?.description?.trim() ?? baseWorkflow.description,
|
||||
createdAt: nowIso(),
|
||||
updatedAt: nowIso(),
|
||||
});
|
||||
|
||||
if (!options?.save) {
|
||||
return { workflow };
|
||||
}
|
||||
|
||||
const savedWorkspace = await this.saveWorkflow(workflow);
|
||||
return {
|
||||
workflow,
|
||||
workspace: savedWorkspace,
|
||||
};
|
||||
}
|
||||
|
||||
async setPatternFavorite(patternId: string, isFavorite: boolean): Promise<WorkspaceState> {
|
||||
const workspace = await this.loadWorkspace();
|
||||
const pattern = this.requirePattern(workspace, patternId);
|
||||
@@ -2250,6 +2374,15 @@ export class AryxAppService extends EventEmitter<AppServiceEvents> {
|
||||
return pattern;
|
||||
}
|
||||
|
||||
private requireWorkflowTemplate(workspace: WorkspaceState, templateId: string): WorkflowTemplateDefinition {
|
||||
const template = workspace.workflowTemplates.find((current) => current.id === templateId);
|
||||
if (!template) {
|
||||
throw new Error(`Workflow template "${templateId}" was not found.`);
|
||||
}
|
||||
|
||||
return template;
|
||||
}
|
||||
|
||||
private requireWorkflow(workspace: WorkspaceState, workflowId: string): WorkflowDefinition {
|
||||
const workflow = workspace.workflows.find((current) => current.id === workflowId);
|
||||
if (!workflow) {
|
||||
@@ -2259,6 +2392,31 @@ export class AryxAppService extends EventEmitter<AppServiceEvents> {
|
||||
return workflow;
|
||||
}
|
||||
|
||||
private createUniqueWorkflowId(workspace: WorkspaceState, sourceId: string): string {
|
||||
const normalizedSourceId = this.normalizeIdentifier(sourceId, 'workflow');
|
||||
const existingIds = new Set(workspace.workflows.map((workflow) => workflow.id));
|
||||
if (!existingIds.has(normalizedSourceId)) {
|
||||
return normalizedSourceId;
|
||||
}
|
||||
|
||||
let suffix = 2;
|
||||
while (existingIds.has(`${normalizedSourceId}-${suffix}`)) {
|
||||
suffix += 1;
|
||||
}
|
||||
|
||||
return `${normalizedSourceId}-${suffix}`;
|
||||
}
|
||||
|
||||
private normalizeIdentifier(value: string, fallbackPrefix: string): string {
|
||||
const normalized = value
|
||||
.trim()
|
||||
.toLowerCase()
|
||||
.replace(/[^a-z0-9]+/g, '-')
|
||||
.replace(/^-+|-+$/g, '');
|
||||
|
||||
return normalized || createId(fallbackPrefix);
|
||||
}
|
||||
|
||||
private resolveSessionExecutionDefinition(
|
||||
workspace: WorkspaceState,
|
||||
session: SessionRecord,
|
||||
|
||||
@@ -5,7 +5,9 @@ import { ipcChannels } from '@shared/contracts/channels';
|
||||
import type {
|
||||
BranchSessionInput,
|
||||
CancelSessionTurnInput,
|
||||
CommitProjectGitChangesInput,
|
||||
CreateSessionInput,
|
||||
CreateWorkflowFromTemplateInput,
|
||||
CreateWorkflowSessionInput,
|
||||
CreateProjectGitBranchInput,
|
||||
DismissSessionMcpAuthInput,
|
||||
@@ -14,13 +16,15 @@ import type {
|
||||
DeleteSessionInput,
|
||||
DiscardSessionRunGitChangesInput,
|
||||
EditAndResendSessionMessageInput,
|
||||
CommitProjectGitChangesInput,
|
||||
ExportWorkflowInput,
|
||||
ImportWorkflowInput,
|
||||
ProjectGitDetailsInput,
|
||||
ProjectGitFilePreviewInput,
|
||||
ProjectGitFileSelectionInput,
|
||||
ProjectGitInput,
|
||||
PullProjectGitInput,
|
||||
RegenerateSessionMessageInput,
|
||||
ResolveWorkspaceDiscoveredToolingInput,
|
||||
StartSessionMcpAuthInput,
|
||||
SuggestProjectGitCommitMessageInput,
|
||||
SwitchProjectGitBranchInput,
|
||||
@@ -31,11 +35,11 @@ import type {
|
||||
ResolveProjectDiscoveredToolingInput,
|
||||
ResolveSessionApprovalInput,
|
||||
ResolveSessionUserInputInput,
|
||||
ResolveWorkspaceDiscoveredToolingInput,
|
||||
SaveLspProfileInput,
|
||||
SaveMcpServerInput,
|
||||
SavePatternInput,
|
||||
SaveWorkflowInput,
|
||||
SaveWorkflowTemplateInput,
|
||||
SaveWorkspaceAgentInput,
|
||||
SendSessionMessageInput,
|
||||
SetPatternFavoriteInput,
|
||||
@@ -49,6 +53,7 @@ import type {
|
||||
UpdateSessionModelConfigInput,
|
||||
UpdateSessionApprovalSettingsInput,
|
||||
UpdateSessionToolingInput,
|
||||
UpgradePatternToWorkflowInput,
|
||||
} from '@shared/contracts/ipc';
|
||||
import type { QuerySessionsInput } from '@shared/domain/sessionLibrary';
|
||||
import type { AppearanceTheme } from '@shared/domain/tooling';
|
||||
@@ -115,10 +120,25 @@ export function registerIpcHandlers(
|
||||
service.setPatternFavorite(input.patternId, input.isFavorite),
|
||||
);
|
||||
ipcMain.handle(ipcChannels.saveWorkflow, (_event, input: SaveWorkflowInput) => service.saveWorkflow(input.workflow));
|
||||
ipcMain.handle(ipcChannels.saveWorkflowTemplate, (_event, input: SaveWorkflowTemplateInput) =>
|
||||
service.saveWorkflowTemplate(input.workflowId, input.options),
|
||||
);
|
||||
ipcMain.handle(ipcChannels.deleteWorkflow, (_event, workflowId: string) => service.deleteWorkflow(workflowId));
|
||||
ipcMain.handle(ipcChannels.listWorkflowReferences, (_event, workflowId: string) =>
|
||||
service.listWorkflowReferences(workflowId),
|
||||
);
|
||||
ipcMain.handle(ipcChannels.createWorkflowFromTemplate, (_event, input: CreateWorkflowFromTemplateInput) =>
|
||||
service.createWorkflowFromTemplate(input.templateId, input.options),
|
||||
);
|
||||
ipcMain.handle(ipcChannels.exportWorkflow, (_event, input: ExportWorkflowInput) =>
|
||||
service.exportWorkflow(input.workflowId, input.format),
|
||||
);
|
||||
ipcMain.handle(ipcChannels.importWorkflow, (_event, input: ImportWorkflowInput) =>
|
||||
service.importWorkflow(input.content, input.format, input.options),
|
||||
);
|
||||
ipcMain.handle(ipcChannels.upgradePatternToWorkflow, (_event, input: UpgradePatternToWorkflowInput) =>
|
||||
service.upgradePatternToWorkflow(input.patternId, input.options),
|
||||
);
|
||||
ipcMain.handle(ipcChannels.setTheme, async (_event, theme: AppearanceTheme) => {
|
||||
const result = await service.setTheme(theme);
|
||||
applyTitleBarTheme(window, theme);
|
||||
|
||||
@@ -15,6 +15,11 @@ import {
|
||||
normalizeSessionToolingSelection,
|
||||
normalizeWorkspaceSettings,
|
||||
} from '@shared/domain/tooling';
|
||||
import {
|
||||
createBuiltinWorkflowTemplates,
|
||||
normalizeWorkflowTemplateDefinition,
|
||||
type WorkflowTemplateDefinition,
|
||||
} from '@shared/domain/workflowTemplate';
|
||||
import { normalizeWorkflowDefinition } from '@shared/domain/workflow';
|
||||
import {
|
||||
applyDefaultToolApprovalPolicy,
|
||||
@@ -58,6 +63,16 @@ function mergePatterns(existingPatterns: PatternDefinition[], deletedBuiltinIds:
|
||||
return [...mergedBuiltins, ...customPatterns];
|
||||
}
|
||||
|
||||
function mergeWorkflowTemplates(existingTemplates: WorkflowTemplateDefinition[]): WorkflowTemplateDefinition[] {
|
||||
const builtinTemplates = createBuiltinWorkflowTemplates(nowIso());
|
||||
const builtinIds = new Set(builtinTemplates.map((template) => template.id));
|
||||
const customTemplates = existingTemplates
|
||||
.map(normalizeWorkflowTemplateDefinition)
|
||||
.filter((template) => template.source !== 'builtin' && !builtinIds.has(template.id));
|
||||
|
||||
return [...builtinTemplates, ...customTemplates];
|
||||
}
|
||||
|
||||
export class WorkspaceRepository {
|
||||
readonly filePath = getWorkspaceFilePath();
|
||||
readonly scratchpadPath = getScratchpadDirectoryPath();
|
||||
@@ -122,6 +137,7 @@ export class WorkspaceRepository {
|
||||
graph: resolvePatternGraph(pattern),
|
||||
})),
|
||||
workflows: (stored.workflows ?? []).map(normalizeWorkflowDefinition),
|
||||
workflowTemplates: mergeWorkflowTemplates(stored.workflowTemplates ?? []),
|
||||
projects,
|
||||
sessions,
|
||||
settings,
|
||||
|
||||
Reference in new issue
Block a user