@agentmeshhq/agent 0.4.11 → 0.4.13
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/dist/__tests__/context-template.test.js +9 -0
- package/dist/__tests__/context-template.test.js.map +1 -1
- package/dist/__tests__/token-rejection-recovery.test.d.ts +16 -0
- package/dist/__tests__/token-rejection-recovery.test.js +241 -0
- package/dist/__tests__/token-rejection-recovery.test.js.map +1 -0
- package/dist/__tests__/watcher-runtime.test.d.ts +1 -0
- package/dist/__tests__/watcher-runtime.test.js +162 -0
- package/dist/__tests__/watcher-runtime.test.js.map +1 -0
- package/dist/cli/attach.js +55 -0
- package/dist/cli/attach.js.map +1 -1
- package/dist/cli/index.js +53 -25
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/watcher.d.ts +16 -0
- package/dist/cli/watcher.js +262 -1
- package/dist/cli/watcher.js.map +1 -1
- package/dist/core/daemon/context-template.d.ts +2 -0
- package/dist/core/daemon/context-template.js +2 -2
- package/dist/core/daemon/context-template.js.map +1 -1
- package/dist/core/daemon.js +1 -0
- package/dist/core/daemon.js.map +1 -1
- package/dist/core/heartbeat.d.ts +3 -1
- package/dist/core/heartbeat.js +5 -6
- package/dist/core/heartbeat.js.map +1 -1
- package/dist/core/project-watcher-loop.d.ts +29 -0
- package/dist/core/project-watcher-loop.js +53 -0
- package/dist/core/project-watcher-loop.js.map +1 -0
- package/dist/core/token-lifecycle.d.ts +7 -0
- package/dist/core/token-lifecycle.js +14 -0
- package/dist/core/token-lifecycle.js.map +1 -1
- package/package.json +1 -1
|
@@ -147,6 +147,15 @@ describe("generateClaudeMd", () => {
|
|
|
147
147
|
expect(md).toContain("POST https://agentmeshhq.dev/api/v1/workspaces/:workspace/handoffs");
|
|
148
148
|
expect(md).toContain("GET https://agentmeshhq.dev/api/v1/workspaces/:workspace/inbox");
|
|
149
149
|
});
|
|
150
|
+
it("agentName option overrides hub display_name", () => {
|
|
151
|
+
const md = generateClaudeMd(baseOnboard, {
|
|
152
|
+
hubUrl: "https://agentmeshhq.dev",
|
|
153
|
+
token: "test-token",
|
|
154
|
+
agentName: "mesh-lead",
|
|
155
|
+
});
|
|
156
|
+
expect(md).toContain("**Name**: mesh-lead");
|
|
157
|
+
expect(md).not.toContain("**Name**: test-agent");
|
|
158
|
+
});
|
|
150
159
|
it("renders relative paths when no options", () => {
|
|
151
160
|
const md = generateClaudeMd(baseOnboard);
|
|
152
161
|
expect(md).not.toContain("Hub URL");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-template.test.js","sourceRoot":"","sources":["../../src/__tests__/context-template.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"context-template.test.js","sourceRoot":"","sources":["../../src/__tests__/context-template.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tests for token rejection self-healing (#490)
|
|
3
|
+
*
|
|
4
|
+
* Covers the scenario where the hub restarts with a new JWT secret, making
|
|
5
|
+
* all existing tokens invalid. Agents must detect the 401 and immediately
|
|
6
|
+
* re-register without waiting for token expiry.
|
|
7
|
+
*
|
|
8
|
+
* Tests:
|
|
9
|
+
* 1. notifyRejected() triggers re-register when token is rejected by hub
|
|
10
|
+
* 2. notifyRejected() is a no-op if refresh is already in progress (no concurrent attempts)
|
|
11
|
+
* 3. notifyRejected() is a no-op after stop()
|
|
12
|
+
* 4. Heartbeat 401 response calls notifyRejected() on lifecycle manager
|
|
13
|
+
* 5. Re-registered token is accepted by subsequent heartbeats
|
|
14
|
+
* 6. notifyRejected() → refresh endpoint also 401 → falls through to re-register
|
|
15
|
+
*/
|
|
16
|
+
export {};
|
|
@@ -0,0 +1,241 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tests for token rejection self-healing (#490)
|
|
3
|
+
*
|
|
4
|
+
* Covers the scenario where the hub restarts with a new JWT secret, making
|
|
5
|
+
* all existing tokens invalid. Agents must detect the 401 and immediately
|
|
6
|
+
* re-register without waiting for token expiry.
|
|
7
|
+
*
|
|
8
|
+
* Tests:
|
|
9
|
+
* 1. notifyRejected() triggers re-register when token is rejected by hub
|
|
10
|
+
* 2. notifyRejected() is a no-op if refresh is already in progress (no concurrent attempts)
|
|
11
|
+
* 3. notifyRejected() is a no-op after stop()
|
|
12
|
+
* 4. Heartbeat 401 response calls notifyRejected() on lifecycle manager
|
|
13
|
+
* 5. Re-registered token is accepted by subsequent heartbeats
|
|
14
|
+
* 6. notifyRejected() → refresh endpoint also 401 → falls through to re-register
|
|
15
|
+
*/
|
|
16
|
+
import { afterEach, describe, expect, it, vi } from "vitest";
|
|
17
|
+
import { Heartbeat } from "../core/heartbeat.js";
|
|
18
|
+
import { TokenLifecycleManager } from "../core/token-lifecycle.js";
|
|
19
|
+
// ─── Helpers ─────────────────────────────────────────────────────────────────
|
|
20
|
+
/** Build a non-expiring JWT stub (exp = year 2099) */
|
|
21
|
+
function makeToken(sub = "agent-1") {
|
|
22
|
+
const header = Buffer.from(JSON.stringify({ alg: "HS256", typ: "JWT" })).toString("base64url");
|
|
23
|
+
const payload = Buffer.from(JSON.stringify({ sub, exp: Math.floor(new Date("2099-01-01").getTime() / 1000) })).toString("base64url");
|
|
24
|
+
return `${header}.${payload}.sig`;
|
|
25
|
+
}
|
|
26
|
+
const BOOTSTRAP = {
|
|
27
|
+
apiKey: "test-api-key",
|
|
28
|
+
agentId: "agent-1",
|
|
29
|
+
displayName: "test-agent",
|
|
30
|
+
model: "claude-sonnet-4-6",
|
|
31
|
+
workspace: "test-ws",
|
|
32
|
+
};
|
|
33
|
+
// ─── TokenLifecycleManager.notifyRejected() ──────────────────────────────────
|
|
34
|
+
describe("TokenLifecycleManager.notifyRejected()", () => {
|
|
35
|
+
it("immediately triggers re-register when token is rejected by hub", async () => {
|
|
36
|
+
const newToken = makeToken("agent-new");
|
|
37
|
+
const fetchMock = vi.fn().mockImplementation((url) => {
|
|
38
|
+
if (url.includes("/token/refresh")) {
|
|
39
|
+
// Refresh endpoint also returns 401 (hub has new secret)
|
|
40
|
+
return Promise.resolve({ ok: false, status: 401, json: async () => ({}) });
|
|
41
|
+
}
|
|
42
|
+
if (url.includes("/agents/register")) {
|
|
43
|
+
return Promise.resolve({
|
|
44
|
+
ok: true,
|
|
45
|
+
status: 200,
|
|
46
|
+
json: async () => ({ token: newToken, expires_at: "2099-01-01T00:00:00Z" }),
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
return Promise.resolve({ ok: true, status: 200, json: async () => ({}) });
|
|
50
|
+
});
|
|
51
|
+
const onTokenUpdate = vi.fn();
|
|
52
|
+
const manager = new TokenLifecycleManager({
|
|
53
|
+
hubUrl: "https://hub.test",
|
|
54
|
+
initialToken: makeToken(),
|
|
55
|
+
bootstrap: BOOTSTRAP,
|
|
56
|
+
onTokenUpdate,
|
|
57
|
+
fetch: fetchMock,
|
|
58
|
+
checkIntervalMs: 60_000, // long interval — should not fire during test
|
|
59
|
+
minReregisterIntervalMs: 0, // allow immediate re-register
|
|
60
|
+
});
|
|
61
|
+
manager.start();
|
|
62
|
+
manager.notifyRejected();
|
|
63
|
+
// Give the async chain time to complete
|
|
64
|
+
await vi.waitFor(() => expect(onTokenUpdate).toHaveBeenCalledWith(newToken, "2099-01-01T00:00:00Z"), {
|
|
65
|
+
timeout: 2000,
|
|
66
|
+
});
|
|
67
|
+
expect(manager.getToken()).toBe(newToken);
|
|
68
|
+
manager.stop();
|
|
69
|
+
});
|
|
70
|
+
it("does not start a concurrent refresh if one is already in progress", async () => {
|
|
71
|
+
let registerCallCount = 0;
|
|
72
|
+
let resolveRegister;
|
|
73
|
+
const registerPromise = new Promise((r) => {
|
|
74
|
+
resolveRegister = r;
|
|
75
|
+
});
|
|
76
|
+
const fetchMock = vi.fn().mockImplementation((url) => {
|
|
77
|
+
if (url.includes("/token/refresh")) {
|
|
78
|
+
return Promise.resolve({ ok: false, status: 401, json: async () => ({}) });
|
|
79
|
+
}
|
|
80
|
+
if (url.includes("/agents/register")) {
|
|
81
|
+
registerCallCount++;
|
|
82
|
+
return registerPromise.then(() => ({
|
|
83
|
+
ok: true,
|
|
84
|
+
status: 200,
|
|
85
|
+
json: async () => ({ token: makeToken("new"), expires_at: "2099-01-01T00:00:00Z" }),
|
|
86
|
+
}));
|
|
87
|
+
}
|
|
88
|
+
return Promise.resolve({ ok: true, status: 200, json: async () => ({}) });
|
|
89
|
+
});
|
|
90
|
+
const manager = new TokenLifecycleManager({
|
|
91
|
+
hubUrl: "https://hub.test",
|
|
92
|
+
initialToken: makeToken(),
|
|
93
|
+
bootstrap: BOOTSTRAP,
|
|
94
|
+
onTokenUpdate: vi.fn(),
|
|
95
|
+
fetch: fetchMock,
|
|
96
|
+
checkIntervalMs: 60_000,
|
|
97
|
+
minReregisterIntervalMs: 0,
|
|
98
|
+
});
|
|
99
|
+
manager.start();
|
|
100
|
+
// Call twice rapidly
|
|
101
|
+
manager.notifyRejected();
|
|
102
|
+
manager.notifyRejected();
|
|
103
|
+
// Allow microtasks to settle
|
|
104
|
+
await new Promise((r) => setTimeout(r, 50));
|
|
105
|
+
// Only one register attempt should have started
|
|
106
|
+
expect(registerCallCount).toBe(1);
|
|
107
|
+
resolveRegister(undefined);
|
|
108
|
+
manager.stop();
|
|
109
|
+
});
|
|
110
|
+
it("is a no-op after stop()", async () => {
|
|
111
|
+
const fetchMock = vi.fn();
|
|
112
|
+
const manager = new TokenLifecycleManager({
|
|
113
|
+
hubUrl: "https://hub.test",
|
|
114
|
+
initialToken: makeToken(),
|
|
115
|
+
bootstrap: BOOTSTRAP,
|
|
116
|
+
onTokenUpdate: vi.fn(),
|
|
117
|
+
fetch: fetchMock,
|
|
118
|
+
checkIntervalMs: 60_000,
|
|
119
|
+
minReregisterIntervalMs: 0,
|
|
120
|
+
});
|
|
121
|
+
manager.start();
|
|
122
|
+
manager.stop();
|
|
123
|
+
manager.notifyRejected();
|
|
124
|
+
await new Promise((r) => setTimeout(r, 50));
|
|
125
|
+
expect(fetchMock).not.toHaveBeenCalled();
|
|
126
|
+
});
|
|
127
|
+
});
|
|
128
|
+
// ─── Heartbeat → notifyRejected() integration ────────────────────────────────
|
|
129
|
+
describe("Heartbeat 401 → notifyRejected()", () => {
|
|
130
|
+
let heartbeat;
|
|
131
|
+
afterEach(() => {
|
|
132
|
+
heartbeat?.stop();
|
|
133
|
+
});
|
|
134
|
+
it("calls lifecycle notifyRejected() when heartbeat returns 401", async () => {
|
|
135
|
+
const newToken = makeToken("agent-refreshed");
|
|
136
|
+
let heartbeatCallCount = 0;
|
|
137
|
+
const fetchMock = vi.fn().mockImplementation((url) => {
|
|
138
|
+
if (url.includes("/heartbeat")) {
|
|
139
|
+
heartbeatCallCount++;
|
|
140
|
+
// First call: 401 (hub restarted). Subsequent: 200 (after re-register).
|
|
141
|
+
const status = heartbeatCallCount === 1 ? 401 : 200;
|
|
142
|
+
return Promise.resolve({ ok: status === 200, status, json: async () => ({}) });
|
|
143
|
+
}
|
|
144
|
+
if (url.includes("/token/refresh")) {
|
|
145
|
+
return Promise.resolve({ ok: false, status: 401, json: async () => ({}) });
|
|
146
|
+
}
|
|
147
|
+
if (url.includes("/agents/register")) {
|
|
148
|
+
return Promise.resolve({
|
|
149
|
+
ok: true,
|
|
150
|
+
status: 200,
|
|
151
|
+
json: async () => ({ token: newToken, expires_at: "2099-01-01T00:00:00Z" }),
|
|
152
|
+
});
|
|
153
|
+
}
|
|
154
|
+
return Promise.resolve({ ok: true, status: 200, json: async () => ({}) });
|
|
155
|
+
});
|
|
156
|
+
const onTokenRefresh = vi.fn();
|
|
157
|
+
const lifecycleManager = new TokenLifecycleManager({
|
|
158
|
+
hubUrl: "https://hub.test",
|
|
159
|
+
initialToken: makeToken(),
|
|
160
|
+
bootstrap: BOOTSTRAP,
|
|
161
|
+
onTokenUpdate: (token, _expiresAt) => {
|
|
162
|
+
onTokenRefresh(token);
|
|
163
|
+
},
|
|
164
|
+
fetch: fetchMock,
|
|
165
|
+
checkIntervalMs: 60_000,
|
|
166
|
+
minReregisterIntervalMs: 0,
|
|
167
|
+
});
|
|
168
|
+
heartbeat = new Heartbeat({
|
|
169
|
+
url: "https://hub.test",
|
|
170
|
+
token: makeToken(),
|
|
171
|
+
intervalMs: 60_000, // long — we'll trigger manually
|
|
172
|
+
agentName: "test-agent",
|
|
173
|
+
agentId: "agent-1",
|
|
174
|
+
apiKey: "test-api-key",
|
|
175
|
+
workspace: "test-ws",
|
|
176
|
+
onTokenRefresh,
|
|
177
|
+
lifecycleManager,
|
|
178
|
+
fetch: fetchMock,
|
|
179
|
+
});
|
|
180
|
+
heartbeat.start();
|
|
181
|
+
// Wait for re-register to complete after the 401
|
|
182
|
+
await vi.waitFor(() => expect(onTokenRefresh).toHaveBeenCalledWith(newToken), {
|
|
183
|
+
timeout: 3000,
|
|
184
|
+
});
|
|
185
|
+
expect(heartbeat.getToken()).toBe(newToken);
|
|
186
|
+
});
|
|
187
|
+
it("re-registered token survives subsequent heartbeats", async () => {
|
|
188
|
+
const newToken = makeToken("agent-reregistered");
|
|
189
|
+
let heartbeatCount = 0;
|
|
190
|
+
const fetchMock = vi.fn().mockImplementation((url) => {
|
|
191
|
+
if (url.includes("/heartbeat")) {
|
|
192
|
+
heartbeatCount++;
|
|
193
|
+
const status = heartbeatCount === 1 ? 401 : 200;
|
|
194
|
+
return Promise.resolve({ ok: status === 200, status, json: async () => ({}) });
|
|
195
|
+
}
|
|
196
|
+
if (url.includes("/token/refresh")) {
|
|
197
|
+
return Promise.resolve({ ok: false, status: 401, json: async () => ({}) });
|
|
198
|
+
}
|
|
199
|
+
if (url.includes("/agents/register")) {
|
|
200
|
+
return Promise.resolve({
|
|
201
|
+
ok: true,
|
|
202
|
+
status: 200,
|
|
203
|
+
json: async () => ({ token: newToken, expires_at: "2099-01-01T00:00:00Z" }),
|
|
204
|
+
});
|
|
205
|
+
}
|
|
206
|
+
return Promise.resolve({ ok: true, status: 200, json: async () => ({}) });
|
|
207
|
+
});
|
|
208
|
+
const onTokenRefresh = vi.fn();
|
|
209
|
+
const lifecycleManager = new TokenLifecycleManager({
|
|
210
|
+
hubUrl: "https://hub.test",
|
|
211
|
+
initialToken: makeToken(),
|
|
212
|
+
bootstrap: BOOTSTRAP,
|
|
213
|
+
onTokenUpdate: (token) => onTokenRefresh(token),
|
|
214
|
+
fetch: fetchMock,
|
|
215
|
+
checkIntervalMs: 60_000,
|
|
216
|
+
minReregisterIntervalMs: 0,
|
|
217
|
+
});
|
|
218
|
+
heartbeat = new Heartbeat({
|
|
219
|
+
url: "https://hub.test",
|
|
220
|
+
token: makeToken(),
|
|
221
|
+
intervalMs: 60_000,
|
|
222
|
+
agentName: "test-agent",
|
|
223
|
+
agentId: "agent-1",
|
|
224
|
+
apiKey: "test-api-key",
|
|
225
|
+
workspace: "test-ws",
|
|
226
|
+
onTokenRefresh,
|
|
227
|
+
lifecycleManager,
|
|
228
|
+
fetch: fetchMock,
|
|
229
|
+
});
|
|
230
|
+
heartbeat.start();
|
|
231
|
+
await vi.waitFor(() => expect(onTokenRefresh).toHaveBeenCalledWith(newToken), {
|
|
232
|
+
timeout: 3000,
|
|
233
|
+
});
|
|
234
|
+
// After re-register, the token in use should be the new one
|
|
235
|
+
expect(heartbeat.getToken()).toBe(newToken);
|
|
236
|
+
// New token should be used in subsequent Authorization headers
|
|
237
|
+
const registerCall = fetchMock.mock.calls.find((args) => args[0].includes("/agents/register"));
|
|
238
|
+
expect(registerCall).toBeDefined();
|
|
239
|
+
});
|
|
240
|
+
});
|
|
241
|
+
//# sourceMappingURL=token-rejection-recovery.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"token-rejection-recovery.test.js","sourceRoot":"","sources":["../../src/__tests__/token-rejection-recovery.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,162 @@
|
|
|
1
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
2
|
+
import { PROJECT_WATCHER_RENEWAL_INTERVAL_SECONDS } from "../cli/watcher.js";
|
|
3
|
+
import { startProjectWatcherLoop } from "../core/project-watcher-loop.js";
|
|
4
|
+
describe("project watcher loop — tick timer", () => {
|
|
5
|
+
beforeEach(() => {
|
|
6
|
+
vi.useFakeTimers();
|
|
7
|
+
});
|
|
8
|
+
afterEach(() => {
|
|
9
|
+
vi.useRealTimers();
|
|
10
|
+
});
|
|
11
|
+
it("fires onTick at the configured interval", async () => {
|
|
12
|
+
const onTick = vi.fn().mockResolvedValue({
|
|
13
|
+
total_processed: 1,
|
|
14
|
+
total_nudged: 0,
|
|
15
|
+
total_escalated: 0,
|
|
16
|
+
});
|
|
17
|
+
const onRenew = vi
|
|
18
|
+
.fn()
|
|
19
|
+
.mockResolvedValue({ renewed: true, expires_at: "2026-03-28T00:00:00Z" });
|
|
20
|
+
const onLog = vi.fn();
|
|
21
|
+
const onError = vi.fn();
|
|
22
|
+
const onShutdown = vi.fn().mockResolvedValue(undefined);
|
|
23
|
+
const handle = startProjectWatcherLoop({
|
|
24
|
+
intervalSeconds: 60,
|
|
25
|
+
renewalIntervalSeconds: 180,
|
|
26
|
+
onTick,
|
|
27
|
+
onRenew,
|
|
28
|
+
onLog,
|
|
29
|
+
onError,
|
|
30
|
+
onShutdown,
|
|
31
|
+
});
|
|
32
|
+
expect(onTick).not.toHaveBeenCalled();
|
|
33
|
+
// Advance past first tick
|
|
34
|
+
await vi.advanceTimersByTimeAsync(60_001);
|
|
35
|
+
expect(onTick).toHaveBeenCalledTimes(1);
|
|
36
|
+
// Advance past second tick
|
|
37
|
+
await vi.advanceTimersByTimeAsync(60_001);
|
|
38
|
+
expect(onTick).toHaveBeenCalledTimes(2);
|
|
39
|
+
await handle.stop();
|
|
40
|
+
});
|
|
41
|
+
it("logs tick result counts after each tick", async () => {
|
|
42
|
+
const onTick = vi.fn().mockResolvedValue({
|
|
43
|
+
total_processed: 5,
|
|
44
|
+
total_nudged: 2,
|
|
45
|
+
total_escalated: 1,
|
|
46
|
+
});
|
|
47
|
+
const onRenew = vi
|
|
48
|
+
.fn()
|
|
49
|
+
.mockResolvedValue({ renewed: true, expires_at: "2026-03-28T00:00:00Z" });
|
|
50
|
+
const onLog = vi.fn();
|
|
51
|
+
const onError = vi.fn();
|
|
52
|
+
const onShutdown = vi.fn().mockResolvedValue(undefined);
|
|
53
|
+
const handle = startProjectWatcherLoop({
|
|
54
|
+
intervalSeconds: 60,
|
|
55
|
+
renewalIntervalSeconds: 180,
|
|
56
|
+
onTick,
|
|
57
|
+
onRenew,
|
|
58
|
+
onLog,
|
|
59
|
+
onError,
|
|
60
|
+
onShutdown,
|
|
61
|
+
});
|
|
62
|
+
await vi.advanceTimersByTimeAsync(60_001);
|
|
63
|
+
expect(onLog).toHaveBeenCalledWith("[tick] processed=5 nudged=2 escalated=1");
|
|
64
|
+
await handle.stop();
|
|
65
|
+
});
|
|
66
|
+
it("fires onRenew at the renewal interval (not with each tick)", async () => {
|
|
67
|
+
const onTick = vi.fn().mockResolvedValue({
|
|
68
|
+
total_processed: 0,
|
|
69
|
+
total_nudged: 0,
|
|
70
|
+
total_escalated: 0,
|
|
71
|
+
});
|
|
72
|
+
const onRenew = vi
|
|
73
|
+
.fn()
|
|
74
|
+
.mockResolvedValue({ renewed: true, expires_at: "2026-03-28T00:00:00Z" });
|
|
75
|
+
const onLog = vi.fn();
|
|
76
|
+
const onError = vi.fn();
|
|
77
|
+
const onShutdown = vi.fn().mockResolvedValue(undefined);
|
|
78
|
+
const handle = startProjectWatcherLoop({
|
|
79
|
+
intervalSeconds: 60,
|
|
80
|
+
renewalIntervalSeconds: 180,
|
|
81
|
+
onTick,
|
|
82
|
+
onRenew,
|
|
83
|
+
onLog,
|
|
84
|
+
onError,
|
|
85
|
+
onShutdown,
|
|
86
|
+
});
|
|
87
|
+
// 60s: tick fires once, no renewal yet
|
|
88
|
+
await vi.advanceTimersByTimeAsync(60_001);
|
|
89
|
+
expect(onTick).toHaveBeenCalledTimes(1);
|
|
90
|
+
expect(onRenew).toHaveBeenCalledTimes(0);
|
|
91
|
+
// 120s: second tick, still no renewal
|
|
92
|
+
await vi.advanceTimersByTimeAsync(60_001);
|
|
93
|
+
expect(onTick).toHaveBeenCalledTimes(2);
|
|
94
|
+
expect(onRenew).toHaveBeenCalledTimes(0);
|
|
95
|
+
// 180s: third tick AND first renewal
|
|
96
|
+
await vi.advanceTimersByTimeAsync(60_001);
|
|
97
|
+
expect(onTick).toHaveBeenCalledTimes(3);
|
|
98
|
+
expect(onRenew).toHaveBeenCalledTimes(1);
|
|
99
|
+
await handle.stop();
|
|
100
|
+
});
|
|
101
|
+
it("calls onShutdown and stops timers when renewal fails", async () => {
|
|
102
|
+
const onTick = vi.fn().mockResolvedValue({
|
|
103
|
+
total_processed: 0,
|
|
104
|
+
total_nudged: 0,
|
|
105
|
+
total_escalated: 0,
|
|
106
|
+
});
|
|
107
|
+
const onRenew = vi.fn().mockRejectedValue(new Error("network error"));
|
|
108
|
+
const onLog = vi.fn();
|
|
109
|
+
const onError = vi.fn();
|
|
110
|
+
const onShutdown = vi.fn().mockResolvedValue(undefined);
|
|
111
|
+
startProjectWatcherLoop({
|
|
112
|
+
intervalSeconds: 60,
|
|
113
|
+
renewalIntervalSeconds: 180,
|
|
114
|
+
onTick,
|
|
115
|
+
onRenew,
|
|
116
|
+
onLog,
|
|
117
|
+
onError,
|
|
118
|
+
onShutdown,
|
|
119
|
+
});
|
|
120
|
+
// Trigger renewal failure
|
|
121
|
+
await vi.advanceTimersByTimeAsync(180_001);
|
|
122
|
+
// Wait for the async renewal handler to complete
|
|
123
|
+
await vi.runAllTimersAsync();
|
|
124
|
+
expect(onRenew).toHaveBeenCalledTimes(1);
|
|
125
|
+
expect(onError).toHaveBeenCalledWith(expect.stringContaining("[renew] Lease renewal failed"));
|
|
126
|
+
expect(onShutdown).toHaveBeenCalledTimes(1);
|
|
127
|
+
});
|
|
128
|
+
it("stop() clears both timers and calls onShutdown once", async () => {
|
|
129
|
+
const onTick = vi.fn().mockResolvedValue({
|
|
130
|
+
total_processed: 0,
|
|
131
|
+
total_nudged: 0,
|
|
132
|
+
total_escalated: 0,
|
|
133
|
+
});
|
|
134
|
+
const onRenew = vi
|
|
135
|
+
.fn()
|
|
136
|
+
.mockResolvedValue({ renewed: true, expires_at: "2026-03-28T00:00:00Z" });
|
|
137
|
+
const onLog = vi.fn();
|
|
138
|
+
const onError = vi.fn();
|
|
139
|
+
const onShutdown = vi.fn().mockResolvedValue(undefined);
|
|
140
|
+
const handle = startProjectWatcherLoop({
|
|
141
|
+
intervalSeconds: 60,
|
|
142
|
+
renewalIntervalSeconds: 180,
|
|
143
|
+
onTick,
|
|
144
|
+
onRenew,
|
|
145
|
+
onLog,
|
|
146
|
+
onError,
|
|
147
|
+
onShutdown,
|
|
148
|
+
});
|
|
149
|
+
await handle.stop();
|
|
150
|
+
// Advance time well past intervals — no more ticks or renewals should fire
|
|
151
|
+
await vi.advanceTimersByTimeAsync(400_000);
|
|
152
|
+
expect(onTick).toHaveBeenCalledTimes(0);
|
|
153
|
+
expect(onRenew).toHaveBeenCalledTimes(0);
|
|
154
|
+
expect(onShutdown).toHaveBeenCalledTimes(1);
|
|
155
|
+
});
|
|
156
|
+
});
|
|
157
|
+
describe("project watcher renewal interval constant", () => {
|
|
158
|
+
it("renewal interval is 180s (60% of 300s TTL)", () => {
|
|
159
|
+
expect(PROJECT_WATCHER_RENEWAL_INTERVAL_SECONDS).toBe(180);
|
|
160
|
+
});
|
|
161
|
+
});
|
|
162
|
+
//# sourceMappingURL=watcher-runtime.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"watcher-runtime.test.js","sourceRoot":"","sources":["../../src/__tests__/watcher-runtime.test.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/attach.js
CHANGED
|
@@ -1,10 +1,65 @@
|
|
|
1
|
+
import { execSync } from "node:child_process";
|
|
2
|
+
import * as fs from "node:fs";
|
|
3
|
+
import * as path from "node:path";
|
|
1
4
|
import pc from "picocolors";
|
|
2
5
|
import { attachSession, getSessionName, sessionExists } from "../core/tmux.js";
|
|
6
|
+
const WATCHER_STATE_PATH = path.join(process.env.HOME || ".", ".agentmesh", "watcher-state.json");
|
|
7
|
+
function loadWatcherState() {
|
|
8
|
+
try {
|
|
9
|
+
if (!fs.existsSync(WATCHER_STATE_PATH))
|
|
10
|
+
return { watchers: [] };
|
|
11
|
+
return JSON.parse(fs.readFileSync(WATCHER_STATE_PATH, "utf-8"));
|
|
12
|
+
}
|
|
13
|
+
catch {
|
|
14
|
+
return { watchers: [] };
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
function tmuxSessionExists(sessionName) {
|
|
18
|
+
try {
|
|
19
|
+
execSync(`tmux has-session -t "${sessionName}" 2>/dev/null`);
|
|
20
|
+
return true;
|
|
21
|
+
}
|
|
22
|
+
catch {
|
|
23
|
+
return false;
|
|
24
|
+
}
|
|
25
|
+
}
|
|
3
26
|
export function attach(name) {
|
|
4
27
|
if (!name) {
|
|
5
28
|
console.log(pc.red("Agent name is required."));
|
|
6
29
|
process.exit(1);
|
|
7
30
|
}
|
|
31
|
+
// Handle watcher sessions: `watcher-<code>` names bypass the agentmesh- prefix
|
|
32
|
+
if (name.startsWith("watcher-")) {
|
|
33
|
+
const watcherSession = name; // session is named exactly as given (e.g. "watcher-mesh")
|
|
34
|
+
if (tmuxSessionExists(watcherSession)) {
|
|
35
|
+
console.log(`Attaching to ${watcherSession}...`);
|
|
36
|
+
console.log(pc.dim("Detach with: Ctrl+B, D\n"));
|
|
37
|
+
try {
|
|
38
|
+
execSync(`tmux attach-session -t "${watcherSession}"`, { stdio: "inherit" });
|
|
39
|
+
}
|
|
40
|
+
catch {
|
|
41
|
+
// tmux attach exits non-zero when user detaches — that's expected
|
|
42
|
+
}
|
|
43
|
+
return;
|
|
44
|
+
}
|
|
45
|
+
// Not found — check watcher-state.json for a matching entry
|
|
46
|
+
const state = loadWatcherState();
|
|
47
|
+
const entry = state.watchers.find((w) => w.sessionName === name);
|
|
48
|
+
if (entry) {
|
|
49
|
+
const stateMsg = entry.status === "stopped" ? " (stopped)" : " (not running)";
|
|
50
|
+
console.log(pc.red(`Watcher session "${name}" not found in tmux${stateMsg}.`));
|
|
51
|
+
if (entry.projectId) {
|
|
52
|
+
console.log(` Start with: ${pc.cyan(`agentmesh watcher start --project-id ${entry.projectId}`)}`);
|
|
53
|
+
console.log(` Status: ${pc.cyan(`agentmesh watcher status --project-id ${entry.projectId}`)}`);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
else {
|
|
57
|
+
console.log(pc.red(`Watcher session "${name}" not found. Is the watcher running?`));
|
|
58
|
+
console.log(` Start with: ${pc.cyan("agentmesh watcher start --project-id <id>")}`);
|
|
59
|
+
}
|
|
60
|
+
process.exit(1);
|
|
61
|
+
}
|
|
62
|
+
// Standard agent attach
|
|
8
63
|
const sessionName = getSessionName(name);
|
|
9
64
|
if (!sessionExists(sessionName)) {
|
|
10
65
|
console.log(pc.red(`Agent "${name}" is not running.`));
|
package/dist/cli/attach.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attach.js","sourceRoot":"","sources":["../../src/cli/attach.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE/E,MAAM,UAAU,MAAM,CAAC,IAAY;IACjC,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,CAAC;QAC/C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;IAEzC,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC;QAChC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,IAAI,mBAAmB,CAAC,CAAC,CAAC;QACvD,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC,IAAI,CAAC,0BAA0B,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;QAC3E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,gBAAgB,WAAW,KAAK,CAAC,CAAC;IAC9C,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC,CAAC;IAEhD,aAAa,CAAC,IAAI,CAAC,CAAC;AACtB,CAAC"}
|
|
1
|
+
{"version":3,"file":"attach.js","sourceRoot":"","sources":["../../src/cli/attach.ts"],"names":[],"mappings":"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"}
|