@tyvm/knowhow 0.0.153 → 0.0.155
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/package.json +1 -1
- package/src/agents/base/base.ts +72 -28
- package/src/agents/base/prompt.ts +3 -2
- package/src/agents/tools/list.ts +31 -28
- package/src/auth/keyAuth.ts +35 -3
- package/src/chat/modules/AgentModule.ts +98 -42
- package/src/clients/anthropic.ts +3 -1
- package/src/clients/contextLimits.ts +3 -1
- package/src/clients/gemini.ts +16 -4
- package/src/clients/http.ts +8 -5
- package/src/clients/index.ts +7 -4
- package/src/clients/knowhowMcp.ts +2 -2
- package/src/clients/openai.ts +44 -8
- package/src/clients/pricing/google.ts +11 -2
- package/src/clients/pricing/xai.ts +5 -1
- package/src/clients/xai.ts +6 -3
- package/src/services/KnowhowClient.ts +6 -5
- package/src/services/watchers/FsSyncer.ts +40 -2
- package/src/services/watchers/RemoteSyncer.ts +40 -2
- package/src/tunnel.ts +18 -12
- package/src/worker.ts +62 -12
- package/tests/clients/reasoningEffort.test.ts +62 -1
- package/tests/unit/auth/keyAuth.test.ts +31 -2
- package/tests/unit/services/KnowhowClient.test.ts +84 -0
- package/tests/unit/services/SyncedAgentWatcher.test.ts +89 -0
- package/ts_build/package.json +1 -1
- package/ts_build/src/agents/base/base.d.ts +2 -1
- package/ts_build/src/agents/base/base.js +39 -26
- package/ts_build/src/agents/base/base.js.map +1 -1
- package/ts_build/src/agents/base/prompt.d.ts +1 -1
- package/ts_build/src/agents/base/prompt.js +3 -2
- package/ts_build/src/agents/base/prompt.js.map +1 -1
- package/ts_build/src/agents/tools/list.js +0 -26
- package/ts_build/src/agents/tools/list.js.map +1 -1
- package/ts_build/src/auth/keyAuth.d.ts +1 -0
- package/ts_build/src/auth/keyAuth.js +19 -2
- package/ts_build/src/auth/keyAuth.js.map +1 -1
- package/ts_build/src/chat/modules/AgentModule.d.ts +3 -0
- package/ts_build/src/chat/modules/AgentModule.js +74 -34
- package/ts_build/src/chat/modules/AgentModule.js.map +1 -1
- package/ts_build/src/clients/anthropic.js +3 -1
- package/ts_build/src/clients/anthropic.js.map +1 -1
- package/ts_build/src/clients/contextLimits.js +2 -0
- package/ts_build/src/clients/contextLimits.js.map +1 -1
- package/ts_build/src/clients/gemini.js +14 -3
- package/ts_build/src/clients/gemini.js.map +1 -1
- package/ts_build/src/clients/http.js +8 -5
- package/ts_build/src/clients/http.js.map +1 -1
- package/ts_build/src/clients/index.js +7 -4
- package/ts_build/src/clients/index.js.map +1 -1
- package/ts_build/src/clients/knowhowMcp.js +2 -2
- package/ts_build/src/clients/knowhowMcp.js.map +1 -1
- package/ts_build/src/clients/openai.js +36 -8
- package/ts_build/src/clients/openai.js.map +1 -1
- package/ts_build/src/clients/pricing/google.d.ts +1 -0
- package/ts_build/src/clients/pricing/google.js +7 -0
- package/ts_build/src/clients/pricing/google.js.map +1 -1
- package/ts_build/src/clients/pricing/xai.d.ts +1 -0
- package/ts_build/src/clients/pricing/xai.js +4 -0
- package/ts_build/src/clients/pricing/xai.js.map +1 -1
- package/ts_build/src/clients/xai.js +6 -3
- package/ts_build/src/clients/xai.js.map +1 -1
- package/ts_build/src/services/KnowhowClient.js +5 -3
- package/ts_build/src/services/KnowhowClient.js.map +1 -1
- package/ts_build/src/services/watchers/FsSyncer.d.ts +4 -0
- package/ts_build/src/services/watchers/FsSyncer.js +36 -2
- package/ts_build/src/services/watchers/FsSyncer.js.map +1 -1
- package/ts_build/src/services/watchers/RemoteSyncer.d.ts +4 -0
- package/ts_build/src/services/watchers/RemoteSyncer.js +36 -2
- package/ts_build/src/services/watchers/RemoteSyncer.js.map +1 -1
- package/ts_build/src/tunnel.js +11 -8
- package/ts_build/src/tunnel.js.map +1 -1
- package/ts_build/src/types.d.ts +2 -0
- package/ts_build/src/worker.js +47 -10
- package/ts_build/src/worker.js.map +1 -1
- package/ts_build/tests/clients/reasoningEffort.test.js +49 -1
- package/ts_build/tests/clients/reasoningEffort.test.js.map +1 -1
- package/ts_build/tests/unit/auth/keyAuth.test.js +22 -2
- package/ts_build/tests/unit/auth/keyAuth.test.js.map +1 -1
- package/ts_build/tests/unit/services/KnowhowClient.test.d.ts +1 -0
- package/ts_build/tests/unit/services/KnowhowClient.test.js +69 -0
- package/ts_build/tests/unit/services/KnowhowClient.test.js.map +1 -0
- package/ts_build/tests/unit/services/SyncedAgentWatcher.test.d.ts +1 -0
- package/ts_build/tests/unit/services/SyncedAgentWatcher.test.js +78 -0
- package/ts_build/tests/unit/services/SyncedAgentWatcher.test.js.map +1 -0
package/ts_build/src/worker.js
CHANGED
|
@@ -44,6 +44,7 @@ const login_1 = require("./login");
|
|
|
44
44
|
const services_1 = require("./services");
|
|
45
45
|
const PasskeySetup_1 = require("./workers/auth/PasskeySetup");
|
|
46
46
|
const WorkerPasskeyAuth_1 = require("./workers/auth/WorkerPasskeyAuth");
|
|
47
|
+
const keyAuth_1 = require("./auth/keyAuth");
|
|
47
48
|
const tools_1 = require("./workers/tools");
|
|
48
49
|
const Mcp_1 = require("./services/Mcp");
|
|
49
50
|
const allTools = __importStar(require("./agents/tools"));
|
|
@@ -243,8 +244,8 @@ async function worker(options) {
|
|
|
243
244
|
let connected = false;
|
|
244
245
|
let tunnelHandler = null;
|
|
245
246
|
let tunnelWs = null;
|
|
246
|
-
let lastJwt = null;
|
|
247
247
|
let unauthorizedJwt = null;
|
|
248
|
+
let refreshAttemptedJwt = null;
|
|
248
249
|
const PONG_TIMEOUT_MS = 15000;
|
|
249
250
|
let awaitingPong = false;
|
|
250
251
|
let lastPongAt = Date.now();
|
|
@@ -269,7 +270,6 @@ async function worker(options) {
|
|
|
269
270
|
async function connectWebSocket() {
|
|
270
271
|
const jwt = await (0, login_1.loadJwt)();
|
|
271
272
|
console.log(`Connecting to ${API_URL}`);
|
|
272
|
-
lastJwt = jwt;
|
|
273
273
|
await mcpServer.reset();
|
|
274
274
|
mcpServer.withTools(toolsToUse);
|
|
275
275
|
const dir = process.cwd();
|
|
@@ -355,9 +355,12 @@ async function worker(options) {
|
|
|
355
355
|
},
|
|
356
356
|
onClose: (code, _reason) => {
|
|
357
357
|
if (code === 1008) {
|
|
358
|
-
unauthorizedJwt =
|
|
358
|
+
unauthorizedJwt = jwt;
|
|
359
|
+
if (ws.readyState !== ws_1.WebSocket.CLOSED) {
|
|
360
|
+
ws.terminate();
|
|
361
|
+
}
|
|
359
362
|
console.error("❌ Tunnel received Unauthorized (1008). The JWT may be expired.");
|
|
360
|
-
console.error("
|
|
363
|
+
console.error(" Attempting to refresh the JWT with the CLI identity...");
|
|
361
364
|
}
|
|
362
365
|
else {
|
|
363
366
|
console.log("Tunnel connection will reconnect on next connection cycle...");
|
|
@@ -392,10 +395,12 @@ async function worker(options) {
|
|
|
392
395
|
}
|
|
393
396
|
connected = false;
|
|
394
397
|
if (code === 1008) {
|
|
395
|
-
unauthorizedJwt =
|
|
398
|
+
unauthorizedJwt = jwt;
|
|
399
|
+
if (tunnelConnection?.readyState !== ws_1.WebSocket.CLOSED) {
|
|
400
|
+
tunnelConnection?.terminate();
|
|
401
|
+
}
|
|
396
402
|
console.error("❌ Worker received Unauthorized (1008). The JWT may be expired.");
|
|
397
|
-
console.error("
|
|
398
|
-
console.error(" Pausing reconnection until JWT changes...");
|
|
403
|
+
console.error(" Attempting to refresh the JWT with the CLI identity...");
|
|
399
404
|
}
|
|
400
405
|
else {
|
|
401
406
|
console.log("Attempting to reconnect...");
|
|
@@ -411,13 +416,45 @@ async function worker(options) {
|
|
|
411
416
|
while (true) {
|
|
412
417
|
if (!connected) {
|
|
413
418
|
if (unauthorizedJwt !== null) {
|
|
414
|
-
|
|
419
|
+
let currentJwt = await (0, login_1.loadJwt)().catch(() => null);
|
|
415
420
|
if (currentJwt === unauthorizedJwt) {
|
|
416
|
-
|
|
417
|
-
|
|
421
|
+
let attemptedRefreshNow = false;
|
|
422
|
+
if (refreshAttemptedJwt !== currentJwt) {
|
|
423
|
+
refreshAttemptedJwt = currentJwt;
|
|
424
|
+
attemptedRefreshNow = true;
|
|
425
|
+
const freshConfig = await (0, config_1.getConfig)();
|
|
426
|
+
const identityPath = freshConfig.cliIdentityPath;
|
|
427
|
+
if (freshConfig.orgId && (0, keyAuth_1.hasKeyPair)(identityPath)) {
|
|
428
|
+
try {
|
|
429
|
+
const refreshed = await (0, keyAuth_1.authenticateWithKey)(freshConfig.orgId, API_URL, identityPath);
|
|
430
|
+
if (refreshed) {
|
|
431
|
+
currentJwt = await (0, login_1.loadJwt)();
|
|
432
|
+
console.log("✅ JWT refreshed automatically; reconnecting...");
|
|
433
|
+
}
|
|
434
|
+
else {
|
|
435
|
+
console.error("❌ CLI identity was rejected and could not refresh the JWT.");
|
|
436
|
+
}
|
|
437
|
+
}
|
|
438
|
+
catch (error) {
|
|
439
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
440
|
+
console.error(`❌ Automatic JWT refresh failed: ${message}`);
|
|
441
|
+
}
|
|
442
|
+
}
|
|
443
|
+
else {
|
|
444
|
+
console.error("❌ No registered CLI identity is available for automatic JWT refresh.");
|
|
445
|
+
}
|
|
446
|
+
}
|
|
447
|
+
if (currentJwt === unauthorizedJwt) {
|
|
448
|
+
if (attemptedRefreshNow) {
|
|
449
|
+
console.error(" Run 'knowhow login' in another shell; reconnection will resume when the JWT changes.");
|
|
450
|
+
}
|
|
451
|
+
await (0, utils_1.wait)(5000);
|
|
452
|
+
continue;
|
|
453
|
+
}
|
|
418
454
|
}
|
|
419
455
|
console.log("🔄 JWT has changed, attempting to reconnect...");
|
|
420
456
|
unauthorizedJwt = null;
|
|
457
|
+
refreshAttemptedJwt = null;
|
|
421
458
|
}
|
|
422
459
|
console.log("Attempting to connect...");
|
|
423
460
|
connection = await connectWebSocket();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/worker.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/worker.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,14 +35,62 @@ describe("reasoning effort values", () => {
|
|
|
35
35
|
expect(client.resolveReasoningEffort(options("unknown", "max"))).toBe("high");
|
|
36
36
|
expect(client.resolveReasoningEffortForModel(options("unknown", "max"))).toBe("xhigh");
|
|
37
37
|
});
|
|
38
|
+
it("explicitly disables reasoning in Responses API requests", async () => {
|
|
39
|
+
const client = new openai_1.GenericOpenAiClient("fake-key");
|
|
40
|
+
const create = jest.fn().mockResolvedValue({
|
|
41
|
+
id: "resp_disabled",
|
|
42
|
+
status: "completed",
|
|
43
|
+
output: [{ type: "message", content: [{ type: "output_text", text: "summary" }] }],
|
|
44
|
+
usage: { input_tokens: 1, output_tokens: 1 },
|
|
45
|
+
});
|
|
46
|
+
client.client.responses.create = create;
|
|
47
|
+
await client.createChatResponse({
|
|
48
|
+
model: types_2.Models.openai.GPT_56_Sol,
|
|
49
|
+
messages: [{ role: "user", content: "summarize" }],
|
|
50
|
+
reasoning_effort: "none",
|
|
51
|
+
});
|
|
52
|
+
expect(create).toHaveBeenCalledWith(expect.objectContaining({ reasoning: { effort: "none" } }));
|
|
53
|
+
});
|
|
54
|
+
it("diagnoses empty Responses output but not valid tool-only output", async () => {
|
|
55
|
+
const client = new openai_1.GenericOpenAiClient("fake-key");
|
|
56
|
+
const warn = jest.spyOn(console, "warn").mockImplementation(() => undefined);
|
|
57
|
+
const create = jest.fn()
|
|
58
|
+
.mockResolvedValueOnce({
|
|
59
|
+
id: "resp_empty",
|
|
60
|
+
status: "incomplete",
|
|
61
|
+
incomplete_details: { reason: "max_output_tokens" },
|
|
62
|
+
output: [{ type: "reasoning", summary: [] }],
|
|
63
|
+
usage: { input_tokens: 2, output_tokens: 3 },
|
|
64
|
+
})
|
|
65
|
+
.mockResolvedValueOnce({
|
|
66
|
+
id: "resp_tool",
|
|
67
|
+
status: "completed",
|
|
68
|
+
output: [{
|
|
69
|
+
type: "function_call", call_id: "call_1", name: "readFile", arguments: "{}",
|
|
70
|
+
}],
|
|
71
|
+
usage: { input_tokens: 2, output_tokens: 3 },
|
|
72
|
+
});
|
|
73
|
+
client.client.responses.create = create;
|
|
74
|
+
const request = {
|
|
75
|
+
model: types_2.Models.openai.GPT_56_Sol,
|
|
76
|
+
messages: [{ role: "user", content: "continue" }],
|
|
77
|
+
};
|
|
78
|
+
await client.createChatResponse(request);
|
|
79
|
+
expect(warn).toHaveBeenCalledWith("[Responses API] Response contained no text or tool calls", expect.objectContaining({ responseId: "resp_empty", status: "incomplete" }));
|
|
80
|
+
warn.mockClear();
|
|
81
|
+
await client.createChatResponse(request);
|
|
82
|
+
expect(warn).not.toHaveBeenCalled();
|
|
83
|
+
warn.mockRestore();
|
|
84
|
+
});
|
|
38
85
|
it("maps all values to valid Gemini thinking levels and budgets", () => {
|
|
39
86
|
const client = new gemini_1.GenericGeminiClient("fake-key");
|
|
40
|
-
const levelModel = types_2.GoogleThinkingLevelModels
|
|
87
|
+
const levelModel = types_2.GoogleThinkingLevelModels.find((model) => model !== types_2.Models.google.Gemini_37_Flash);
|
|
41
88
|
const budgetModel = types_2.GoogleThinkingBudgetModels[0];
|
|
42
89
|
expect(client.buildThinkingConfig(options(levelModel, "none"))).toEqual({ thinkingLevel: "minimal" });
|
|
43
90
|
expect(client.buildThinkingConfig(options(levelModel, "minimal"))).toEqual({ thinkingLevel: "minimal" });
|
|
44
91
|
expect(client.buildThinkingConfig(options(levelModel, "xhigh"))).toEqual({ thinkingLevel: "high" });
|
|
45
92
|
expect(client.buildThinkingConfig(options(levelModel, "max"))).toEqual({ thinkingLevel: "high" });
|
|
93
|
+
expect(client.buildThinkingConfig(options(types_2.Models.google.Gemini_37_Flash, "minimal"))).toEqual({ thinkingLevel: "low" });
|
|
46
94
|
expect(client.buildThinkingConfig(options(budgetModel, "none"))).toEqual({ thinkingBudget: 0 });
|
|
47
95
|
expect(client.buildThinkingConfig(options(budgetModel, "minimal"))).toEqual({ thinkingBudget: 512 });
|
|
48
96
|
expect(client.buildThinkingConfig(options(budgetModel, "medium"))).toEqual({ thinkingBudget: 8192 });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reasoningEffort.test.js","sourceRoot":"","sources":["../../../tests/clients/reasoningEffort.test.ts"],"names":[],"mappings":";;AAAA,2DAAqE;AACrE,qDAA+D;AAC/D,qDAA+D;AAC/D,uDAA4D;AAC5D,mDAIiC;AACjC,
|
|
1
|
+
{"version":3,"file":"reasoningEffort.test.js","sourceRoot":"","sources":["../../../tests/clients/reasoningEffort.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,7 @@ jest.mock("../../../src/utils/http", () => ({
|
|
|
13
13
|
},
|
|
14
14
|
}));
|
|
15
15
|
jest.mock("../../../src/auth/keyManager", () => ({
|
|
16
|
+
getDefaultPrivateKeyPath: () => "/keys/default",
|
|
16
17
|
keyPairExists,
|
|
17
18
|
loadKeyPair,
|
|
18
19
|
signMessage,
|
|
@@ -54,10 +55,29 @@ describe("keyAuth", () => {
|
|
|
54
55
|
],
|
|
55
56
|
]);
|
|
56
57
|
});
|
|
58
|
+
it("uses the registered default identity when a configured identity is rejected", async () => {
|
|
59
|
+
post
|
|
60
|
+
.mockRejectedValueOnce({ status: 401 })
|
|
61
|
+
.mockResolvedValueOnce({
|
|
62
|
+
data: {
|
|
63
|
+
challengeId: "challenge_2",
|
|
64
|
+
message: "default key challenge",
|
|
65
|
+
expiresAt: "2099-01-01T00:00:00.000Z",
|
|
66
|
+
},
|
|
67
|
+
status: 201,
|
|
68
|
+
})
|
|
69
|
+
.mockResolvedValueOnce({ data: { jwt: "default-key-jwt" }, status: 200 });
|
|
70
|
+
await expect((0, keyAuth_1.exchangeAvailablePublicKeyJwt)("org-1", "https://work.example", "/keys/stale")).resolves.toBe("default-key-jwt");
|
|
71
|
+
expect(loadKeyPair.mock.calls).toEqual([
|
|
72
|
+
["/keys/stale"],
|
|
73
|
+
["/keys/default"],
|
|
74
|
+
]);
|
|
75
|
+
expect(signMessage).toHaveBeenCalledWith("default key challenge", "/keys/default");
|
|
76
|
+
});
|
|
57
77
|
it("falls back when the key is unavailable without signing a challenge", async () => {
|
|
58
|
-
post.
|
|
78
|
+
post.mockRejectedValue({ status: 401 });
|
|
59
79
|
await expect((0, keyAuth_1.authenticateWithKey)("org-1", "https://work.example", "/keys/work")).resolves.toBe(false);
|
|
60
|
-
expect(post).toHaveBeenCalledTimes(
|
|
80
|
+
expect(post).toHaveBeenCalledTimes(2);
|
|
61
81
|
expect(signMessage).not.toHaveBeenCalled();
|
|
62
82
|
});
|
|
63
83
|
it("registers only server-owned Ed25519 key fields in the selected environment", async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyAuth.test.js","sourceRoot":"","sources":["../../../../tests/unit/auth/keyAuth.test.ts"],"names":[],"mappings":";;AAAA,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;AACvB,MAAM,eAAe,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAC/D,MAAM,aAAa,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;AAC1C,MAAM,WAAW,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC;AACzD,MAAM,WAAW,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,0BAA0B,CAAC,CAAC;AAE9D,IAAI,CAAC,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE,CAAC,CAAC;IAC1C,UAAU,EAAE,IAAI;IAChB,OAAO,EAAE;QACP,IAAI;QACJ,WAAW,EAAE,CAAC,KAAc,EAAE,EAAE,CAC9B,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,QAAQ,IAAI,KAAK;KACnE;CACF,CAAC,CAAC,CAAC;AAEJ,IAAI,CAAC,IAAI,CAAC,8BAA8B,EAAE,GAAG,EAAE,CAAC,CAAC;IAC/C,aAAa;IACb,WAAW;IACX,WAAW;CACZ,CAAC,CAAC,CAAC;AAEJ,IAAI,CAAC,IAAI,CAAC,gCAAgC,EAAE,GAAG,EAAE,CAAC,CAAC;IACjD,eAAe,EAAE,GAAG,EAAE,CAAC,YAAY;CACpC,CAAC,CAAC,CAAC;AAEJ,
|
|
1
|
+
{"version":3,"file":"keyAuth.test.js","sourceRoot":"","sources":["../../../../tests/unit/auth/keyAuth.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const fs_1 = __importDefault(require("fs"));
|
|
7
|
+
const mockGet = jest.fn();
|
|
8
|
+
const mockExchangePublicKeyJwt = jest.fn();
|
|
9
|
+
const mockStoreJwt = jest.fn();
|
|
10
|
+
jest.mock("../../../src/utils/http", () => {
|
|
11
|
+
const actual = jest.requireActual("../../../src/utils/http");
|
|
12
|
+
const mockedHttp = {
|
|
13
|
+
get: (...args) => mockGet(...args),
|
|
14
|
+
};
|
|
15
|
+
return {
|
|
16
|
+
__esModule: true,
|
|
17
|
+
...actual,
|
|
18
|
+
http: mockedHttp,
|
|
19
|
+
default: mockedHttp,
|
|
20
|
+
};
|
|
21
|
+
});
|
|
22
|
+
jest.mock("../../../src/config", () => ({
|
|
23
|
+
getConfigSync: jest.fn().mockReturnValue({
|
|
24
|
+
orgId: "org-1",
|
|
25
|
+
cliIdentityPath: "/tmp/identity",
|
|
26
|
+
}),
|
|
27
|
+
}));
|
|
28
|
+
jest.mock("../../../src/auth/keyManager", () => ({
|
|
29
|
+
keyPairExists: jest.fn().mockReturnValue(true),
|
|
30
|
+
}));
|
|
31
|
+
jest.mock("../../../src/auth/keyAuth", () => ({
|
|
32
|
+
exchangeAvailablePublicKeyJwt: (...args) => mockExchangePublicKeyJwt(...args),
|
|
33
|
+
storeJwt: (...args) => mockStoreJwt(...args),
|
|
34
|
+
}));
|
|
35
|
+
const KnowhowClient_1 = require("../../../src/services/KnowhowClient");
|
|
36
|
+
describe("KnowhowSimpleClient identity renewal", () => {
|
|
37
|
+
afterEach(() => {
|
|
38
|
+
jest.restoreAllMocks();
|
|
39
|
+
jest.clearAllMocks();
|
|
40
|
+
});
|
|
41
|
+
it("obtains a JWT from the registered identity before loading models when no JWT exists", async () => {
|
|
42
|
+
jest.spyOn(fs_1.default, "existsSync").mockReturnValue(false);
|
|
43
|
+
mockExchangePublicKeyJwt.mockResolvedValue("fresh-jwt");
|
|
44
|
+
mockGet.mockResolvedValueOnce({ data: { data: [] } });
|
|
45
|
+
const client = new KnowhowClient_1.KnowhowSimpleClient("https://api.example.test");
|
|
46
|
+
await client.getModels();
|
|
47
|
+
expect(mockExchangePublicKeyJwt).toHaveBeenCalledWith("org-1", "https://api.example.test", "/tmp/identity");
|
|
48
|
+
expect(mockStoreJwt).toHaveBeenCalledWith("fresh-jwt");
|
|
49
|
+
expect(mockGet.mock.calls[0][1].headers.Authorization).toBe("Bearer fresh-jwt");
|
|
50
|
+
});
|
|
51
|
+
it("replaces an expired JWT with one signed by the registered identity before loading models", async () => {
|
|
52
|
+
const expiredJwt = [
|
|
53
|
+
Buffer.from('{"alg":"none"}').toString("base64url"),
|
|
54
|
+
Buffer.from('{"exp":0}').toString("base64url"),
|
|
55
|
+
"old-signature",
|
|
56
|
+
].join(".");
|
|
57
|
+
jest.spyOn(fs_1.default, "existsSync").mockReturnValue(true);
|
|
58
|
+
jest.spyOn(fs_1.default, "readFileSync").mockReturnValue(expiredJwt);
|
|
59
|
+
mockExchangePublicKeyJwt.mockResolvedValue("fresh-jwt");
|
|
60
|
+
mockGet.mockResolvedValueOnce({ data: { data: [] } });
|
|
61
|
+
const client = new KnowhowClient_1.KnowhowSimpleClient("https://api.example.test");
|
|
62
|
+
await client.getModels();
|
|
63
|
+
expect(mockExchangePublicKeyJwt).toHaveBeenCalledWith("org-1", "https://api.example.test", "/tmp/identity");
|
|
64
|
+
expect(mockStoreJwt).toHaveBeenCalledWith("fresh-jwt");
|
|
65
|
+
expect(mockGet).toHaveBeenCalledTimes(1);
|
|
66
|
+
expect(mockGet.mock.calls[0][1].headers.Authorization).toBe("Bearer fresh-jwt");
|
|
67
|
+
});
|
|
68
|
+
});
|
|
69
|
+
//# sourceMappingURL=KnowhowClient.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"KnowhowClient.test.js","sourceRoot":"","sources":["../../../../tests/unit/services/KnowhowClient.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const FsSyncer_1 = require("../../../src/services/watchers/FsSyncer");
|
|
4
|
+
const RemoteSyncer_1 = require("../../../src/services/watchers/RemoteSyncer");
|
|
5
|
+
const retained = { role: "assistant", content: "before compaction" };
|
|
6
|
+
const oldThread = [
|
|
7
|
+
{ role: "system", content: "instructions" },
|
|
8
|
+
{ role: "user", content: "task" },
|
|
9
|
+
retained,
|
|
10
|
+
];
|
|
11
|
+
const compactedThread = [
|
|
12
|
+
{ role: "system", content: "instructions" },
|
|
13
|
+
{ role: "user", content: "compressed summary" },
|
|
14
|
+
retained,
|
|
15
|
+
{ role: "assistant", content: "after compaction" },
|
|
16
|
+
];
|
|
17
|
+
function seedCursor(watcher) {
|
|
18
|
+
watcher.taskId = "task-1";
|
|
19
|
+
watcher.agentName = "Developer";
|
|
20
|
+
watcher.lastThreadIndex = 0;
|
|
21
|
+
watcher.lastThreadLength = oldThread.length;
|
|
22
|
+
watcher.lastMessageJson = JSON.stringify(retained);
|
|
23
|
+
}
|
|
24
|
+
describe("synced agent watcher thread rollover", () => {
|
|
25
|
+
it("continues rendering after filesystem agent compaction", async () => {
|
|
26
|
+
const watcher = new FsSyncer_1.FsSyncedAgentWatcher();
|
|
27
|
+
seedCursor(watcher);
|
|
28
|
+
watcher.readMetadata = jest.fn().mockResolvedValue({
|
|
29
|
+
threads: [oldThread, compactedThread],
|
|
30
|
+
status: "running",
|
|
31
|
+
});
|
|
32
|
+
const messages = [];
|
|
33
|
+
watcher.agentEvents.on(watcher.eventTypes.agentSay, (data) => {
|
|
34
|
+
messages.push(data.message);
|
|
35
|
+
});
|
|
36
|
+
await watcher.onMetadataChanged();
|
|
37
|
+
expect(messages).toEqual(["after compaction"]);
|
|
38
|
+
expect(watcher.lastThreadIndex).toBe(1);
|
|
39
|
+
expect(watcher.lastThreadLength).toBe(compactedThread.length);
|
|
40
|
+
});
|
|
41
|
+
it("continues rendering after web agent compaction", async () => {
|
|
42
|
+
const client = {
|
|
43
|
+
getTaskDetails: jest.fn().mockResolvedValue({
|
|
44
|
+
data: {
|
|
45
|
+
threads: [oldThread, compactedThread],
|
|
46
|
+
status: "running",
|
|
47
|
+
},
|
|
48
|
+
}),
|
|
49
|
+
};
|
|
50
|
+
const watcher = new RemoteSyncer_1.WebSyncedAgentWatcher(client);
|
|
51
|
+
seedCursor(watcher);
|
|
52
|
+
const messages = [];
|
|
53
|
+
watcher.agentEvents.on(watcher.eventTypes.agentSay, (data) => {
|
|
54
|
+
messages.push(data.message);
|
|
55
|
+
});
|
|
56
|
+
await watcher.onPoll();
|
|
57
|
+
expect(messages).toEqual(["after compaction"]);
|
|
58
|
+
expect(watcher.lastThreadIndex).toBe(1);
|
|
59
|
+
expect(watcher.lastThreadLength).toBe(compactedThread.length);
|
|
60
|
+
});
|
|
61
|
+
it("resets a cursor when a thread shrinks without changing index", async () => {
|
|
62
|
+
const watcher = new FsSyncer_1.FsSyncedAgentWatcher();
|
|
63
|
+
seedCursor(watcher);
|
|
64
|
+
watcher.lastThreadLength = 10;
|
|
65
|
+
watcher.readMetadata = jest.fn().mockResolvedValue({
|
|
66
|
+
threads: [compactedThread],
|
|
67
|
+
status: "running",
|
|
68
|
+
});
|
|
69
|
+
const messages = [];
|
|
70
|
+
watcher.agentEvents.on(watcher.eventTypes.agentSay, (data) => {
|
|
71
|
+
messages.push(data.message);
|
|
72
|
+
});
|
|
73
|
+
await watcher.onMetadataChanged();
|
|
74
|
+
expect(messages).toEqual(["after compaction"]);
|
|
75
|
+
expect(watcher.lastThreadLength).toBe(compactedThread.length);
|
|
76
|
+
});
|
|
77
|
+
});
|
|
78
|
+
//# sourceMappingURL=SyncedAgentWatcher.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SyncedAgentWatcher.test.js","sourceRoot":"","sources":["../../../../tests/unit/services/SyncedAgentWatcher.test.ts"],"names":[],"mappings":"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"}
|