Skip to content

fix(workflow-executor): use last step from history (orchestrator as source of truth) #1582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Scra3 wants to merge 2 commits into from
Closed

fix(workflow-executor): use last step from history (orchestrator as source of truth) #1582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
784eba6
fix(workflow-executor): use last step from history instead of finding…
May 18, 2026
efc8559
fix(workflow-executor): return null when last step is done (completed…
May 18, 2026
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
2 changes: 1 addition & 1 deletion packages/workflow-executor/src/adapters/forest-server-workflow-port.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ export default class ForestServerWorkflowPort implements WorkflowPort {
run: ServerHydratedWorkflowRun,
err: WorkflowExecutorError,
): MalformedRunInfo {
const pending = run.workflowHistory.find(s => !s.done && !s.cancelled && !s.context?.error);
const pending = run.workflowHistory.at(-1) ?? null;

return {
runId: String(run.id),
Expand Down
4 changes: 2 additions & 2 deletions packages/workflow-executor/src/adapters/run-to-available-step-mapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ export default function toAvailableStepExecution(
);
}

const pending = run.workflowHistory.find(s => !s.done && !s.cancelled && !s.context?.error);
if (!pending) return null;
const pending = run.workflowHistory.at(-1) ?? null;
if (!pending || pending.done) return null;

const result = {
runId: String(run.id),
Expand Down
65 changes: 8 additions & 57 deletions packages/workflow-executor/test/adapters/run-to-available-step-mapper.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,41 +94,18 @@ describe('toAvailableStepExecution', () => {
expect(result?.baseRecordRef.recordId).toEqual(['rec-abc']);
});

it('should return null when all steps are done', () => {
const run = makeRun({
workflowHistory: [
makeStepHistory({ stepIndex: 0, done: true }),
makeStepHistory({ stepIndex: 1, done: true }),
],
});

expect(toAvailableStepExecution(run)).toBeNull();
});

it('should return null when all steps are done or cancelled', () => {
const run = makeRun({
workflowHistory: [
makeStepHistory({ stepIndex: 0, done: true }),
makeStepHistory({ stepIndex: 1, done: false, cancelled: true }),
],
});

expect(toAvailableStepExecution(run)).toBeNull();
});

it('should return null when workflowHistory is empty', () => {
const run = makeRun({ workflowHistory: [] });

expect(toAvailableStepExecution(run)).toBeNull();
});

it('should pick the first non-done, non-cancelled step as pending', () => {
it('picks the last step — orchestrator is the source of truth for which step to execute', () => {
const run = makeRun({
workflowHistory: [
makeStepHistory({ stepName: 's0', stepIndex: 0, done: true }),
makeStepHistory({ stepName: 's1', stepIndex: 1, done: false, cancelled: true }),
makeStepHistory({ stepName: 's1', stepIndex: 1, done: true }),
makeStepHistory({ stepName: 's2', stepIndex: 2, done: false }),
makeStepHistory({ stepName: 's3', stepIndex: 3, done: false }),
],
});

Expand All @@ -138,33 +115,6 @@ describe('toAvailableStepExecution', () => {
expect(result?.stepIndex).toBe(2);
});

it('errored step (done:false + context.error) is skipped — next pending step is returned', () => {
// Scenario: back changed errored steps to done:false so the front can offer Continue/Revise.
// The executor must skip the errored step and pick the next pending one.
const run = makeRun({
workflowHistory: [
makeStepHistory({ stepName: 's0', stepIndex: 0, done: false, context: { error: 'boom' } }),
makeStepHistory({ stepName: 's1', stepIndex: 1, done: false }),
],
});

const result = toAvailableStepExecution(run);

expect(result?.stepId).toBe('s1');
expect(result?.stepIndex).toBe(1);
});

it('returns null when the only non-done step is errored', () => {
const run = makeRun({
workflowHistory: [
makeStepHistory({ stepIndex: 0, done: true }),
makeStepHistory({ stepIndex: 1, done: false, context: { error: 'failed' } }),
],
});

expect(toAvailableStepExecution(run)).toBeNull();
});

it('should strip unknown server keys (e.g. automaticExecution) from guidance step without throwing', () => {
const run = makeRun({
workflowHistory: [
Expand Down Expand Up @@ -404,18 +354,19 @@ describe('toAvailableStepExecution', () => {
});
});

it('should not include done steps that are after the available step', () => {
it('should not include the pending step itself in previousSteps', () => {
const run = makeRun({
workflowHistory: [
makeStepHistory({ stepName: 's0', stepIndex: 0, done: false }),
makeStepHistory({ stepName: 's1', stepIndex: 1, done: true }),
makeStepHistory({ stepName: 's0', stepIndex: 0, done: true }),
makeStepHistory({ stepName: 's1', stepIndex: 1, done: false }),
],
});

const result = toAvailableStepExecution(run);

expect(result?.stepId).toBe('s0');
expect(result?.previousSteps).toHaveLength(0);
expect(result?.stepId).toBe('s1');
expect(result?.previousSteps).toHaveLength(1);
expect(result?.previousSteps[0].stepOutcome.stepId).toBe('s0');
});

it.each([
Expand Down
Loading