@agent-relay/sdk 3.2.9 → 3.2.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/agent-relay-broker-darwin-arm64 +0 -0
- package/bin/agent-relay-broker-darwin-x64 +0 -0
- package/bin/agent-relay-broker-linux-arm64 +0 -0
- package/bin/agent-relay-broker-linux-x64 +0 -0
- package/dist/cli-registry.d.ts +42 -0
- package/dist/cli-registry.d.ts.map +1 -0
- package/dist/cli-registry.js +126 -0
- package/dist/cli-registry.js.map +1 -0
- package/dist/cli-resolver.d.ts +30 -0
- package/dist/cli-resolver.d.ts.map +1 -0
- package/dist/cli-resolver.js +132 -0
- package/dist/cli-resolver.js.map +1 -0
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/spawn-from-env.d.ts.map +1 -1
- package/dist/spawn-from-env.js +6 -15
- package/dist/spawn-from-env.js.map +1 -1
- package/dist/workflows/__tests__/cli-session-collector.test.d.ts +2 -0
- package/dist/workflows/__tests__/cli-session-collector.test.d.ts.map +1 -0
- package/dist/workflows/__tests__/cli-session-collector.test.js +54 -0
- package/dist/workflows/__tests__/cli-session-collector.test.js.map +1 -0
- package/dist/workflows/__tests__/collectors/claude.test.d.ts +2 -0
- package/dist/workflows/__tests__/collectors/claude.test.d.ts.map +1 -0
- package/dist/workflows/__tests__/collectors/claude.test.js +85 -0
- package/dist/workflows/__tests__/collectors/claude.test.js.map +1 -0
- package/dist/workflows/__tests__/collectors/codex.test.d.ts +2 -0
- package/dist/workflows/__tests__/collectors/codex.test.d.ts.map +1 -0
- package/dist/workflows/__tests__/collectors/codex.test.js +67 -0
- package/dist/workflows/__tests__/collectors/codex.test.js.map +1 -0
- package/dist/workflows/__tests__/collectors/opencode.test.d.ts +2 -0
- package/dist/workflows/__tests__/collectors/opencode.test.d.ts.map +1 -0
- package/dist/workflows/__tests__/collectors/opencode.test.js +119 -0
- package/dist/workflows/__tests__/collectors/opencode.test.js.map +1 -0
- package/dist/workflows/__tests__/run-summary-table.test.d.ts +2 -0
- package/dist/workflows/__tests__/run-summary-table.test.d.ts.map +1 -0
- package/dist/workflows/__tests__/run-summary-table.test.js +130 -0
- package/dist/workflows/__tests__/run-summary-table.test.js.map +1 -0
- package/dist/workflows/__tests__/step-cwd.test.d.ts +2 -0
- package/dist/workflows/__tests__/step-cwd.test.d.ts.map +1 -0
- package/dist/workflows/__tests__/step-cwd.test.js +42 -0
- package/dist/workflows/__tests__/step-cwd.test.js.map +1 -0
- package/dist/workflows/builder.d.ts +7 -0
- package/dist/workflows/builder.d.ts.map +1 -1
- package/dist/workflows/builder.js +40 -5
- package/dist/workflows/builder.js.map +1 -1
- package/dist/workflows/cli-session-collector.d.ts +39 -0
- package/dist/workflows/cli-session-collector.d.ts.map +1 -0
- package/dist/workflows/cli-session-collector.js +23 -0
- package/dist/workflows/cli-session-collector.js.map +1 -0
- package/dist/workflows/cli.js +228 -48
- package/dist/workflows/cli.js.map +1 -1
- package/dist/workflows/collectors/claude.d.ts +6 -0
- package/dist/workflows/collectors/claude.d.ts.map +1 -0
- package/dist/workflows/collectors/claude.js +330 -0
- package/dist/workflows/collectors/claude.js.map +1 -0
- package/dist/workflows/collectors/codex.d.ts +18 -0
- package/dist/workflows/collectors/codex.d.ts.map +1 -0
- package/dist/workflows/collectors/codex.js +265 -0
- package/dist/workflows/collectors/codex.js.map +1 -0
- package/dist/workflows/collectors/opencode.d.ts +6 -0
- package/dist/workflows/collectors/opencode.d.ts.map +1 -0
- package/dist/workflows/collectors/opencode.js +204 -0
- package/dist/workflows/collectors/opencode.js.map +1 -0
- package/dist/workflows/default-logger.d.ts +9 -0
- package/dist/workflows/default-logger.d.ts.map +1 -0
- package/dist/workflows/default-logger.js +104 -0
- package/dist/workflows/default-logger.js.map +1 -0
- package/dist/workflows/index.d.ts +4 -0
- package/dist/workflows/index.d.ts.map +1 -1
- package/dist/workflows/index.js +4 -0
- package/dist/workflows/index.js.map +1 -1
- package/dist/workflows/listr-renderer.d.ts +26 -0
- package/dist/workflows/listr-renderer.d.ts.map +1 -0
- package/dist/workflows/listr-renderer.js +232 -0
- package/dist/workflows/listr-renderer.js.map +1 -0
- package/dist/workflows/run-summary-table.d.ts +4 -0
- package/dist/workflows/run-summary-table.d.ts.map +1 -0
- package/dist/workflows/run-summary-table.js +98 -0
- package/dist/workflows/run-summary-table.js.map +1 -0
- package/dist/workflows/runner.d.ts +12 -1
- package/dist/workflows/runner.d.ts.map +1 -1
- package/dist/workflows/runner.js +107 -71
- package/dist/workflows/runner.js.map +1 -1
- package/dist/workflows/types.d.ts +2 -0
- package/dist/workflows/types.d.ts.map +1 -1
- package/dist/workflows/types.js.map +1 -1
- package/package.json +4 -2
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { afterEach, describe, expect, it } from 'vitest';
|
|
2
|
+
import { mkdtempSync, rmSync, writeFileSync } from 'node:fs';
|
|
3
|
+
import os from 'node:os';
|
|
4
|
+
import path from 'node:path';
|
|
5
|
+
import { DatabaseSync } from 'node:sqlite';
|
|
6
|
+
import { CodexCollector } from '../../collectors/codex.js';
|
|
7
|
+
const tempDirs = [];
|
|
8
|
+
function makeTempDir(prefix) {
|
|
9
|
+
const dir = mkdtempSync(path.join(os.tmpdir(), prefix));
|
|
10
|
+
tempDirs.push(dir);
|
|
11
|
+
return dir;
|
|
12
|
+
}
|
|
13
|
+
function createCodexFixture(tempDir, cwd, createdAtSeconds) {
|
|
14
|
+
const statePath = path.join(tempDir, 'state_5.sqlite');
|
|
15
|
+
const historyPath = path.join(tempDir, 'history.jsonl');
|
|
16
|
+
const db = new DatabaseSync(statePath);
|
|
17
|
+
db.exec(`
|
|
18
|
+
CREATE TABLE threads (
|
|
19
|
+
id TEXT PRIMARY KEY,
|
|
20
|
+
cwd TEXT,
|
|
21
|
+
model_provider TEXT,
|
|
22
|
+
tokens_used INTEGER,
|
|
23
|
+
created_at INTEGER,
|
|
24
|
+
updated_at INTEGER
|
|
25
|
+
);
|
|
26
|
+
CREATE TABLE logs (
|
|
27
|
+
thread_id TEXT,
|
|
28
|
+
ts INTEGER,
|
|
29
|
+
level TEXT,
|
|
30
|
+
message TEXT,
|
|
31
|
+
line INTEGER
|
|
32
|
+
);
|
|
33
|
+
`);
|
|
34
|
+
db.prepare('INSERT INTO threads (id, cwd, model_provider, tokens_used, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?)').run('thread-1', cwd, 'openai/gpt-5', 321, createdAtSeconds, createdAtSeconds + 3);
|
|
35
|
+
db.prepare('INSERT INTO logs (thread_id, ts, level, message, line) VALUES (?, ?, ?, ?, ?)').run('thread-1', createdAtSeconds + 1, 'error', 'Command failed: bad exit code', 12);
|
|
36
|
+
db.close();
|
|
37
|
+
writeFileSync(historyPath, `${JSON.stringify({ session_id: 'thread-1', ts: createdAtSeconds, text: 'history' })}\n`);
|
|
38
|
+
return { statePath, historyPath };
|
|
39
|
+
}
|
|
40
|
+
afterEach(() => {
|
|
41
|
+
while (tempDirs.length > 0) {
|
|
42
|
+
rmSync(tempDirs.pop(), { recursive: true, force: true });
|
|
43
|
+
}
|
|
44
|
+
});
|
|
45
|
+
describe('CodexCollector', () => {
|
|
46
|
+
it('matches by cwd and time window and extracts errors from logs', async () => {
|
|
47
|
+
const tempDir = makeTempDir('codex-fixture-');
|
|
48
|
+
const cwd = '/repo/codex-project';
|
|
49
|
+
const createdAtSeconds = 100;
|
|
50
|
+
const { statePath, historyPath } = createCodexFixture(tempDir, cwd, createdAtSeconds);
|
|
51
|
+
const collector = new CodexCollector({ statePath, historyPath });
|
|
52
|
+
const report = await collector.collect({
|
|
53
|
+
cli: 'codex',
|
|
54
|
+
cwd,
|
|
55
|
+
startedAt: 100_000,
|
|
56
|
+
completedAt: 105_000,
|
|
57
|
+
});
|
|
58
|
+
expect(report).not.toBeNull();
|
|
59
|
+
expect(report?.sessionId).toBe('thread-1');
|
|
60
|
+
expect(report?.provider).toBe('openai');
|
|
61
|
+
expect(report?.model).toBe('gpt-5');
|
|
62
|
+
expect(report?.tokens).toEqual({ input: 321, output: 0, cacheRead: 0 });
|
|
63
|
+
expect(report?.errors).toEqual([{ turn: 1, text: 'Command failed: bad exit code' }]);
|
|
64
|
+
expect(report?.finalStatus).toBe('failed');
|
|
65
|
+
});
|
|
66
|
+
});
|
|
67
|
+
//# sourceMappingURL=codex.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codex.test.js","sourceRoot":"","sources":["../../../../src/workflows/__tests__/collectors/codex.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"opencode.test.d.ts","sourceRoot":"","sources":["../../../../src/workflows/__tests__/collectors/opencode.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
import { afterEach, describe, expect, it, vi } from 'vitest';
|
|
2
|
+
import { mkdirSync, mkdtempSync, rmSync } from 'node:fs';
|
|
3
|
+
import os from 'node:os';
|
|
4
|
+
import path from 'node:path';
|
|
5
|
+
import { DatabaseSync } from 'node:sqlite';
|
|
6
|
+
const tempDirs = [];
|
|
7
|
+
const originalHome = process.env.HOME;
|
|
8
|
+
function makeTempDir(prefix) {
|
|
9
|
+
const dir = mkdtempSync(path.join(os.tmpdir(), prefix));
|
|
10
|
+
tempDirs.push(dir);
|
|
11
|
+
return dir;
|
|
12
|
+
}
|
|
13
|
+
function createOpenCodeFixture(homeDir, cwd, sessionCreatedAt) {
|
|
14
|
+
const dbDir = path.join(homeDir, '.local', 'share', 'opencode');
|
|
15
|
+
mkdirSync(dbDir, { recursive: true });
|
|
16
|
+
const dbPath = path.join(dbDir, 'opencode.db');
|
|
17
|
+
const db = new DatabaseSync(dbPath);
|
|
18
|
+
db.exec(`
|
|
19
|
+
CREATE TABLE session (id TEXT PRIMARY KEY, directory TEXT, time_created INTEGER);
|
|
20
|
+
CREATE TABLE message (id TEXT PRIMARY KEY, session_id TEXT, time_created INTEGER, data TEXT);
|
|
21
|
+
CREATE TABLE part (id TEXT PRIMARY KEY, message_id TEXT, session_id TEXT, time_created INTEGER, data TEXT);
|
|
22
|
+
`);
|
|
23
|
+
const insertSession = db.prepare('INSERT INTO session (id, directory, time_created) VALUES (?, ?, ?)');
|
|
24
|
+
const insertMessage = db.prepare('INSERT INTO message (id, session_id, time_created, data) VALUES (?, ?, ?, ?)');
|
|
25
|
+
const insertPart = db.prepare('INSERT INTO part (id, message_id, session_id, time_created, data) VALUES (?, ?, ?, ?, ?)');
|
|
26
|
+
insertSession.run('session-1', cwd, sessionCreatedAt);
|
|
27
|
+
insertSession.run('session-2', '/other/project', sessionCreatedAt + 1000);
|
|
28
|
+
insertMessage.run('msg-1', 'session-1', sessionCreatedAt + 10, JSON.stringify({ role: 'user', tokens: { input: 10, output: 0, cache: { read: 1 } } }));
|
|
29
|
+
insertMessage.run('msg-2', 'session-1', sessionCreatedAt + 20, JSON.stringify({
|
|
30
|
+
role: 'assistant',
|
|
31
|
+
modelID: 'gpt-5',
|
|
32
|
+
providerID: 'openai',
|
|
33
|
+
finish: 'error',
|
|
34
|
+
cost: 1.25,
|
|
35
|
+
tokens: { input: 15, output: 20, cache: { read: 4 } },
|
|
36
|
+
}));
|
|
37
|
+
insertMessage.run('msg-other', 'session-2', sessionCreatedAt + 30, JSON.stringify({ role: 'assistant', modelID: 'ignore-me', providerID: 'other', finish: 'completed' }));
|
|
38
|
+
insertPart.run('part-1', 'msg-1', 'session-1', sessionCreatedAt + 11, JSON.stringify({ type: 'text', text: 'Planning work' }));
|
|
39
|
+
insertPart.run('part-2', 'msg-2', 'session-1', sessionCreatedAt + 21, JSON.stringify({ type: 'tool_call', name: 'write_file' }));
|
|
40
|
+
insertPart.run('part-3', 'msg-2', 'session-1', sessionCreatedAt + 22, JSON.stringify({ type: 'text', text: 'Error: database locked\nCleanup afterwards' }));
|
|
41
|
+
insertPart.run('part-4', 'msg-2', 'session-1', sessionCreatedAt + 23, JSON.stringify({ type: 'text', text: 'Completed summary output' }));
|
|
42
|
+
db.close();
|
|
43
|
+
return dbPath;
|
|
44
|
+
}
|
|
45
|
+
async function importCollectorWithHome(homeDir) {
|
|
46
|
+
process.env.HOME = homeDir;
|
|
47
|
+
vi.resetModules();
|
|
48
|
+
vi.doMock('node:module', () => ({
|
|
49
|
+
createRequire: () => (id) => {
|
|
50
|
+
if (id !== 'better-sqlite3') {
|
|
51
|
+
throw new Error(`Unexpected module request: ${id}`);
|
|
52
|
+
}
|
|
53
|
+
return class BetterSqliteCompat {
|
|
54
|
+
db;
|
|
55
|
+
constructor(filename) {
|
|
56
|
+
this.db = new DatabaseSync(filename, { open: true, readOnly: true });
|
|
57
|
+
}
|
|
58
|
+
prepare(sql) {
|
|
59
|
+
const statement = this.db.prepare(sql);
|
|
60
|
+
return {
|
|
61
|
+
get(params) {
|
|
62
|
+
return statement.get(params);
|
|
63
|
+
},
|
|
64
|
+
all(params) {
|
|
65
|
+
return statement.all(params);
|
|
66
|
+
},
|
|
67
|
+
};
|
|
68
|
+
}
|
|
69
|
+
pragma(_source) {
|
|
70
|
+
return undefined;
|
|
71
|
+
}
|
|
72
|
+
close() {
|
|
73
|
+
this.db.close();
|
|
74
|
+
}
|
|
75
|
+
};
|
|
76
|
+
},
|
|
77
|
+
}));
|
|
78
|
+
const module = await import('../../collectors/opencode.js');
|
|
79
|
+
return module.OpenCodeCollector;
|
|
80
|
+
}
|
|
81
|
+
afterEach(() => {
|
|
82
|
+
vi.resetModules();
|
|
83
|
+
process.env.HOME = originalHome;
|
|
84
|
+
while (tempDirs.length > 0) {
|
|
85
|
+
rmSync(tempDirs.pop(), { recursive: true, force: true });
|
|
86
|
+
}
|
|
87
|
+
});
|
|
88
|
+
describe('OpenCodeCollector', () => {
|
|
89
|
+
it('matches by directory and time window, aggregates tokens, and extracts errors', async () => {
|
|
90
|
+
const homeDir = makeTempDir('opencode-home-');
|
|
91
|
+
const cwd = path.join(homeDir, 'workspace');
|
|
92
|
+
const sessionCreatedAt = 10_000;
|
|
93
|
+
createOpenCodeFixture(homeDir, cwd, sessionCreatedAt);
|
|
94
|
+
const OpenCodeCollector = await importCollectorWithHome(homeDir);
|
|
95
|
+
const collector = new OpenCodeCollector();
|
|
96
|
+
const report = await collector.collect({
|
|
97
|
+
cli: 'opencode',
|
|
98
|
+
cwd,
|
|
99
|
+
startedAt: sessionCreatedAt + 100,
|
|
100
|
+
completedAt: sessionCreatedAt + 500,
|
|
101
|
+
});
|
|
102
|
+
expect(report).not.toBeNull();
|
|
103
|
+
expect(report?.sessionId).toBe('session-1');
|
|
104
|
+
expect(report?.model).toBe('gpt-5');
|
|
105
|
+
expect(report?.provider).toBe('openai');
|
|
106
|
+
expect(report?.tokens).toEqual({ input: 25, output: 20, cacheRead: 5 });
|
|
107
|
+
expect(report?.cost).toBe(1.25);
|
|
108
|
+
expect(report?.toolCalls).toEqual([{ name: 'write_file', count: 1 }]);
|
|
109
|
+
expect(report?.errors).toEqual([{ turn: 3, text: 'Error: database locked' }]);
|
|
110
|
+
expect(report?.finalStatus).toBe('failed');
|
|
111
|
+
expect(report?.summary).toBe('Completed summary output');
|
|
112
|
+
});
|
|
113
|
+
it('returns false from canCollect when the database is missing', async () => {
|
|
114
|
+
const homeDir = makeTempDir('opencode-missing-home-');
|
|
115
|
+
const OpenCodeCollector = await importCollectorWithHome(homeDir);
|
|
116
|
+
expect(new OpenCodeCollector().canCollect()).toBe(false);
|
|
117
|
+
});
|
|
118
|
+
});
|
|
119
|
+
//# sourceMappingURL=opencode.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"opencode.test.js","sourceRoot":"","sources":["../../../../src/workflows/__tests__/collectors/opencode.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-summary-table.test.d.ts","sourceRoot":"","sources":["../../../src/workflows/__tests__/run-summary-table.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,130 @@
|
|
|
1
|
+
import { describe, expect, it, vi } from 'vitest';
|
|
2
|
+
import { formatRunSummaryTable } from '../run-summary-table.js';
|
|
3
|
+
vi.mock('@relaycast/sdk', () => ({
|
|
4
|
+
RelayCast: vi.fn(),
|
|
5
|
+
RelayError: class RelayError extends Error {
|
|
6
|
+
},
|
|
7
|
+
}));
|
|
8
|
+
vi.mock('../../relay.js', () => ({
|
|
9
|
+
AgentRelay: vi.fn(),
|
|
10
|
+
}));
|
|
11
|
+
const { WorkflowRunner } = await import('../runner.js');
|
|
12
|
+
describe('formatRunSummaryTable', () => {
|
|
13
|
+
it('renders all-passing steps', () => {
|
|
14
|
+
const output = formatRunSummaryTable([
|
|
15
|
+
{ name: 'plan', agent: 'lead', status: 'completed', attempts: 1, durationMs: 1_000 },
|
|
16
|
+
{ name: 'implement', agent: 'worker', status: 'completed', attempts: 1, durationMs: 2_000 },
|
|
17
|
+
], new Map([
|
|
18
|
+
[
|
|
19
|
+
'plan',
|
|
20
|
+
{
|
|
21
|
+
cli: 'claude',
|
|
22
|
+
sessionId: 's1',
|
|
23
|
+
model: 'claude-sonnet-4',
|
|
24
|
+
provider: 'anthropic',
|
|
25
|
+
durationMs: 1_200,
|
|
26
|
+
cost: 0.75,
|
|
27
|
+
tokens: { input: 100, output: 50, cacheRead: 10 },
|
|
28
|
+
turns: 2,
|
|
29
|
+
toolCalls: [],
|
|
30
|
+
errors: [],
|
|
31
|
+
finalStatus: 'completed',
|
|
32
|
+
summary: 'planned',
|
|
33
|
+
},
|
|
34
|
+
],
|
|
35
|
+
[
|
|
36
|
+
'implement',
|
|
37
|
+
{
|
|
38
|
+
cli: 'codex',
|
|
39
|
+
sessionId: 's2',
|
|
40
|
+
model: 'gpt-5',
|
|
41
|
+
provider: 'openai',
|
|
42
|
+
durationMs: 3_400,
|
|
43
|
+
cost: 1.25,
|
|
44
|
+
tokens: { input: 300, output: 90, cacheRead: 20 },
|
|
45
|
+
turns: 4,
|
|
46
|
+
toolCalls: [],
|
|
47
|
+
errors: [{ turn: 2, text: 'Error: recovered after retry' }],
|
|
48
|
+
finalStatus: 'completed',
|
|
49
|
+
summary: 'implemented',
|
|
50
|
+
},
|
|
51
|
+
],
|
|
52
|
+
]));
|
|
53
|
+
expect(output).toMatchInlineSnapshot(`
|
|
54
|
+
" Step Status Model Cost Tokens Duration Errors
|
|
55
|
+
plan pass claude-sonnet-4 $0.75 160 1s --
|
|
56
|
+
implement pass gpt-5 $1.25 410 3s 1 (fixed)
|
|
57
|
+
────────────────────────────────────────────────────────────────────────────────────────────
|
|
58
|
+
Total $2.00 570 5s "
|
|
59
|
+
`);
|
|
60
|
+
});
|
|
61
|
+
it('renders a failed step with the first error line', () => {
|
|
62
|
+
const output = formatRunSummaryTable([{ name: 'broken-step', agent: 'worker', status: 'failed', attempts: 1, durationMs: 1_500, error: 'boom' }], new Map([
|
|
63
|
+
[
|
|
64
|
+
'broken-step',
|
|
65
|
+
{
|
|
66
|
+
cli: 'opencode',
|
|
67
|
+
sessionId: 's3',
|
|
68
|
+
model: 'gpt-5',
|
|
69
|
+
provider: 'openai',
|
|
70
|
+
durationMs: 1_500,
|
|
71
|
+
cost: 0.01,
|
|
72
|
+
tokens: { input: 10, output: 5, cacheRead: 0 },
|
|
73
|
+
turns: 1,
|
|
74
|
+
toolCalls: [],
|
|
75
|
+
errors: [{ turn: 1, text: 'Error: database locked' }],
|
|
76
|
+
finalStatus: 'failed',
|
|
77
|
+
summary: null,
|
|
78
|
+
},
|
|
79
|
+
],
|
|
80
|
+
]));
|
|
81
|
+
expect(output).toContain('broken-step FAIL');
|
|
82
|
+
expect(output).toContain(' └─ Error [turn 1] Error: database locked');
|
|
83
|
+
});
|
|
84
|
+
it('renders deterministic steps without reports using placeholder columns', () => {
|
|
85
|
+
const output = formatRunSummaryTable([{ name: 'lint', agent: 'shell', status: 'completed', attempts: 1, durationMs: 900 }], new Map());
|
|
86
|
+
expect(output).toContain('lint pass --');
|
|
87
|
+
expect(output).toContain('--');
|
|
88
|
+
// No reports means no cost column
|
|
89
|
+
expect(output).not.toContain('Cost');
|
|
90
|
+
});
|
|
91
|
+
it('hides Cost column when no report has reliable cost data', () => {
|
|
92
|
+
const output = formatRunSummaryTable([
|
|
93
|
+
{ name: 'gen-code', agent: 'worker', status: 'completed', attempts: 1, durationMs: 5_000 },
|
|
94
|
+
], new Map([
|
|
95
|
+
[
|
|
96
|
+
'gen-code',
|
|
97
|
+
{
|
|
98
|
+
cli: 'claude',
|
|
99
|
+
sessionId: 's1',
|
|
100
|
+
model: 'claude-sonnet-4',
|
|
101
|
+
provider: 'anthropic',
|
|
102
|
+
durationMs: 5_000,
|
|
103
|
+
cost: null,
|
|
104
|
+
tokens: { input: 200, output: 80, cacheRead: 0 },
|
|
105
|
+
turns: 3,
|
|
106
|
+
toolCalls: [],
|
|
107
|
+
errors: [],
|
|
108
|
+
finalStatus: 'completed',
|
|
109
|
+
summary: 'done',
|
|
110
|
+
},
|
|
111
|
+
],
|
|
112
|
+
]));
|
|
113
|
+
expect(output).not.toContain('Cost');
|
|
114
|
+
expect(output).toContain('Tokens');
|
|
115
|
+
expect(output).toContain('280');
|
|
116
|
+
});
|
|
117
|
+
});
|
|
118
|
+
describe('WorkflowRunner logRunSummary', () => {
|
|
119
|
+
it('falls back to the legacy summary format when no reports exist', () => {
|
|
120
|
+
const runner = new WorkflowRunner({ cwd: '/tmp/workflow-runner' });
|
|
121
|
+
const logSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
|
|
122
|
+
runner.logRunSummary('sample-workflow', [{ name: 'lint', agent: 'shell', status: 'completed', attempts: 1, output: 'ok' }], 'run-1');
|
|
123
|
+
const combined = logSpy.mock.calls.flat().join('\n');
|
|
124
|
+
expect(combined).toContain('Workflow "sample-workflow"');
|
|
125
|
+
expect(combined).toContain('✓ lint [shell]');
|
|
126
|
+
expect(combined).not.toContain('Step Status');
|
|
127
|
+
logSpy.mockRestore();
|
|
128
|
+
});
|
|
129
|
+
});
|
|
130
|
+
//# sourceMappingURL=run-summary-table.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-summary-table.test.js","sourceRoot":"","sources":["../../../src/workflows/__tests__/run-summary-table.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"step-cwd.test.d.ts","sourceRoot":"","sources":["../../../src/workflows/__tests__/step-cwd.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import { describe, it, expect, vi } from 'vitest';
|
|
2
|
+
import path from 'node:path';
|
|
3
|
+
vi.mock('@relaycast/sdk', () => ({
|
|
4
|
+
RelayCast: vi.fn(),
|
|
5
|
+
RelayError: class RelayError extends Error {
|
|
6
|
+
},
|
|
7
|
+
}));
|
|
8
|
+
vi.mock('../../relay.js', () => ({
|
|
9
|
+
AgentRelay: vi.fn(),
|
|
10
|
+
}));
|
|
11
|
+
const { WorkflowRunner } = await import('../runner.js');
|
|
12
|
+
describe('WorkflowRunner step cwd resolution', () => {
|
|
13
|
+
it('prefers step.cwd over agent.cwd and runner cwd', () => {
|
|
14
|
+
const runnerRoot = '/runner-root';
|
|
15
|
+
const runner = new WorkflowRunner({ cwd: runnerRoot });
|
|
16
|
+
const resolved = runner.resolveEffectiveCwd({ name: 'generate', agent: 'worker', task: 'Generate', cwd: 'steps/generate' }, { name: 'worker', cli: 'claude', cwd: 'agents/worker' });
|
|
17
|
+
expect(resolved).toBe(path.resolve(runnerRoot, 'steps/generate'));
|
|
18
|
+
});
|
|
19
|
+
it('respects step.cwd for deterministic steps', () => {
|
|
20
|
+
const runnerRoot = '/runner-root';
|
|
21
|
+
const runner = new WorkflowRunner({ cwd: runnerRoot });
|
|
22
|
+
const resolved = runner.resolveEffectiveCwd({
|
|
23
|
+
name: 'scaffold',
|
|
24
|
+
type: 'deterministic',
|
|
25
|
+
command: 'mkdir -p out',
|
|
26
|
+
cwd: 'deterministic/setup',
|
|
27
|
+
});
|
|
28
|
+
expect(resolved).toBe(path.resolve(runnerRoot, 'deterministic/setup'));
|
|
29
|
+
});
|
|
30
|
+
it('falls back through step.cwd to step.workdir to agent.cwd to runner.cwd', () => {
|
|
31
|
+
const runnerRoot = '/runner-root';
|
|
32
|
+
const namedPath = '/named/workdir';
|
|
33
|
+
const runner = new WorkflowRunner({ cwd: runnerRoot });
|
|
34
|
+
runner.resolvedPaths.set('generated', namedPath);
|
|
35
|
+
const agentDef = { name: 'worker', cli: 'claude', cwd: 'agents/worker' };
|
|
36
|
+
expect(runner.resolveEffectiveCwd({ name: 's1', agent: 'worker', task: 'Do work', cwd: 'steps/explicit', workdir: 'generated' }, agentDef)).toBe(path.resolve(runnerRoot, 'steps/explicit'));
|
|
37
|
+
expect(runner.resolveEffectiveCwd({ name: 's2', agent: 'worker', task: 'Do work', workdir: 'generated' }, agentDef)).toBe(namedPath);
|
|
38
|
+
expect(runner.resolveEffectiveCwd({ name: 's3', agent: 'worker', task: 'Do work' }, agentDef)).toBe(path.resolve(runnerRoot, 'agents/worker'));
|
|
39
|
+
expect(runner.resolveEffectiveCwd({ name: 's4', type: 'deterministic', command: 'pwd' })).toBe(runnerRoot);
|
|
40
|
+
});
|
|
41
|
+
});
|
|
42
|
+
//# sourceMappingURL=step-cwd.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"step-cwd.test.js","sourceRoot":"","sources":["../../../src/workflows/__tests__/step-cwd.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { AgentRelayOptions } from '../relay.js';
|
|
2
2
|
import type { AgentCli, AgentPreset, CoordinationConfig, DryRunReport, IdleNudgeConfig, RelayYamlConfig, StateConfig, SwarmPattern, TrajectoryConfig, VerificationCheck, WorkflowRunRow } from './types.js';
|
|
3
3
|
import { type WorkflowEventListener, type VariableContext, type StepExecutor } from './runner.js';
|
|
4
|
+
import { type LogLevel } from './default-logger.js';
|
|
4
5
|
export interface AgentOptions {
|
|
5
6
|
cli: AgentCli;
|
|
6
7
|
role?: string;
|
|
@@ -22,6 +23,7 @@ export interface AgentOptions {
|
|
|
22
23
|
export interface AgentStepOptions {
|
|
23
24
|
agent: string;
|
|
24
25
|
task: string;
|
|
26
|
+
cwd?: string;
|
|
25
27
|
dependsOn?: string[];
|
|
26
28
|
verification?: VerificationCheck;
|
|
27
29
|
timeoutMs?: number;
|
|
@@ -31,6 +33,7 @@ export interface AgentStepOptions {
|
|
|
31
33
|
export interface DeterministicStepOptions {
|
|
32
34
|
type: 'deterministic';
|
|
33
35
|
command: string;
|
|
36
|
+
cwd?: string;
|
|
34
37
|
/** Capture stdout as step output for downstream steps. Default: true. */
|
|
35
38
|
captureOutput?: boolean;
|
|
36
39
|
/** Fail if command exit code is non-zero. Default: true. */
|
|
@@ -74,6 +77,10 @@ export interface WorkflowRunOptions {
|
|
|
74
77
|
startFrom?: string;
|
|
75
78
|
/** Previous run ID whose cached outputs are used with startFrom. */
|
|
76
79
|
previousRunId?: string;
|
|
80
|
+
/** Console log verbosity: "verbose" | "normal" (default) | "quiet" | false (silent). */
|
|
81
|
+
logLevel?: LogLevel;
|
|
82
|
+
/** Renderer: "listr" for listr2 UI, "default" for console logger, false to disable. */
|
|
83
|
+
renderer?: 'listr' | 'default' | false;
|
|
77
84
|
}
|
|
78
85
|
/**
|
|
79
86
|
* Fluent builder for constructing workflow configurations programmatically.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../src/workflows/builder.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,KAAK,EACV,QAAQ,EAER,WAAW,EAEX,kBAAkB,EAClB,YAAY,EAEZ,eAAe,EACf,eAAe,EACf,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,iBAAiB,EAGjB,cAAc,EAEf,MAAM,YAAY,CAAC;AACpB,OAAO,EAAkB,KAAK,qBAAqB,EAAE,KAAK,eAAe,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../src/workflows/builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { stringify as stringifyYaml } from 'yaml';
|
|
2
2
|
import { WorkflowRunner } from './runner.js';
|
|
3
3
|
import { formatDryRunReport } from './dry-run-format.js';
|
|
4
|
+
import { createDefaultEventLogger } from './default-logger.js';
|
|
4
5
|
// ── WorkflowBuilder ─────────────────────────────────────────────────────────
|
|
5
6
|
/**
|
|
6
7
|
* Fluent builder for constructing workflow configurations programmatically.
|
|
@@ -139,6 +140,8 @@ export class WorkflowBuilder {
|
|
|
139
140
|
}
|
|
140
141
|
step.type = 'deterministic';
|
|
141
142
|
step.command = options.command;
|
|
143
|
+
if (options.cwd !== undefined)
|
|
144
|
+
step.cwd = options.cwd;
|
|
142
145
|
if (options.captureOutput !== undefined)
|
|
143
146
|
step.captureOutput = options.captureOutput;
|
|
144
147
|
if (options.failOnError !== undefined)
|
|
@@ -175,6 +178,8 @@ export class WorkflowBuilder {
|
|
|
175
178
|
}
|
|
176
179
|
step.agent = agentOpts.agent;
|
|
177
180
|
step.task = agentOpts.task;
|
|
181
|
+
if (agentOpts.cwd !== undefined)
|
|
182
|
+
step.cwd = agentOpts.cwd;
|
|
178
183
|
if (agentOpts.dependsOn !== undefined)
|
|
179
184
|
step.dependsOn = agentOpts.dependsOn;
|
|
180
185
|
if (agentOpts.verification !== undefined)
|
|
@@ -230,8 +235,11 @@ export class WorkflowBuilder {
|
|
|
230
235
|
config.swarm.channel = this._channel;
|
|
231
236
|
if (this._idleNudge !== undefined)
|
|
232
237
|
config.swarm.idleNudge = this._idleNudge;
|
|
233
|
-
|
|
234
|
-
|
|
238
|
+
config.errorHandling = this._errorHandling ?? {
|
|
239
|
+
strategy: 'retry',
|
|
240
|
+
maxRetries: 2,
|
|
241
|
+
retryDelayMs: 10_000,
|
|
242
|
+
};
|
|
235
243
|
if (this._coordination !== undefined)
|
|
236
244
|
config.coordination = this._coordination;
|
|
237
245
|
if (this._state !== undefined)
|
|
@@ -258,19 +266,46 @@ export class WorkflowBuilder {
|
|
|
258
266
|
console.log(formatDryRunReport(report));
|
|
259
267
|
return report;
|
|
260
268
|
}
|
|
269
|
+
// Wire up default console logger unless explicitly disabled
|
|
270
|
+
// renderer: "listr" owns the terminal — skip console logger to avoid garbled output
|
|
271
|
+
// renderer: false implies no output at all
|
|
272
|
+
const logLevel = options.renderer === 'listr' || options.renderer === false
|
|
273
|
+
? false
|
|
274
|
+
: (options.logLevel ?? 'normal');
|
|
275
|
+
if (logLevel !== false) {
|
|
276
|
+
runner.on(createDefaultEventLogger(logLevel));
|
|
277
|
+
}
|
|
278
|
+
// Wire up user-provided event handler (additive — does not replace the default logger)
|
|
261
279
|
if (options.onEvent) {
|
|
262
280
|
runner.on(options.onEvent);
|
|
263
281
|
}
|
|
264
282
|
// Auto-detect RESUME_RUN_ID env var for resuming failed runs
|
|
265
283
|
const resumeRunId = process.env.RESUME_RUN_ID;
|
|
266
|
-
if (resumeRunId) {
|
|
267
|
-
return runner.resume(resumeRunId, options.vars);
|
|
268
|
-
}
|
|
269
284
|
const startFrom = this._startFrom ?? options.startFrom ?? process.env.START_FROM;
|
|
270
285
|
const previousRunId = this._previousRunId ?? options.previousRunId ?? process.env.PREVIOUS_RUN_ID;
|
|
271
286
|
const executeOptions = startFrom
|
|
272
287
|
? { startFrom, previousRunId }
|
|
273
288
|
: undefined;
|
|
289
|
+
// If listr renderer requested, wire it up and run concurrently
|
|
290
|
+
// Must be set up BEFORE the resume check so resume runs also get event output
|
|
291
|
+
if (options.renderer === 'listr') {
|
|
292
|
+
const { createWorkflowRenderer } = await import('./listr-renderer.js');
|
|
293
|
+
const renderer = createWorkflowRenderer();
|
|
294
|
+
runner.on(renderer.onEvent);
|
|
295
|
+
const runPromise = resumeRunId
|
|
296
|
+
? runner.resume(resumeRunId, options.vars)
|
|
297
|
+
: runner.execute(config, options.workflow, options.vars, executeOptions);
|
|
298
|
+
try {
|
|
299
|
+
const [result] = await Promise.all([runPromise, renderer.start()]);
|
|
300
|
+
return result;
|
|
301
|
+
}
|
|
302
|
+
finally {
|
|
303
|
+
renderer.unmount();
|
|
304
|
+
}
|
|
305
|
+
}
|
|
306
|
+
if (resumeRunId) {
|
|
307
|
+
return runner.resume(resumeRunId, options.vars);
|
|
308
|
+
}
|
|
274
309
|
return runner.execute(config, options.workflow, options.vars, executeOptions);
|
|
275
310
|
}
|
|
276
311
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/workflows/builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,IAAI,aAAa,EAAE,MAAM,MAAM,CAAC;AAsBlD,OAAO,EAAE,cAAc,EAAuE,MAAM,aAAa,CAAC;AAClH,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/workflows/builder.ts"],"names":[],"mappings":"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"}
|