Adds workflow icon metadata while preserving readable workflow names without built-in suffixes. - Store and validate compact plain-text workflow icons across core APIs, imports, exports, tools, and analytics. - Render Fusion marks for built-in workflows and custom text icons beside existing workflow labels on board, switcher, detail, and editor surfaces. - Update workflow editor creation/copy flows, docs, release notes, and tests for icon metadata and shorter built-in names. Files changed: .changeset/fn-7285-workflow-icons.md | 7 ++ docs/dashboard-guide.md | 12 +-- .../cli/skill/fusion/references/extension-tools.md | 2 + .../core/src/__tests__/builtin-workflows.test.ts | 8 +- packages/core/src/__tests__/db-migrate.test.ts | 7 +- .../core/src/__tests__/workflow-analytics.test.ts | 15 +-- .../__tests__/workflow-definition-store.test.ts | 31 ++++++ packages/core/src/builtin-workflows.ts | 20 ++-- packages/core/src/db.ts | 11 +- packages/core/src/index.ts | 4 + packages/core/src/store.ts | 24 ++++- packages/core/src/workflow-analytics.ts | 7 +- packages/core/src/workflow-definition-types.ts | 31 ++++++ packages/dashboard/app/api/legacy.ts | 2 + packages/dashboard/app/components/Board.tsx | 18 ++-- packages/dashboard/app/components/Column.tsx | 2 +- packages/dashboard/app/components/TaskCard.tsx | 7 +- .../dashboard/app/components/TaskDetailModal.tsx | 20 ++-- packages/dashboard/app/components/WorkflowIcon.css | 42 ++++++++ packages/dashboard/app/components/WorkflowIcon.tsx | 49 +++++++++ .../app/components/WorkflowNodeEditor.css | 32 ++++++ .../app/components/WorkflowNodeEditor.tsx | 113 ++++++++++++++++----- .../dashboard/app/components/WorkflowSwitcher.css | 9 ++ .../dashboard/app/components/WorkflowSwitcher.tsx | 15 ++- .../dashboard/app/components/WorktreeGroup.tsx | 2 +- .../app/components/__tests__/Board.test.tsx | 12 +-- .../app/components/__tests__/Lane.test.tsx | 6 +- .../__tests__/WorkflowNodeEditor.test.tsx | 57 +++++++++-- .../components/__tests__/WorkflowSwitcher.test.tsx | 68 ++++++++----- .../__tests__/board-mobile-initial-render.test.tsx | 2 +- .../__tests__/CommandCenter.test.tsx | 4 +- .../command-center/areas/WorkflowArea.tsx | 2 + .../areas/__tests__/WorkflowArea.test.tsx | 6 +- .../settings/sections/GeneralSection.tsx | 6 +- .../register-command-center-routes.test.ts | 2 +- .../__tests__/workflow-import-export.test.ts | 32 +++++- packages/dashboard/src/routes/board-workflows.ts | 6 +- .../src/routes/register-workflow-routes.ts | 32 +++++- packages/engine/src/__tests__/agent-tools.test.ts | 4 +- packages/engine/src/agent-tools.ts | 6 +- 40 files changed, 590 insertions(+), 145 deletions(-) Fusion-Task-Id: FN-7285 Fusion-Task-Lineage: 0fa689a2-f19d-4d1b-9a40-cc0b2181200a Co-authored-by: Fusion (runfusion.ai) <noreply@runfusion.ai>
343 lines
11 KiB
TypeScript
343 lines
11 KiB
TypeScript
import type { Database } from "./db.js";
|
|
import { BUILTIN_WORKFLOWS, getBuiltinWorkflow, isBuiltinWorkflowId } from "./builtin-workflows.js";
|
|
import { costFor, type CostResult, type ModelPricingOverrides } from "./model-pricing.js";
|
|
import type { TokenTotals } from "./token-analytics.js";
|
|
|
|
export interface WorkflowAnalyticsQuery {
|
|
/** ISO-8601 lower bound (inclusive). */
|
|
from?: string;
|
|
/** ISO-8601 upper bound (inclusive). */
|
|
to?: string;
|
|
/** Epoch ms "now" used only for pricing-staleness. */
|
|
now?: number;
|
|
/** User-managed pricing overrides that take precedence over the built-in baseline. */
|
|
pricingOverrides?: ModelPricingOverrides;
|
|
/** Workflow id used for tasks without an explicit task_workflow_selection row. */
|
|
defaultWorkflowId?: string;
|
|
}
|
|
|
|
export interface WorkflowMetricTotals {
|
|
tokens: TokenTotals;
|
|
cost: CostResult;
|
|
filesChanged: number;
|
|
tasksCompleted: number;
|
|
tasksInProgress: number;
|
|
tasksInReview: number;
|
|
}
|
|
|
|
export interface WorkflowSummary extends WorkflowMetricTotals {
|
|
workflowId: string;
|
|
workflowName: string;
|
|
workflowIcon?: string;
|
|
isBuiltin: boolean;
|
|
}
|
|
|
|
export interface WorkflowAnalytics {
|
|
from: string | null;
|
|
to: string | null;
|
|
totals: WorkflowMetricTotals;
|
|
workflows: WorkflowSummary[];
|
|
}
|
|
|
|
interface WorkflowNameRow {
|
|
id: string;
|
|
name: string | null;
|
|
icon: string | null;
|
|
}
|
|
|
|
interface TaskTokenRow {
|
|
workflowId: string;
|
|
inputTokens: number | null;
|
|
outputTokens: number | null;
|
|
cachedTokens: number | null;
|
|
cacheWriteTokens: number | null;
|
|
totalTokens: number | null;
|
|
modelProvider: string | null;
|
|
modelId: string | null;
|
|
}
|
|
|
|
interface CountByWorkflowRow {
|
|
workflowId: string;
|
|
count: number;
|
|
}
|
|
|
|
interface ModifiedFilesRow {
|
|
workflowId: string;
|
|
modifiedFiles: string | null;
|
|
}
|
|
|
|
function emptyTokenTotals(): TokenTotals {
|
|
return {
|
|
inputTokens: 0,
|
|
outputTokens: 0,
|
|
cachedTokens: 0,
|
|
cacheWriteTokens: 0,
|
|
totalTokens: 0,
|
|
nTasks: 0,
|
|
};
|
|
}
|
|
|
|
interface CostAccumulator {
|
|
usd: number;
|
|
anyPriced: boolean;
|
|
anyUnavailable: boolean;
|
|
anyStale: boolean;
|
|
}
|
|
|
|
function emptyCostAccumulator(): CostAccumulator {
|
|
return { usd: 0, anyPriced: false, anyUnavailable: false, anyStale: false };
|
|
}
|
|
|
|
function finalizeCost(acc: CostAccumulator): CostResult {
|
|
return {
|
|
usd: acc.anyPriced ? acc.usd : null,
|
|
unavailable: acc.anyUnavailable,
|
|
stale: acc.anyStale,
|
|
};
|
|
}
|
|
|
|
function addTokenRow(totals: TokenTotals, row: TaskTokenRow): void {
|
|
totals.inputTokens += row.inputTokens ?? 0;
|
|
totals.outputTokens += row.outputTokens ?? 0;
|
|
totals.cachedTokens += row.cachedTokens ?? 0;
|
|
totals.cacheWriteTokens += row.cacheWriteTokens ?? 0;
|
|
totals.totalTokens +=
|
|
row.totalTokens ??
|
|
(row.inputTokens ?? 0) +
|
|
(row.outputTokens ?? 0) +
|
|
(row.cachedTokens ?? 0) +
|
|
(row.cacheWriteTokens ?? 0);
|
|
totals.nTasks += 1;
|
|
}
|
|
|
|
function addRowCost(
|
|
acc: CostAccumulator,
|
|
row: TaskTokenRow,
|
|
now?: number,
|
|
pricingOverrides?: ModelPricingOverrides,
|
|
): void {
|
|
const result = costFor(
|
|
{
|
|
inputTokens: row.inputTokens ?? 0,
|
|
outputTokens: row.outputTokens ?? 0,
|
|
cachedTokens: row.cachedTokens ?? 0,
|
|
cacheWriteTokens: row.cacheWriteTokens ?? 0,
|
|
},
|
|
{ provider: row.modelProvider, model: row.modelId },
|
|
now,
|
|
pricingOverrides,
|
|
);
|
|
if (result.stale) acc.anyStale = true;
|
|
if (result.unavailable || result.usd === null) {
|
|
acc.anyUnavailable = true;
|
|
} else {
|
|
acc.usd += result.usd;
|
|
acc.anyPriced = true;
|
|
}
|
|
}
|
|
|
|
function emptyMetricTotals(): WorkflowMetricTotals {
|
|
return {
|
|
tokens: emptyTokenTotals(),
|
|
cost: { usd: null, unavailable: false, stale: false },
|
|
filesChanged: 0,
|
|
tasksCompleted: 0,
|
|
tasksInProgress: 0,
|
|
tasksInReview: 0,
|
|
};
|
|
}
|
|
|
|
function countModifiedFiles(value: string | null): number {
|
|
if (!value) return 0;
|
|
let files: unknown;
|
|
try {
|
|
files = JSON.parse(value);
|
|
} catch {
|
|
return 0;
|
|
}
|
|
if (!Array.isArray(files)) return 0;
|
|
let count = 0;
|
|
for (const file of files) {
|
|
if (typeof file === "string" && file.length > 0) count += 1;
|
|
}
|
|
return count;
|
|
}
|
|
|
|
function addRangeClauses(column: string, clauses: string[], params: string[], query: WorkflowAnalyticsQuery): void {
|
|
if (query.from !== undefined) {
|
|
clauses.push(`${column} >= ?`);
|
|
params.push(query.from);
|
|
}
|
|
if (query.to !== undefined) {
|
|
clauses.push(`${column} <= ?`);
|
|
params.push(query.to);
|
|
}
|
|
}
|
|
|
|
function resolveWorkflowName(db: Database, workflowId: string): { workflowName: string; workflowIcon?: string; isBuiltin: boolean } {
|
|
const builtin = getBuiltinWorkflow(workflowId) ?? BUILTIN_WORKFLOWS.find((workflow) => workflow.id === workflowId);
|
|
if (builtin) return { workflowName: builtin.name, isBuiltin: true };
|
|
const row = db.prepare("SELECT id, name, icon FROM workflows WHERE id = ?").get(workflowId) as WorkflowNameRow | undefined;
|
|
return {
|
|
workflowName: row?.name && row.name.length > 0 ? row.name : workflowId,
|
|
...(row?.icon && row.icon.length > 0 ? { workflowIcon: row.icon } : {}),
|
|
isBuiltin: isBuiltinWorkflowId(workflowId),
|
|
};
|
|
}
|
|
|
|
function makeSummary(db: Database, workflowId: string): WorkflowSummary {
|
|
const resolved = resolveWorkflowName(db, workflowId);
|
|
return {
|
|
workflowId,
|
|
...resolved,
|
|
...emptyMetricTotals(),
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Aggregate store-derived per-workflow Command Center metrics over a date range.
|
|
*
|
|
* FNXC:CommandCenter 2026-06-27-12:00:
|
|
* Per-workflow analytics derive from tasks ⨝ task_workflow_selection, with the project default workflow backfilling unselected tasks. The HTTP layer passes an already project-scoped Database handle, so this pure read-only aggregator adds observability for custom workflows without introducing schema or cross-project reads.
|
|
*/
|
|
export function aggregateWorkflowAnalytics(
|
|
db: Database,
|
|
query: WorkflowAnalyticsQuery = {},
|
|
): WorkflowAnalytics {
|
|
const defaultWorkflowId = query.defaultWorkflowId ?? "builtin:coding";
|
|
const summaries = new Map<string, WorkflowSummary>();
|
|
const costAccumulators = new Map<string, CostAccumulator>();
|
|
const totalTokens = emptyTokenTotals();
|
|
const totalCost = emptyCostAccumulator();
|
|
const pricingOverrides = query.pricingOverrides;
|
|
|
|
const ensureSummary = (workflowId: string): WorkflowSummary => {
|
|
const existing = summaries.get(workflowId);
|
|
if (existing) return existing;
|
|
const created = makeSummary(db, workflowId);
|
|
summaries.set(workflowId, created);
|
|
costAccumulators.set(workflowId, emptyCostAccumulator());
|
|
return created;
|
|
};
|
|
|
|
const workflowExpr = "COALESCE(NULLIF(s.workflowId, ''), ?)";
|
|
|
|
const tokenClauses = ["t.tokenUsageLastUsedAt IS NOT NULL"];
|
|
const tokenParams: string[] = [defaultWorkflowId];
|
|
addRangeClauses("t.tokenUsageLastUsedAt", tokenClauses, tokenParams, query);
|
|
const tokenRows = db
|
|
.prepare(
|
|
`SELECT
|
|
${workflowExpr} AS workflowId,
|
|
t.tokenUsageInputTokens AS inputTokens,
|
|
t.tokenUsageOutputTokens AS outputTokens,
|
|
t.tokenUsageCachedTokens AS cachedTokens,
|
|
t.tokenUsageCacheWriteTokens AS cacheWriteTokens,
|
|
t.tokenUsageTotalTokens AS totalTokens,
|
|
t.modelProvider,
|
|
t.modelId
|
|
FROM tasks t
|
|
LEFT JOIN task_workflow_selection s ON s.taskId = t.id
|
|
WHERE ${tokenClauses.join(" AND ")}`,
|
|
)
|
|
.all(...tokenParams) as TaskTokenRow[];
|
|
|
|
for (const row of tokenRows) {
|
|
const summary = ensureSummary(row.workflowId);
|
|
const workflowCost = costAccumulators.get(row.workflowId) ?? emptyCostAccumulator();
|
|
costAccumulators.set(row.workflowId, workflowCost);
|
|
addTokenRow(summary.tokens, row);
|
|
addTokenRow(totalTokens, row);
|
|
addRowCost(workflowCost, row, query.now, pricingOverrides);
|
|
addRowCost(totalCost, row, query.now, pricingOverrides);
|
|
}
|
|
|
|
const completedClauses = [`t."column" = 'done'`, "t.columnMovedAt IS NOT NULL"];
|
|
const completedParams: string[] = [defaultWorkflowId];
|
|
addRangeClauses("t.columnMovedAt", completedClauses, completedParams, query);
|
|
const completedRows = db
|
|
.prepare(
|
|
`SELECT ${workflowExpr} AS workflowId, COUNT(*) AS count
|
|
FROM tasks t
|
|
LEFT JOIN task_workflow_selection s ON s.taskId = t.id
|
|
WHERE ${completedClauses.join(" AND ")}
|
|
GROUP BY workflowId`,
|
|
)
|
|
.all(...completedParams) as CountByWorkflowRow[];
|
|
for (const row of completedRows) {
|
|
ensureSummary(row.workflowId).tasksCompleted = row.count;
|
|
}
|
|
|
|
const currentClauses = [`t."column" IN ('in-progress', 'in-review')`];
|
|
const currentParams: string[] = [defaultWorkflowId];
|
|
/*
|
|
* FNXC:CommandCenter 2026-06-27-17:45:
|
|
* The Workflows tab describes all task counts as range-scoped analytics. Count active workflow tasks only when their current column transition (or updatedAt fallback for legacy rows) falls inside the selected range so stale in-progress/review tasks do not suppress the empty state for unrelated windows.
|
|
*/
|
|
addRangeClauses("COALESCE(t.columnMovedAt, t.updatedAt)", currentClauses, currentParams, query);
|
|
const currentRows = db
|
|
.prepare(
|
|
`SELECT ${workflowExpr} AS workflowId, t."column" AS columnName, COUNT(*) AS count
|
|
FROM tasks t
|
|
LEFT JOIN task_workflow_selection s ON s.taskId = t.id
|
|
WHERE ${currentClauses.join(" AND ")}
|
|
GROUP BY workflowId, t."column"`,
|
|
)
|
|
.all(...currentParams) as Array<CountByWorkflowRow & { columnName: string }>;
|
|
for (const row of currentRows) {
|
|
const summary = ensureSummary(row.workflowId);
|
|
if (row.columnName === "in-progress") summary.tasksInProgress = row.count;
|
|
if (row.columnName === "in-review") summary.tasksInReview = row.count;
|
|
}
|
|
|
|
const filesClauses = ["t.modifiedFiles IS NOT NULL", "t.modifiedFiles NOT IN ('', '[]')"];
|
|
const filesParams: string[] = [defaultWorkflowId];
|
|
addRangeClauses("t.updatedAt", filesClauses, filesParams, query);
|
|
const fileRows = db
|
|
.prepare(
|
|
`SELECT ${workflowExpr} AS workflowId, t.modifiedFiles
|
|
FROM tasks t
|
|
LEFT JOIN task_workflow_selection s ON s.taskId = t.id
|
|
WHERE ${filesClauses.join(" AND ")}`,
|
|
)
|
|
.all(...filesParams) as ModifiedFilesRow[];
|
|
for (const row of fileRows) {
|
|
ensureSummary(row.workflowId).filesChanged += countModifiedFiles(row.modifiedFiles);
|
|
}
|
|
|
|
for (const [workflowId, summary] of summaries) {
|
|
summary.cost = finalizeCost(costAccumulators.get(workflowId) ?? emptyCostAccumulator());
|
|
}
|
|
|
|
let filesChanged = 0;
|
|
let tasksCompleted = 0;
|
|
let tasksInProgress = 0;
|
|
let tasksInReview = 0;
|
|
for (const summary of summaries.values()) {
|
|
filesChanged += summary.filesChanged;
|
|
tasksCompleted += summary.tasksCompleted;
|
|
tasksInProgress += summary.tasksInProgress;
|
|
tasksInReview += summary.tasksInReview;
|
|
}
|
|
|
|
const sortedWorkflows = [...summaries.values()].sort((a, b) => {
|
|
const tokenCmp = b.tokens.totalTokens - a.tokens.totalTokens;
|
|
if (tokenCmp !== 0) return tokenCmp;
|
|
return a.workflowId.localeCompare(b.workflowId);
|
|
});
|
|
|
|
return {
|
|
from: query.from ?? null,
|
|
to: query.to ?? null,
|
|
totals: {
|
|
tokens: totalTokens,
|
|
cost: finalizeCost(totalCost),
|
|
filesChanged,
|
|
tasksCompleted,
|
|
tasksInProgress,
|
|
tasksInReview,
|
|
},
|
|
workflows: sortedWorkflows,
|
|
};
|
|
}
|