expxagents 0.30.3 → 0.30.5
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/assets/core/onboarding/design-system-setup.md +101 -0
- package/assets/core/runner.pipeline.md +1 -0
- package/assets/core/solution-architect.agent.md +4 -77
- package/assets/core/visual-squad-guide.md +83 -0
- package/dist/dashboard/assets/{BufferResource-DR9k0IBy.js → BufferResource-CjsnSf42.js} +1 -1
- package/dist/dashboard/assets/{CanvasRenderer-CJN6IW-P.js → CanvasRenderer-B_BGtDGv.js} +1 -1
- package/dist/dashboard/assets/{JarvisView-BlWpd0zd.js → JarvisView-CjQi3aoo.js} +1 -1
- package/dist/dashboard/assets/{RenderTargetSystem-Br52tJpM.js → RenderTargetSystem-CvRMI3ss.js} +1 -1
- package/dist/dashboard/assets/{ThreeBackground-QmbGWUih.js → ThreeBackground-DxwBr08u.js} +1 -1
- package/dist/dashboard/assets/{WebGLRenderer-DyTcUt3n.js → WebGLRenderer-yAiRn_ne.js} +1 -1
- package/dist/dashboard/assets/{WebGPURenderer-C5v_uCzQ.js → WebGPURenderer-BxFqovmL.js} +1 -1
- package/dist/dashboard/assets/{browserAll-DohokyWS.js → browserAll-DMNx9Ffc.js} +1 -1
- package/dist/dashboard/assets/{index-D5osflxR.js → index-B9UJ5mUd.js} +236 -236
- package/dist/dashboard/assets/{webworkerAll-BrEiVNLD.js → webworkerAll-Dfvzix_M.js} +1 -1
- package/dist/dashboard/index.html +1 -1
- package/dist/server/app.d.ts.map +1 -1
- package/dist/server/app.js +6 -3
- package/dist/server/app.js.map +1 -1
- package/dist/server/bridge/__tests__/chat-handler.test.js +70 -0
- package/dist/server/bridge/__tests__/chat-handler.test.js.map +1 -1
- package/dist/server/bridge/__tests__/opencode-bridge.test.d.ts +2 -0
- package/dist/server/bridge/__tests__/opencode-bridge.test.d.ts.map +1 -0
- package/dist/server/bridge/__tests__/opencode-bridge.test.js +106 -0
- package/dist/server/bridge/__tests__/opencode-bridge.test.js.map +1 -0
- package/dist/server/bridge/chat-handler.d.ts +5 -0
- package/dist/server/bridge/chat-handler.d.ts.map +1 -1
- package/dist/server/bridge/chat-handler.js +41 -0
- package/dist/server/bridge/chat-handler.js.map +1 -1
- package/dist/server/bridge/engine.d.ts +9 -0
- package/dist/server/bridge/engine.d.ts.map +1 -1
- package/dist/server/bridge/opencode-bridge.d.ts.map +1 -1
- package/dist/server/bridge/opencode-bridge.js +34 -3
- package/dist/server/bridge/opencode-bridge.js.map +1 -1
- package/dist/server/scheduler/__tests__/job-runner-knowledge.test.d.ts +2 -0
- package/dist/server/scheduler/__tests__/job-runner-knowledge.test.d.ts.map +1 -0
- package/dist/server/scheduler/__tests__/job-runner-knowledge.test.js +122 -0
- package/dist/server/scheduler/__tests__/job-runner-knowledge.test.js.map +1 -0
- package/dist/server/scheduler/__tests__/scheduler-routes.test.js +22 -1
- package/dist/server/scheduler/__tests__/scheduler-routes.test.js.map +1 -1
- package/dist/server/scheduler/__tests__/scheduler-service.test.js +35 -1
- package/dist/server/scheduler/__tests__/scheduler-service.test.js.map +1 -1
- package/dist/server/scheduler/job-runner.d.ts +3 -0
- package/dist/server/scheduler/job-runner.d.ts.map +1 -1
- package/dist/server/scheduler/job-runner.js +20 -0
- package/dist/server/scheduler/job-runner.js.map +1 -1
- package/dist/server/scheduler/scheduler-routes.d.ts.map +1 -1
- package/dist/server/scheduler/scheduler-routes.js +9 -0
- package/dist/server/scheduler/scheduler-routes.js.map +1 -1
- package/dist/server/scheduler/scheduler-service.d.ts +2 -0
- package/dist/server/scheduler/scheduler-service.d.ts.map +1 -1
- package/dist/server/scheduler/scheduler-service.js +18 -0
- package/dist/server/scheduler/scheduler-service.js.map +1 -1
- package/dist/server/ws/__tests__/ws-handler-ask-user.test.d.ts +2 -0
- package/dist/server/ws/__tests__/ws-handler-ask-user.test.d.ts.map +1 -0
- package/dist/server/ws/__tests__/ws-handler-ask-user.test.js +46 -0
- package/dist/server/ws/__tests__/ws-handler-ask-user.test.js.map +1 -0
- package/dist/server/ws/ws-handler.js +16 -0
- package/dist/server/ws/ws-handler.js.map +1 -1
- package/node_modules/@expxagents/agent/dist/agent.js +81 -67
- package/node_modules/@expxagents/agent/dist/agent.js.map +1 -1
- package/node_modules/@expxagents/agent/dist/index.d.ts +1 -1
- package/node_modules/@expxagents/agent/dist/index.js +1 -1
- package/node_modules/@expxagents/agent/dist/index.js.map +1 -1
- package/node_modules/@expxagents/agent/dist/models.d.ts +5 -0
- package/node_modules/@expxagents/agent/dist/models.js +23 -0
- package/node_modules/@expxagents/agent/dist/models.js.map +1 -1
- package/package.json +1 -1
|
@@ -40,9 +40,10 @@ export class OpenCodeBridge {
|
|
|
40
40
|
const data = await res.json();
|
|
41
41
|
return data.id;
|
|
42
42
|
}
|
|
43
|
-
async pollStream(sessionId, onChunk) {
|
|
43
|
+
async pollStream(sessionId, onChunk, onAskUser) {
|
|
44
44
|
const timeoutAt = Date.now() + this.timeoutMs;
|
|
45
45
|
let fullText = '';
|
|
46
|
+
let waitingForAnswerAfterQuestion = false;
|
|
46
47
|
while (Date.now() < timeoutAt) {
|
|
47
48
|
const res = await this.fetch(`/session/${sessionId}/message?limit=5`);
|
|
48
49
|
if (!res.ok) {
|
|
@@ -50,6 +51,7 @@ export class OpenCodeBridge {
|
|
|
50
51
|
throw new Error(`Failed to get messages: ${res.status} ${text}`);
|
|
51
52
|
}
|
|
52
53
|
const messages = await res.json();
|
|
54
|
+
let questionDetected = null;
|
|
53
55
|
let newText = '';
|
|
54
56
|
for (const msg of messages) {
|
|
55
57
|
if (msg.info?.role === 'assistant') {
|
|
@@ -58,15 +60,44 @@ export class OpenCodeBridge {
|
|
|
58
60
|
if (block.type === 'text' && block.text) {
|
|
59
61
|
newText += block.text;
|
|
60
62
|
}
|
|
63
|
+
if (block.type === 'tool_use' && block.name === 'question' && !waitingForAnswerAfterQuestion) {
|
|
64
|
+
const input = block.input;
|
|
65
|
+
questionDetected = {
|
|
66
|
+
id: input.id ?? 'unknown',
|
|
67
|
+
header: input.header ?? '',
|
|
68
|
+
text: input.text ?? '',
|
|
69
|
+
options: input.options,
|
|
70
|
+
};
|
|
71
|
+
}
|
|
61
72
|
}
|
|
62
73
|
}
|
|
63
74
|
}
|
|
75
|
+
if (questionDetected) {
|
|
76
|
+
if (!onAskUser) {
|
|
77
|
+
throw new Error(`[opencode-bridge] WARNING: question tool called but no onAskUser handler — cannot continue session`);
|
|
78
|
+
}
|
|
79
|
+
waitingForAnswerAfterQuestion = true;
|
|
80
|
+
const answer = await onAskUser(questionDetected);
|
|
81
|
+
// Send answer back to OpenCode
|
|
82
|
+
const answerRes = await this.fetch(`/session/${sessionId}/message`, {
|
|
83
|
+
method: 'POST',
|
|
84
|
+
body: JSON.stringify({ parts: [{ type: 'text', text: answer }] }),
|
|
85
|
+
});
|
|
86
|
+
if (!answerRes.ok) {
|
|
87
|
+
const text = await answerRes.text();
|
|
88
|
+
throw new Error(`Failed to send answer to OpenCode: ${answerRes.status} ${text}`);
|
|
89
|
+
}
|
|
90
|
+
// Reset accumulator — wait for next assistant response
|
|
91
|
+
fullText = '';
|
|
92
|
+
waitingForAnswerAfterQuestion = false;
|
|
93
|
+
continue;
|
|
94
|
+
}
|
|
64
95
|
if (newText.length > fullText.length) {
|
|
65
96
|
const delta = newText.slice(fullText.length);
|
|
66
97
|
fullText = newText;
|
|
67
98
|
onChunk(delta);
|
|
68
99
|
}
|
|
69
|
-
if (fullText.trim()) {
|
|
100
|
+
if (fullText.trim() && !waitingForAnswerAfterQuestion) {
|
|
70
101
|
return fullText;
|
|
71
102
|
}
|
|
72
103
|
await new Promise((r) => setTimeout(r, 500));
|
|
@@ -92,7 +123,7 @@ export class OpenCodeBridge {
|
|
|
92
123
|
const text = await res.text();
|
|
93
124
|
throw new Error(`Failed to send prompt: ${res.status} ${text}`);
|
|
94
125
|
}
|
|
95
|
-
const fullText = await this.pollStream(sessionId, opts.onChunk);
|
|
126
|
+
const fullText = await this.pollStream(sessionId, opts.onChunk, opts.onAskUser);
|
|
96
127
|
if (!fullText.trim()) {
|
|
97
128
|
console.log(`[opencode-bridge] WARNING: empty response from OpenCode for key="${key}"`);
|
|
98
129
|
opts.onError({ code: null, message: 'Empty response from OpenCode' });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opencode-bridge.js","sourceRoot":"","sources":["../../src/bridge/opencode-bridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAS9C,MAAM,OAAO,cAAc;IAChB,IAAI,GAAG,UAAmB,CAAC;IAE5B,cAAc,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC3C,SAAS,CAAS;IAClB,OAAO,CAAS;IAChB,UAAU,CAAgB;IAElC,YAAY,MAA6B;QACvC,IAAI,CAAC,OAAO,GAAG,MAAM,EAAE,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,uBAAuB,CAAC;QAC3F,IAAI,CAAC,SAAS,GAAG,MAAM,EAAE,SAAS,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,QAAQ,EAAE,EAAE,CAAC,CAAC;QAE9F,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;QAC/C,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,UAAU,CAAC;YAC7D,IAAI,CAAC,UAAU,GAAG,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,IAAI,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzF,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACzB,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,uCAAuC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IACrE,CAAC;IAEO,KAAK,CAAC,KAAK,CAAC,IAAY,EAAE,OAAqB;QACrD,MAAM,OAAO,GAA2B;YACtC,cAAc,EAAE,kBAAkB;YAClC,GAAG,CAAC,OAAO,EAAE,OAAiC,IAAI,EAAE,CAAC;SACtD,CAAC;QACF,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,OAAO,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAC7C,CAAC;QACD,OAAO,KAAK,CAAC,GAAG,IAAI,CAAC,OAAO,GAAG,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IAClE,CAAC;IAEO,KAAK,CAAC,aAAa;QACzB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE;YACvC,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;SACzB,CAAC,CAAC;QACH,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;YACZ,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,sCAAsC,GAAG,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC,CAAC;QAC9E,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAoB,CAAC;QAChD,OAAO,IAAI,CAAC,EAAE,CAAC;IACjB,CAAC;IAEO,KAAK,CAAC,UAAU,
|
|
1
|
+
{"version":3,"file":"opencode-bridge.js","sourceRoot":"","sources":["../../src/bridge/opencode-bridge.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"job-runner-knowledge.test.d.ts","sourceRoot":"","sources":["../../../src/scheduler/__tests__/job-runner-knowledge.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,122 @@
|
|
|
1
|
+
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
2
|
+
import Database from 'better-sqlite3';
|
|
3
|
+
import { JobRunner } from '../job-runner.js';
|
|
4
|
+
import { runMigrations } from '../../db/migrations.js';
|
|
5
|
+
import fs from 'node:fs';
|
|
6
|
+
import os from 'node:os';
|
|
7
|
+
import path from 'node:path';
|
|
8
|
+
function createTestDb() {
|
|
9
|
+
const db = new Database(':memory:');
|
|
10
|
+
db.pragma('journal_mode = WAL');
|
|
11
|
+
runMigrations(db);
|
|
12
|
+
return db;
|
|
13
|
+
}
|
|
14
|
+
function createMockBridge() {
|
|
15
|
+
return {
|
|
16
|
+
type: 'claude-code',
|
|
17
|
+
send: vi.fn(),
|
|
18
|
+
isActive: vi.fn().mockReturnValue(false),
|
|
19
|
+
kill: vi.fn(),
|
|
20
|
+
};
|
|
21
|
+
}
|
|
22
|
+
describe('JobRunner knowledge ingestion', () => {
|
|
23
|
+
let db;
|
|
24
|
+
let bridge;
|
|
25
|
+
let squadsDir;
|
|
26
|
+
beforeEach(() => {
|
|
27
|
+
db = createTestDb();
|
|
28
|
+
bridge = createMockBridge();
|
|
29
|
+
squadsDir = fs.mkdtempSync(path.join(os.tmpdir(), 'squads-'));
|
|
30
|
+
});
|
|
31
|
+
afterEach(() => {
|
|
32
|
+
db.close();
|
|
33
|
+
fs.rmSync(squadsDir, { recursive: true, force: true });
|
|
34
|
+
});
|
|
35
|
+
it('calls ingestText with full output when squad completes', async () => {
|
|
36
|
+
const ingestText = vi.fn().mockResolvedValue(undefined);
|
|
37
|
+
const mockPipeline = { ingestText, ingest: vi.fn().mockResolvedValue(undefined) };
|
|
38
|
+
const squadDir = path.join(squadsDir, 'test-squad');
|
|
39
|
+
fs.mkdirSync(squadDir, { recursive: true });
|
|
40
|
+
const runner = new JobRunner({
|
|
41
|
+
db,
|
|
42
|
+
bridge,
|
|
43
|
+
broadcast: vi.fn(),
|
|
44
|
+
broadcastToAll: vi.fn(),
|
|
45
|
+
squadsDir,
|
|
46
|
+
knowledgePipeline: mockPipeline,
|
|
47
|
+
});
|
|
48
|
+
let capturedOnDone;
|
|
49
|
+
bridge.send.mockImplementation((opts) => {
|
|
50
|
+
capturedOnDone = opts.onDone;
|
|
51
|
+
});
|
|
52
|
+
runner.run({
|
|
53
|
+
squadName: 'test-squad',
|
|
54
|
+
prompt: 'do stuff',
|
|
55
|
+
timeoutMinutes: 5,
|
|
56
|
+
retryOnFailure: 0,
|
|
57
|
+
attempt: 1,
|
|
58
|
+
});
|
|
59
|
+
await new Promise(r => setTimeout(r, 20));
|
|
60
|
+
expect(capturedOnDone).toBeDefined();
|
|
61
|
+
capturedOnDone('Scheduler output text');
|
|
62
|
+
await new Promise(r => setTimeout(r, 20));
|
|
63
|
+
expect(ingestText).toHaveBeenCalledWith('Scheduler output text', expect.stringContaining('scheduler'), expect.objectContaining({ squad_code: 'test-squad', source_type: 'agent_output' }));
|
|
64
|
+
});
|
|
65
|
+
it('calls ingest for each handoff file in _output/', async () => {
|
|
66
|
+
const ingest = vi.fn().mockResolvedValue(undefined);
|
|
67
|
+
const mockPipeline = { ingestText: vi.fn().mockResolvedValue(undefined), ingest };
|
|
68
|
+
const squadDir = path.join(squadsDir, 'test-squad2');
|
|
69
|
+
const outputDir = path.join(squadDir, '_output');
|
|
70
|
+
fs.mkdirSync(outputDir, { recursive: true });
|
|
71
|
+
const handoffFile = path.join(outputDir, 'handoff-to-other.md');
|
|
72
|
+
fs.writeFileSync(handoffFile, '# Handoff content', 'utf-8');
|
|
73
|
+
const runner = new JobRunner({
|
|
74
|
+
db,
|
|
75
|
+
bridge,
|
|
76
|
+
broadcast: vi.fn(),
|
|
77
|
+
broadcastToAll: vi.fn(),
|
|
78
|
+
squadsDir,
|
|
79
|
+
knowledgePipeline: mockPipeline,
|
|
80
|
+
});
|
|
81
|
+
let capturedOnDone;
|
|
82
|
+
bridge.send.mockImplementation((opts) => {
|
|
83
|
+
capturedOnDone = opts.onDone;
|
|
84
|
+
});
|
|
85
|
+
runner.run({
|
|
86
|
+
squadName: 'test-squad2',
|
|
87
|
+
prompt: 'do stuff',
|
|
88
|
+
timeoutMinutes: 5,
|
|
89
|
+
retryOnFailure: 0,
|
|
90
|
+
attempt: 1,
|
|
91
|
+
});
|
|
92
|
+
await new Promise(r => setTimeout(r, 20));
|
|
93
|
+
capturedOnDone('Output with handoffs');
|
|
94
|
+
await new Promise(r => setTimeout(r, 20));
|
|
95
|
+
expect(ingest).toHaveBeenCalledWith(handoffFile, expect.objectContaining({ squad_code: 'test-squad2', source_type: 'agent_output' }));
|
|
96
|
+
});
|
|
97
|
+
it('does not throw when knowledgePipeline is not provided', async () => {
|
|
98
|
+
const squadDir = path.join(squadsDir, 'test-squad3');
|
|
99
|
+
fs.mkdirSync(squadDir, { recursive: true });
|
|
100
|
+
const runner = new JobRunner({
|
|
101
|
+
db,
|
|
102
|
+
bridge,
|
|
103
|
+
broadcast: vi.fn(),
|
|
104
|
+
broadcastToAll: vi.fn(),
|
|
105
|
+
squadsDir,
|
|
106
|
+
});
|
|
107
|
+
let capturedOnDone;
|
|
108
|
+
bridge.send.mockImplementation((opts) => {
|
|
109
|
+
capturedOnDone = opts.onDone;
|
|
110
|
+
});
|
|
111
|
+
runner.run({
|
|
112
|
+
squadName: 'test-squad3',
|
|
113
|
+
prompt: 'do stuff',
|
|
114
|
+
timeoutMinutes: 5,
|
|
115
|
+
retryOnFailure: 0,
|
|
116
|
+
attempt: 1,
|
|
117
|
+
});
|
|
118
|
+
await new Promise(r => setTimeout(r, 20));
|
|
119
|
+
expect(() => capturedOnDone('output')).not.toThrow();
|
|
120
|
+
});
|
|
121
|
+
});
|
|
122
|
+
//# sourceMappingURL=job-runner-knowledge.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"job-runner-knowledge.test.js","sourceRoot":"","sources":["../../../src/scheduler/__tests__/job-runner-knowledge.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { describe, it, expect, beforeEach, afterEach } from 'vitest';
|
|
1
|
+
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
2
2
|
import Fastify from 'fastify';
|
|
3
3
|
import Database from 'better-sqlite3';
|
|
4
4
|
import { runMigrations } from '../../db/migrations.js';
|
|
@@ -153,6 +153,27 @@ describe('scheduler-routes', () => {
|
|
|
153
153
|
expect(data[0].id).toBe('act-new');
|
|
154
154
|
expect(data[1].id).toBe('act-old');
|
|
155
155
|
});
|
|
156
|
+
it('POST /api/scheduler/reset — calls reset on schedulerService and returns jobs', async () => {
|
|
157
|
+
const mockReset = vi.fn();
|
|
158
|
+
const appWithService = Fastify();
|
|
159
|
+
appWithService.decorate('requireAuth', async () => { });
|
|
160
|
+
await appWithService.register(schedulerRoutes, {
|
|
161
|
+
db,
|
|
162
|
+
schedulerService: { reset: mockReset },
|
|
163
|
+
});
|
|
164
|
+
const res = await appWithService.inject({ method: 'POST', url: '/api/scheduler/reset' });
|
|
165
|
+
expect(res.statusCode).toBe(200);
|
|
166
|
+
const body = res.json();
|
|
167
|
+
expect(body.ok).toBe(true);
|
|
168
|
+
expect(body.data).toBeInstanceOf(Array);
|
|
169
|
+
expect(mockReset).toHaveBeenCalledOnce();
|
|
170
|
+
await appWithService.close();
|
|
171
|
+
});
|
|
172
|
+
it('POST /api/scheduler/reset — works when schedulerService is null', async () => {
|
|
173
|
+
const res = await app.inject({ method: 'POST', url: '/api/scheduler/reset' });
|
|
174
|
+
expect(res.statusCode).toBe(200);
|
|
175
|
+
expect(res.json().ok).toBe(true);
|
|
176
|
+
});
|
|
156
177
|
it('GET /api/scheduler/:squad/history should respect limit parameter', async () => {
|
|
157
178
|
for (let i = 0; i < 5; i++) {
|
|
158
179
|
db.prepare(`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduler-routes.test.js","sourceRoot":"","sources":["../../../src/scheduler/__tests__/scheduler-routes.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"scheduler-routes.test.js","sourceRoot":"","sources":["../../../src/scheduler/__tests__/scheduler-routes.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,11 +7,17 @@ import fs from 'node:fs';
|
|
|
7
7
|
import path from 'node:path';
|
|
8
8
|
import os from 'node:os';
|
|
9
9
|
import YAML from 'yaml';
|
|
10
|
+
const mockTaskRegistry = new Map();
|
|
10
11
|
// Mock node-cron
|
|
11
12
|
vi.mock('node-cron', () => ({
|
|
12
13
|
default: {
|
|
13
|
-
schedule: vi.fn(() =>
|
|
14
|
+
schedule: vi.fn(() => {
|
|
15
|
+
const task = { stop: vi.fn(), start: vi.fn(), destroy: vi.fn() };
|
|
16
|
+
mockTaskRegistry.set(`task-${mockTaskRegistry.size}`, task);
|
|
17
|
+
return task;
|
|
18
|
+
}),
|
|
14
19
|
validate: vi.fn(() => true),
|
|
20
|
+
getTasks: vi.fn(() => mockTaskRegistry),
|
|
15
21
|
},
|
|
16
22
|
}));
|
|
17
23
|
// Mock JobRunner
|
|
@@ -27,6 +33,7 @@ describe('SchedulerService', () => {
|
|
|
27
33
|
let service;
|
|
28
34
|
let squadsDir;
|
|
29
35
|
beforeEach(() => {
|
|
36
|
+
mockTaskRegistry.clear();
|
|
30
37
|
db = new Database(':memory:');
|
|
31
38
|
runMigrations(db);
|
|
32
39
|
squadsDir = fs.mkdtempSync(path.join(os.tmpdir(), 'scheduler-test-'));
|
|
@@ -183,6 +190,33 @@ describe('SchedulerService', () => {
|
|
|
183
190
|
expect(status).toHaveLength(1);
|
|
184
191
|
expect(status[0].squadName).toBe('squad-both');
|
|
185
192
|
});
|
|
193
|
+
it('reset() — kills all in-memory jobs and ghost tasks, then restores from DB', () => {
|
|
194
|
+
// Seed DB with a job (simulates API-created schedule)
|
|
195
|
+
db.prepare(`
|
|
196
|
+
INSERT INTO scheduled_jobs (squad_name, cron_expression, prompt, mode, timeout_minutes, retry_on_failure, status)
|
|
197
|
+
VALUES (?, ?, ?, 'autonomous', 30, 0, 'active')
|
|
198
|
+
`).run('ghost-squad', '5 * * * *', 'check for updates');
|
|
199
|
+
// Start service — restores from DB
|
|
200
|
+
service.start();
|
|
201
|
+
expect(service.getStatus()).toHaveLength(1);
|
|
202
|
+
// Manually add a "ghost" task to the registry (not tracked in jobs map)
|
|
203
|
+
const ghostTask = { stop: vi.fn(), start: vi.fn(), destroy: vi.fn() };
|
|
204
|
+
mockTaskRegistry.set('ghost-task-id', ghostTask);
|
|
205
|
+
// Reset — should destroy all (including ghost) and restore from DB
|
|
206
|
+
service.reset();
|
|
207
|
+
expect(ghostTask.destroy).toHaveBeenCalled();
|
|
208
|
+
// Jobs should be restored from DB
|
|
209
|
+
const status = service.getStatus();
|
|
210
|
+
expect(status).toHaveLength(1);
|
|
211
|
+
expect(status[0].squadName).toBe('ghost-squad');
|
|
212
|
+
expect(status[0].cronExpression).toBe('5 * * * *');
|
|
213
|
+
});
|
|
214
|
+
it('reset() — with no DB entries results in empty jobs map', () => {
|
|
215
|
+
service.start();
|
|
216
|
+
expect(service.getStatus()).toHaveLength(0);
|
|
217
|
+
service.reset();
|
|
218
|
+
expect(service.getStatus()).toHaveLength(0);
|
|
219
|
+
});
|
|
186
220
|
it('should reload a specific squad config', () => {
|
|
187
221
|
createSquadWithSchedule('squad-d', {
|
|
188
222
|
enabled: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduler-service.test.js","sourceRoot":"","sources":["../../../src/scheduler/__tests__/scheduler-service.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,iBAAiB;AACjB,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC;IAC1B,OAAO,EAAE;QACP,QAAQ,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"scheduler-service.test.js","sourceRoot":"","sources":["../../../src/scheduler/__tests__/scheduler-service.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAkH,CAAC;AAEnJ,iBAAiB;AACjB,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC;IAC1B,OAAO,EAAE;QACP,QAAQ,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE;YACnB,MAAM,IAAI,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;YACjE,gBAAgB,CAAC,GAAG,CAAC,QAAQ,gBAAgB,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC;YAC5D,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QACF,QAAQ,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;QAC3B,QAAQ,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC;KACxC;CACF,CAAC,CAAC,CAAC;AAEJ,iBAAiB;AACjB,EAAE,CAAC,IAAI,CAAC,kBAAkB,EAAE,GAAG,EAAE,CAAC,CAAC;IACjC,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,CAAC;QAC3C,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,WAAW,CAAC;QAC3C,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC;QACzC,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE;KACjB,CAAC,CAAC;CACJ,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,IAAI,EAAqB,CAAC;IAC1B,IAAI,OAAyB,CAAC;IAC9B,IAAI,SAAiB,CAAC;IAEtB,UAAU,CAAC,GAAG,EAAE;QACd,gBAAgB,CAAC,KAAK,EAAE,CAAC;QACzB,EAAE,GAAG,IAAI,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC9B,aAAa,CAAC,EAAE,CAAC,CAAC;QAClB,SAAS,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,iBAAiB,CAAC,CAAC,CAAC;QAEtE,MAAM,UAAU,GAAG,IAAI,SAAS,CAAC,EAAS,CAAC,CAAC;QAC5C,OAAO,GAAG,IAAI,gBAAgB,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,CAAC,IAAI,EAAE,CAAC;QACf,EAAE,CAAC,KAAK,EAAE,CAAC;QACX,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,SAAS,uBAAuB,CAAC,IAAY,EAAE,QAAiC;QAC9E,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QACvC,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACvC,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,YAAY,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC;YAC5D,KAAK,EAAE;gBACL,IAAI,EAAE,IAAI;gBACV,IAAI,EAAE,SAAS,IAAI,EAAE;gBACrB,WAAW,EAAE,YAAY;gBACzB,IAAI,EAAE,IAAI;gBACV,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;gBACnE,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,EAAE;gBACjE,QAAQ;aACT;SACF,CAAC,CAAC,CAAC;IACN,CAAC;IAED,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC5C,uBAAuB,CAAC,SAAS,EAAE;YACjC,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,YAAY;YAClB,MAAM,EAAE,iBAAiB;SAC1B,CAAC,CAAC;QAEH,OAAO,CAAC,KAAK,EAAE,CAAC;QAChB,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;QACnC,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC5C,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACrD,uBAAuB,CAAC,mBAAmB,EAAE;YAC3C,OAAO,EAAE,KAAK;YACd,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,YAAY;YAClB,MAAM,EAAE,SAAS;SAClB,CAAC,CAAC;QAEH,OAAO,CAAC,KAAK,EAAE,CAAC;QAChB,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;QACzC,uBAAuB,CAAC,SAAS,EAAE;YACjC,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,YAAY;YAClB,MAAM,EAAE,MAAM;SACf,CAAC,CAAC;QAEH,OAAO,CAAC,KAAK,EAAE,CAAC;QAChB,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAEzB,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;QACnC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAExC,iBAAiB;QACjB,MAAM,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,wDAAwD,CAAC,CAAC,GAAG,CAAC,SAAS,CAAQ,CAAC;QACvG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAElC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC1B,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;QACpC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACnC,uBAAuB,CAAC,SAAS,EAAE;YACjC,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,YAAY;YAClB,MAAM,EAAE,MAAM;SACf,CAAC,CAAC;QAEH,OAAO,CAAC,KAAK,EAAE,CAAC;QAChB,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAE5C,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAC9B,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACzD,MAAM,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,WAAW,EAAE;YAC9C,IAAI,EAAE,WAAW;YACjB,MAAM,EAAE,cAAc;YACtB,QAAQ,EAAE,mBAAmB;YAC7B,eAAe,EAAE,EAAE;YACnB,gBAAgB,EAAE,CAAC;SACpB,CAAC,CAAC;QACH,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEtB,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;QACnC,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC9C,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACnD,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAExC,MAAM,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,mDAAmD,CAAC,CAAC,GAAG,CAAC,WAAW,CAAQ,CAAC;QACpG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACxC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAC/C,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACrC,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;QACxD,OAAO,CAAC,eAAe,CAAC,cAAc,EAAE;YACtC,IAAI,EAAE,WAAW;YACjB,MAAM,EAAE,YAAY;SACrB,CAAC,CAAC;QAEH,OAAO,CAAC,eAAe,CAAC,cAAc,EAAE;YACtC,IAAI,EAAE,YAAY;YAClB,MAAM,EAAE,YAAY;SACrB,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;QACnC,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QAC1D,gEAAgE;QAChE,EAAE,CAAC,OAAO,CAAC;;;KAGV,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,WAAW,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC,EAAE,mBAAmB,CAAC,CAAC;QAE7E,uDAAuD;QACvD,OAAO,CAAC,KAAK,EAAE,CAAC;QAEhB,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;QACnC,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC9C,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACnD,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACrD,EAAE,CAAC,OAAO,CAAC;;;KAGV,CAAC,CAAC,GAAG,CAAC,cAAc,EAAE,WAAW,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;QAEjE,OAAO,CAAC,KAAK,EAAE,CAAC;QAEhB,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;QACnC,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACjD,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;QAClE,oBAAoB;QACpB,uBAAuB,CAAC,YAAY,EAAE;YACpC,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,YAAY;YAClB,MAAM,EAAE,WAAW;SACpB,CAAC,CAAC;QAEH,iEAAiE;QACjE,EAAE,CAAC,OAAO,CAAC;;;KAGV,CAAC,CAAC,GAAG,CAAC,YAAY,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;QAE7C,OAAO,CAAC,KAAK,EAAE,CAAC;QAEhB,kCAAkC;QAClC,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;QACnC,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2EAA2E,EAAE,GAAG,EAAE;QACnF,sDAAsD;QACtD,EAAE,CAAC,OAAO,CAAC;;;KAGV,CAAC,CAAC,GAAG,CAAC,aAAa,EAAE,WAAW,EAAE,mBAAmB,CAAC,CAAC;QAExD,mCAAmC;QACnC,OAAO,CAAC,KAAK,EAAE,CAAC;QAChB,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAE5C,wEAAwE;QACxE,MAAM,SAAS,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;QACtE,gBAAgB,CAAC,GAAG,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;QAEjD,mEAAmE;QACnE,OAAO,CAAC,KAAK,EAAE,CAAC;QAEhB,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAE7C,kCAAkC;QAClC,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;QACnC,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAChD,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;QAChE,OAAO,CAAC,KAAK,EAAE,CAAC;QAChB,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAE5C,OAAO,CAAC,KAAK,EAAE,CAAC;QAEhB,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC/C,uBAAuB,CAAC,SAAS,EAAE;YACjC,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,YAAY;YAClB,MAAM,EAAE,YAAY;SACrB,CAAC,CAAC;QAEH,OAAO,CAAC,KAAK,EAAE,CAAC;QAChB,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAE5C,kBAAkB;QAClB,uBAAuB,CAAC,SAAS,EAAE;YACjC,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,YAAY;YAClB,IAAI,EAAE,YAAY;YAClB,MAAM,EAAE,YAAY;SACrB,CAAC,CAAC;QAEH,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAE1B,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;QACnC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import type Database from 'better-sqlite3';
|
|
2
2
|
import type { AgentEngine } from '../bridge/engine.js';
|
|
3
|
+
import type { IngestPipeline } from 'expxagents-knowledge';
|
|
3
4
|
export interface JobRunnerConfig {
|
|
4
5
|
db: Database.Database;
|
|
5
6
|
bridge: AgentEngine | (() => AgentEngine);
|
|
6
7
|
broadcast: (squadName: string, message: Record<string, unknown>) => void;
|
|
7
8
|
broadcastToAll: (message: Record<string, unknown>) => void;
|
|
8
9
|
squadsDir: string;
|
|
10
|
+
knowledgePipeline?: IngestPipeline;
|
|
9
11
|
}
|
|
10
12
|
export interface RunOptions {
|
|
11
13
|
squadName: string;
|
|
@@ -29,6 +31,7 @@ export declare class JobRunner {
|
|
|
29
31
|
private broadcast;
|
|
30
32
|
private broadcastToAll;
|
|
31
33
|
private squadsDir;
|
|
34
|
+
private knowledgePipeline?;
|
|
32
35
|
private runningSquads;
|
|
33
36
|
private squadQueues;
|
|
34
37
|
private summaryCounter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job-runner.d.ts","sourceRoot":"","sources":["../../src/scheduler/job-runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"job-runner.d.ts","sourceRoot":"","sources":["../../src/scheduler/job-runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAkBvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAG3D,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,QAAQ,CAAC,QAAQ,CAAC;IACtB,MAAM,EAAE,WAAW,GAAG,CAAC,MAAM,WAAW,CAAC,CAAC;IAC1C,SAAS,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IACzE,cAAc,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IAC3D,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,cAAc,CAAC;CACpC;AAED,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,+EAA+E;IAC/E,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,MAAM,SAAS,GAAG,WAAW,GAAG,QAAQ,GAAG,SAAS,GAAG,QAAQ,CAAC;AAEtE,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAaD,qBAAa,SAAS;IACpB,OAAO,CAAC,EAAE,CAAoB;IAC9B,OAAO,CAAC,OAAO,CAAoC;IACnD,OAAO,CAAC,SAAS,CAAgE;IACjF,OAAO,CAAC,cAAc,CAA6C;IACnE,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,iBAAiB,CAAC,CAAiB;IAC3C,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,WAAW,CAAmC;IACtD,OAAO,CAAC,cAAc,CAAK;IAE3B,OAAO,KAAK,MAAM,GAEjB;gBAEW,MAAM,EAAE,eAAe;IAUnC;;;;;OAKG;IACH,OAAO,CAAC,yBAAyB;IA8B3B,GAAG,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC;IAiN/C;;;OAGG;IACH,OAAO,CAAC,eAAe;IAmCvB;;;;;;OAMG;IACH,OAAO,CAAC,eAAe;IA+BvB,OAAO,CAAC,kBAAkB;IAkB1B;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAezB;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAmC7B,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAIrC,OAAO,IAAI,IAAI;CAMhB"}
|
|
@@ -6,6 +6,7 @@ import { appendExecutionLog } from '../services/execution-log-service.js';
|
|
|
6
6
|
import path from 'node:path';
|
|
7
7
|
import fs from 'node:fs';
|
|
8
8
|
import YAML from 'yaml';
|
|
9
|
+
import { createAgentOutputHook } from 'expxagents-knowledge';
|
|
9
10
|
const RETRY_BASE_MS = 30_000;
|
|
10
11
|
const HANDOFF_MAX_CHARS = 2000;
|
|
11
12
|
const DEFAULT_CHAIN_MAX_TURNS = 25;
|
|
@@ -21,6 +22,7 @@ export class JobRunner {
|
|
|
21
22
|
broadcast;
|
|
22
23
|
broadcastToAll;
|
|
23
24
|
squadsDir;
|
|
25
|
+
knowledgePipeline;
|
|
24
26
|
runningSquads = new Set();
|
|
25
27
|
squadQueues = new Map();
|
|
26
28
|
summaryCounter = 0;
|
|
@@ -33,6 +35,7 @@ export class JobRunner {
|
|
|
33
35
|
this.broadcast = config.broadcast;
|
|
34
36
|
this.broadcastToAll = config.broadcastToAll;
|
|
35
37
|
this.squadsDir = config.squadsDir;
|
|
38
|
+
this.knowledgePipeline = config.knowledgePipeline;
|
|
36
39
|
this.cleanupStaleRunningStates();
|
|
37
40
|
}
|
|
38
41
|
/**
|
|
@@ -202,6 +205,23 @@ export class JobRunner {
|
|
|
202
205
|
catch (chainErr) {
|
|
203
206
|
console.error(`[chain] Error processing chain for "${opts.squadName}":`, chainErr);
|
|
204
207
|
}
|
|
208
|
+
// Auto-index output into knowledge system (fire-and-forget)
|
|
209
|
+
if (this.knowledgePipeline) {
|
|
210
|
+
const outputDir = path.join(squadDir, '_output');
|
|
211
|
+
const outputFiles = [];
|
|
212
|
+
if (fs.existsSync(outputDir)) {
|
|
213
|
+
outputFiles.push(...fs.readdirSync(outputDir)
|
|
214
|
+
.filter((f) => f.endsWith('.md'))
|
|
215
|
+
.map((f) => path.join(outputDir, f)));
|
|
216
|
+
}
|
|
217
|
+
const hook = createAgentOutputHook(this.knowledgePipeline);
|
|
218
|
+
hook({
|
|
219
|
+
squad_code: opts.squadName,
|
|
220
|
+
agent_id: 'scheduler',
|
|
221
|
+
result_summary: fullText,
|
|
222
|
+
output_files: outputFiles,
|
|
223
|
+
}).catch((err) => console.error('[knowledge] scheduler ingest failed:', err));
|
|
224
|
+
}
|
|
205
225
|
this.scheduleRetryIfNeeded(opts.squadName, opts);
|
|
206
226
|
resolve('completed');
|
|
207
227
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job-runner.js","sourceRoot":"","sources":["../../src/scheduler/job-runner.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"job-runner.js","sourceRoot":"","sources":["../../src/scheduler/job-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduler-routes.d.ts","sourceRoot":"","sources":["../../src/scheduler/scheduler-routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AACrE,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,UAAU,sBAAuB,SAAQ,oBAAoB;IAC3D,EAAE,EAAE,QAAQ,CAAC,QAAQ,CAAC;IACtB,gBAAgB,EAAE,gBAAgB,GAAG,IAAI,CAAC;CAC3C;AAED,wBAAsB,eAAe,CACnC,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,sBAAsB,GAC3B,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"scheduler-routes.d.ts","sourceRoot":"","sources":["../../src/scheduler/scheduler-routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AACrE,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,UAAU,sBAAuB,SAAQ,oBAAoB;IAC3D,EAAE,EAAE,QAAQ,CAAC,QAAQ,CAAC;IACtB,gBAAgB,EAAE,gBAAgB,GAAG,IAAI,CAAC;CAC3C;AAED,wBAAsB,eAAe,CACnC,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,sBAAsB,GAC3B,OAAO,CAAC,IAAI,CAAC,CAuIf"}
|
|
@@ -85,6 +85,15 @@ export async function schedulerRoutes(app, opts) {
|
|
|
85
85
|
schedulerService.triggerNow(request.params.squad);
|
|
86
86
|
return reply.send({ ok: true, message: 'Triggered' });
|
|
87
87
|
});
|
|
88
|
+
// POST /api/scheduler/reset — kill all in-memory cron tasks and restore from DB
|
|
89
|
+
app.post('/api/scheduler/reset', {
|
|
90
|
+
preHandler: [app.requireAuth],
|
|
91
|
+
}, async (_request, reply) => {
|
|
92
|
+
if (schedulerService)
|
|
93
|
+
schedulerService.reset();
|
|
94
|
+
const rows = db.prepare('SELECT * FROM scheduled_jobs ORDER BY squad_name').all();
|
|
95
|
+
return reply.send({ ok: true, data: rows });
|
|
96
|
+
});
|
|
88
97
|
// DELETE /api/scheduler/:squad
|
|
89
98
|
app.delete('/api/scheduler/:squad', {
|
|
90
99
|
preHandler: [app.requireAuth],
|