@tyvm/knowhow 0.0.108 → 0.0.109
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/README.md +45 -0
- package/package.json +9 -4
- package/scripts/publish.sh +86 -0
- package/src/agents/base/base.ts +10 -0
- package/src/agents/tools/execCommand.ts +49 -6
- package/src/agents/tools/index.ts +0 -1
- package/src/agents/tools/list.ts +0 -2
- package/src/chat/CliChatService.ts +10 -1
- package/src/chat/modules/AgentModule.ts +55 -30
- package/src/chat/modules/SessionsModule.ts +7 -2
- package/src/chat/renderer/CompactRenderer.ts +20 -0
- package/src/chat/renderer/ConsoleRenderer.ts +19 -0
- package/src/chat/renderer/FancyRenderer.ts +19 -0
- package/src/chat/renderer/types.ts +11 -0
- package/src/cli.ts +91 -659
- package/src/clients/anthropic.ts +17 -16
- package/src/clients/index.ts +6 -5
- package/src/clients/types.ts +19 -4
- package/src/cloudWorker.ts +175 -113
- package/src/commands/agent.ts +246 -0
- package/src/commands/misc.ts +174 -0
- package/src/commands/modules.ts +182 -0
- package/src/commands/services.ts +77 -0
- package/src/commands/workers.ts +168 -0
- package/src/config.ts +37 -0
- package/src/fileSync.ts +50 -17
- package/src/index.ts +18 -0
- package/src/logger.ts +197 -0
- package/src/plugins/embedding.ts +11 -6
- package/src/plugins/plugins.ts +0 -21
- package/src/plugins/vim.ts +5 -16
- package/src/processors/JsonCompressor.ts +6 -6
- package/src/services/EventService.ts +61 -1
- package/src/services/KnowhowClient.ts +34 -4
- package/src/services/modules/index.ts +70 -50
- package/src/services/modules/types.ts +6 -0
- package/src/tunnel.ts +216 -0
- package/src/types.ts +0 -1
- package/src/worker.ts +105 -312
- package/src/workers/auth/WsMiddleware.ts +99 -0
- package/src/workers/auth/authMiddleware.ts +104 -0
- package/src/workers/auth/types.ts +14 -2
- package/src/workers/tools/index.ts +2 -0
- package/src/workers/tools/reloadConfig.ts +84 -0
- package/tests/services/WorkerReloadConfig.test.ts +141 -0
- package/tests/unit/commands/github-credentials.test.ts +211 -0
- package/tests/unit/modules/moduleLoading.test.ts +39 -37
- package/tests/unit/plugins/pluginLoading.test.ts +0 -85
- package/ts_build/package.json +9 -4
- package/ts_build/src/agents/base/base.js +11 -0
- package/ts_build/src/agents/base/base.js.map +1 -1
- package/ts_build/src/agents/tools/execCommand.d.ts +1 -1
- package/ts_build/src/agents/tools/execCommand.js +39 -5
- package/ts_build/src/agents/tools/execCommand.js.map +1 -1
- package/ts_build/src/agents/tools/index.d.ts +0 -1
- package/ts_build/src/agents/tools/index.js +0 -1
- package/ts_build/src/agents/tools/index.js.map +1 -1
- package/ts_build/src/agents/tools/list.js +0 -2
- package/ts_build/src/agents/tools/list.js.map +1 -1
- package/ts_build/src/chat/CliChatService.js +13 -1
- package/ts_build/src/chat/CliChatService.js.map +1 -1
- package/ts_build/src/chat/modules/AgentModule.d.ts +1 -1
- package/ts_build/src/chat/modules/AgentModule.js +39 -19
- package/ts_build/src/chat/modules/AgentModule.js.map +1 -1
- package/ts_build/src/chat/modules/SessionsModule.js +7 -2
- package/ts_build/src/chat/modules/SessionsModule.js.map +1 -1
- package/ts_build/src/chat/renderer/CompactRenderer.d.ts +4 -0
- package/ts_build/src/chat/renderer/CompactRenderer.js +16 -0
- package/ts_build/src/chat/renderer/CompactRenderer.js.map +1 -1
- package/ts_build/src/chat/renderer/ConsoleRenderer.d.ts +4 -0
- package/ts_build/src/chat/renderer/ConsoleRenderer.js +16 -0
- package/ts_build/src/chat/renderer/ConsoleRenderer.js.map +1 -1
- package/ts_build/src/chat/renderer/FancyRenderer.d.ts +4 -0
- package/ts_build/src/chat/renderer/FancyRenderer.js +16 -0
- package/ts_build/src/chat/renderer/FancyRenderer.js.map +1 -1
- package/ts_build/src/chat/renderer/types.d.ts +2 -0
- package/ts_build/src/cli.js +47 -519
- package/ts_build/src/cli.js.map +1 -1
- package/ts_build/src/clients/anthropic.d.ts +5 -5
- package/ts_build/src/clients/anthropic.js +17 -16
- package/ts_build/src/clients/anthropic.js.map +1 -1
- package/ts_build/src/clients/index.js +2 -4
- package/ts_build/src/clients/index.js.map +1 -1
- package/ts_build/src/clients/types.d.ts +3 -2
- package/ts_build/src/cloudWorker.d.ts +14 -0
- package/ts_build/src/cloudWorker.js +105 -66
- package/ts_build/src/cloudWorker.js.map +1 -1
- package/ts_build/src/commands/agent.d.ts +6 -0
- package/ts_build/src/commands/agent.js +229 -0
- package/ts_build/src/commands/agent.js.map +1 -0
- package/ts_build/src/commands/misc.d.ts +10 -0
- package/ts_build/src/commands/misc.js +197 -0
- package/ts_build/src/commands/misc.js.map +1 -0
- package/ts_build/src/commands/modules.d.ts +3 -0
- package/ts_build/src/commands/modules.js +160 -0
- package/ts_build/src/commands/modules.js.map +1 -0
- package/ts_build/src/commands/services.d.ts +5 -0
- package/ts_build/src/commands/services.js +87 -0
- package/ts_build/src/commands/services.js.map +1 -0
- package/ts_build/src/commands/workers.d.ts +6 -0
- package/ts_build/src/commands/workers.js +168 -0
- package/ts_build/src/commands/workers.js.map +1 -0
- package/ts_build/src/config.d.ts +1 -0
- package/ts_build/src/config.js +32 -0
- package/ts_build/src/config.js.map +1 -1
- package/ts_build/src/fileSync.d.ts +6 -0
- package/ts_build/src/fileSync.js +37 -12
- package/ts_build/src/fileSync.js.map +1 -1
- package/ts_build/src/index.d.ts +1 -0
- package/ts_build/src/index.js +17 -1
- package/ts_build/src/index.js.map +1 -1
- package/ts_build/src/logger.d.ts +21 -0
- package/ts_build/src/logger.js +106 -0
- package/ts_build/src/logger.js.map +1 -0
- package/ts_build/src/plugins/embedding.js +4 -3
- package/ts_build/src/plugins/embedding.js.map +1 -1
- package/ts_build/src/plugins/plugins.d.ts +0 -2
- package/ts_build/src/plugins/plugins.js +0 -11
- package/ts_build/src/plugins/plugins.js.map +1 -1
- package/ts_build/src/plugins/vim.js +3 -9
- package/ts_build/src/plugins/vim.js.map +1 -1
- package/ts_build/src/processors/JsonCompressor.js +4 -4
- package/ts_build/src/processors/JsonCompressor.js.map +1 -1
- package/ts_build/src/services/EventService.d.ts +6 -1
- package/ts_build/src/services/EventService.js +29 -0
- package/ts_build/src/services/EventService.js.map +1 -1
- package/ts_build/src/services/KnowhowClient.d.ts +13 -1
- package/ts_build/src/services/KnowhowClient.js +19 -2
- package/ts_build/src/services/KnowhowClient.js.map +1 -1
- package/ts_build/src/services/modules/index.d.ts +33 -0
- package/ts_build/src/services/modules/index.js +46 -45
- package/ts_build/src/services/modules/index.js.map +1 -1
- package/ts_build/src/services/modules/types.d.ts +6 -0
- package/ts_build/src/tunnel.d.ts +27 -0
- package/ts_build/src/tunnel.js +112 -0
- package/ts_build/src/tunnel.js.map +1 -0
- package/ts_build/src/types.d.ts +0 -1
- package/ts_build/src/types.js.map +1 -1
- package/ts_build/src/worker.d.ts +1 -4
- package/ts_build/src/worker.js +59 -227
- package/ts_build/src/worker.js.map +1 -1
- package/ts_build/src/workers/auth/WsMiddleware.d.ts +8 -0
- package/ts_build/src/workers/auth/WsMiddleware.js +65 -0
- package/ts_build/src/workers/auth/WsMiddleware.js.map +1 -0
- package/ts_build/src/workers/auth/authMiddleware.d.ts +3 -0
- package/ts_build/src/workers/auth/authMiddleware.js +60 -0
- package/ts_build/src/workers/auth/authMiddleware.js.map +1 -0
- package/ts_build/src/workers/auth/types.d.ts +8 -1
- package/ts_build/src/workers/tools/index.d.ts +2 -0
- package/ts_build/src/workers/tools/index.js +4 -1
- package/ts_build/src/workers/tools/index.js.map +1 -1
- package/ts_build/src/workers/tools/reloadConfig.d.ts +14 -0
- package/ts_build/src/workers/tools/reloadConfig.js +48 -0
- package/ts_build/src/workers/tools/reloadConfig.js.map +1 -0
- package/ts_build/tests/services/WorkerReloadConfig.test.d.ts +1 -0
- package/ts_build/tests/services/WorkerReloadConfig.test.js +86 -0
- package/ts_build/tests/services/WorkerReloadConfig.test.js.map +1 -0
- package/ts_build/tests/unit/commands/github-credentials.test.d.ts +1 -0
- package/ts_build/tests/unit/commands/github-credentials.test.js +146 -0
- package/ts_build/tests/unit/commands/github-credentials.test.js.map +1 -0
- package/ts_build/tests/unit/modules/moduleLoading.test.js +20 -26
- package/ts_build/tests/unit/modules/moduleLoading.test.js.map +1 -1
- package/ts_build/tests/unit/plugins/pluginLoading.test.js +0 -65
- package/ts_build/tests/unit/plugins/pluginLoading.test.js.map +1 -1
- package/src/agents/tools/executeScript/README.md +0 -94
- package/src/agents/tools/executeScript/definition.ts +0 -79
- package/src/agents/tools/executeScript/examples/dependency-injection-validation.ts +0 -272
- package/src/agents/tools/executeScript/examples/quick-test.ts +0 -74
- package/src/agents/tools/executeScript/examples/serialization-test.ts +0 -321
- package/src/agents/tools/executeScript/examples/test-runner.ts +0 -197
- package/src/agents/tools/executeScript/index.ts +0 -98
- package/src/services/script-execution/SandboxContext.ts +0 -282
- package/src/services/script-execution/ScriptExecutor.ts +0 -441
- package/src/services/script-execution/ScriptPolicy.ts +0 -194
- package/src/services/script-execution/ScriptTracer.ts +0 -249
- package/src/services/script-execution/types.ts +0 -134
- package/ts_build/src/agents/tools/executeScript/definition.d.ts +0 -2
- package/ts_build/src/agents/tools/executeScript/definition.js +0 -76
- package/ts_build/src/agents/tools/executeScript/definition.js.map +0 -1
- package/ts_build/src/agents/tools/executeScript/examples/dependency-injection-validation.d.ts +0 -18
- package/ts_build/src/agents/tools/executeScript/examples/dependency-injection-validation.js +0 -192
- package/ts_build/src/agents/tools/executeScript/examples/dependency-injection-validation.js.map +0 -1
- package/ts_build/src/agents/tools/executeScript/examples/quick-test.d.ts +0 -3
- package/ts_build/src/agents/tools/executeScript/examples/quick-test.js +0 -64
- package/ts_build/src/agents/tools/executeScript/examples/quick-test.js.map +0 -1
- package/ts_build/src/agents/tools/executeScript/examples/serialization-test.d.ts +0 -15
- package/ts_build/src/agents/tools/executeScript/examples/serialization-test.js +0 -266
- package/ts_build/src/agents/tools/executeScript/examples/serialization-test.js.map +0 -1
- package/ts_build/src/agents/tools/executeScript/examples/test-runner.d.ts +0 -4
- package/ts_build/src/agents/tools/executeScript/examples/test-runner.js +0 -208
- package/ts_build/src/agents/tools/executeScript/examples/test-runner.js.map +0 -1
- package/ts_build/src/agents/tools/executeScript/index.d.ts +0 -28
- package/ts_build/src/agents/tools/executeScript/index.js +0 -72
- package/ts_build/src/agents/tools/executeScript/index.js.map +0 -1
- package/ts_build/src/services/script-execution/SandboxContext.d.ts +0 -34
- package/ts_build/src/services/script-execution/SandboxContext.js +0 -189
- package/ts_build/src/services/script-execution/SandboxContext.js.map +0 -1
- package/ts_build/src/services/script-execution/ScriptExecutor.d.ts +0 -19
- package/ts_build/src/services/script-execution/ScriptExecutor.js +0 -269
- package/ts_build/src/services/script-execution/ScriptExecutor.js.map +0 -1
- package/ts_build/src/services/script-execution/ScriptPolicy.d.ts +0 -28
- package/ts_build/src/services/script-execution/ScriptPolicy.js +0 -115
- package/ts_build/src/services/script-execution/ScriptPolicy.js.map +0 -1
- package/ts_build/src/services/script-execution/ScriptTracer.d.ts +0 -19
- package/ts_build/src/services/script-execution/ScriptTracer.js +0 -186
- package/ts_build/src/services/script-execution/ScriptTracer.js.map +0 -1
- package/ts_build/src/services/script-execution/types.d.ts +0 -108
- package/ts_build/src/services/script-execution/types.js +0 -3
- package/ts_build/src/services/script-execution/types.js.map +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"WsMiddleware.js","sourceRoot":"","sources":["../../../../src/workers/auth/WsMiddleware.ts"],"names":[],"mappings":";;;;;;AACA,oDAAkC;AAgBlC,MAAa,iBAAiB;IACpB,GAAG,GAAqB,EAAE,CAAC;IAEnC,GAAG,CAAC,EAAkB;QACpB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;IAOD,MAAM,CAAC,EAAa,EAAE,SAA0C;QAC9D,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,IAAqB,EAAE,EAAE;YAC/C,IAAI,CAAC,GAAG,CAAC,CAAC;YACV,MAAM,IAAI,GAAG,KAAK,EAAE,GAAW,EAAiB,EAAE;gBAChD,IAAI,GAAG,EAAE,CAAC;oBACR,OAAO,CAAC,KAAK,CAAC,iCAAiC,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;oBAC9D,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;oBAC5B,OAAO;gBACT,CAAC;gBACD,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;gBACzB,IAAI,EAAE,EAAE,CAAC;oBACP,MAAM,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC3B,CAAC;qBAAM,CAAC;oBACN,SAAS,CAAC,IAAI,CAAC,CAAC;gBAClB,CAAC;YACH,CAAC,CAAC;YACF,MAAM,IAAI,EAAE,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC;IAeD,UAAU,CAAC,EAAa;QACtB,MAAM,YAAY,GAAG,IAAI,gBAAY,EAAE,CAAC;QAGxC,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,IAAqB,EAAE,EAAE;YAC/C,IAAI,CAAC,GAAG,CAAC,CAAC;YACV,MAAM,IAAI,GAAG,KAAK,EAAE,GAAW,EAAiB,EAAE;gBAChD,IAAI,GAAG,EAAE,CAAC;oBACR,OAAO,CAAC,KAAK,CAAC,iCAAiC,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;oBAC9D,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;oBAC5B,OAAO;gBACT,CAAC;gBACD,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;gBACzB,IAAI,EAAE,EAAE,CAAC;oBACP,MAAM,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC3B,CAAC;qBAAM,CAAC;oBAEN,YAAY,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;gBACrC,CAAC;YACH,CAAC,CAAC;YACF,MAAM,IAAI,EAAE,CAAC;QACf,CAAC,CAAC,CAAC;QAKH,MAAM,UAAU,GAAG,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACjC,EAAU,CAAC,EAAE,GAAG,CAAC,KAAa,EAAE,QAAkC,EAAE,EAAE;YACrE,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACxB,YAAY,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;gBACrC,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,OAAO,UAAU,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACrC,CAAC,CAAC;IACJ,CAAC;CACF;AAjFD,8CAiFC"}
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.makeAuthMiddleware = makeAuthMiddleware;
|
|
4
|
+
function makeAuthMiddleware(authService) {
|
|
5
|
+
return async (ws, data, next) => {
|
|
6
|
+
if (!authService.isLocked()) {
|
|
7
|
+
return next();
|
|
8
|
+
}
|
|
9
|
+
let parsed;
|
|
10
|
+
try {
|
|
11
|
+
const raw = typeof data === "string" ? data : data.toString("utf-8");
|
|
12
|
+
parsed = JSON.parse(raw);
|
|
13
|
+
}
|
|
14
|
+
catch {
|
|
15
|
+
ws.send(JSON.stringify({
|
|
16
|
+
type: "auth:locked",
|
|
17
|
+
message: "Worker is locked. Send { type: 'auth:getChallenge' } first.",
|
|
18
|
+
}));
|
|
19
|
+
return;
|
|
20
|
+
}
|
|
21
|
+
if (parsed.type === "auth:getChallenge") {
|
|
22
|
+
const challenge = authService.generateChallenge();
|
|
23
|
+
ws.send(JSON.stringify({
|
|
24
|
+
type: "auth:challenge",
|
|
25
|
+
challenge,
|
|
26
|
+
credentialId: authService.getCredentialId(),
|
|
27
|
+
timestamp: Math.floor(Date.now() / 1000),
|
|
28
|
+
}));
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
31
|
+
if (parsed.type === "auth:response") {
|
|
32
|
+
const result = await authService.unlock({
|
|
33
|
+
signature: parsed.signature,
|
|
34
|
+
credentialId: parsed.credentialId,
|
|
35
|
+
authenticatorData: parsed.authenticatorData,
|
|
36
|
+
clientDataJSON: parsed.clientDataJSON,
|
|
37
|
+
challenge: parsed.challenge,
|
|
38
|
+
});
|
|
39
|
+
if (result.success) {
|
|
40
|
+
const info = authService.getSessionInfo();
|
|
41
|
+
ws.send(JSON.stringify({
|
|
42
|
+
type: "auth:success",
|
|
43
|
+
expiresAt: info.expiresAt,
|
|
44
|
+
}));
|
|
45
|
+
}
|
|
46
|
+
else {
|
|
47
|
+
ws.send(JSON.stringify({
|
|
48
|
+
type: "auth:failure",
|
|
49
|
+
reason: result.reason ?? "unknown",
|
|
50
|
+
}));
|
|
51
|
+
}
|
|
52
|
+
return;
|
|
53
|
+
}
|
|
54
|
+
ws.send(JSON.stringify({
|
|
55
|
+
type: "auth:locked",
|
|
56
|
+
message: "Worker is locked. Send { type: 'auth:getChallenge' } to authenticate.",
|
|
57
|
+
}));
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
//# sourceMappingURL=authMiddleware.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"authMiddleware.js","sourceRoot":"","sources":["../../../../src/workers/auth/authMiddleware.ts"],"names":[],"mappings":";;AAyBA,gDA8EC;AA9ED,SAAgB,kBAAkB,CAChC,WAAqC;IAErC,OAAO,KAAK,EAAE,EAAa,EAAE,IAAqB,EAAE,IAAI,EAAE,EAAE;QAE1D,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE,CAAC;YAC5B,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QAGD,IAAI,MAAW,CAAC;QAChB,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YACrE,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC;QAAC,MAAM,CAAC;YACP,EAAE,CAAC,IAAI,CACL,IAAI,CAAC,SAAS,CAAC;gBACb,IAAI,EAAE,aAAa;gBACnB,OAAO,EAAE,6DAA6D;aACvE,CAAC,CACH,CAAC;YACF,OAAO;QACT,CAAC;QAGD,IAAI,MAAM,CAAC,IAAI,KAAK,mBAAmB,EAAE,CAAC;YACxC,MAAM,SAAS,GAAG,WAAW,CAAC,iBAAiB,EAAE,CAAC;YAClD,EAAE,CAAC,IAAI,CACL,IAAI,CAAC,SAAS,CAAC;gBACb,IAAI,EAAE,gBAAgB;gBACtB,SAAS;gBACT,YAAY,EAAE,WAAW,CAAC,eAAe,EAAE;gBAC3C,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;aACzC,CAAC,CACH,CAAC;YACF,OAAO;QACT,CAAC;QAGD,IAAI,MAAM,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;YACpC,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC;gBACtC,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,YAAY,EAAE,MAAM,CAAC,YAAY;gBACjC,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;gBAC3C,cAAc,EAAE,MAAM,CAAC,cAAc;gBACrC,SAAS,EAAE,MAAM,CAAC,SAAS;aAC5B,CAAC,CAAC;YAEH,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACnB,MAAM,IAAI,GAAG,WAAW,CAAC,cAAc,EAAE,CAAC;gBAC1C,EAAE,CAAC,IAAI,CACL,IAAI,CAAC,SAAS,CAAC;oBACb,IAAI,EAAE,cAAc;oBACpB,SAAS,EAAE,IAAI,CAAC,SAAS;iBAC1B,CAAC,CACH,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,EAAE,CAAC,IAAI,CACL,IAAI,CAAC,SAAS,CAAC;oBACb,IAAI,EAAE,cAAc;oBACpB,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,SAAS;iBACnC,CAAC,CACH,CAAC;YACJ,CAAC;YAED,OAAO;QACT,CAAC;QAGD,EAAE,CAAC,IAAI,CACL,IAAI,CAAC,SAAS,CAAC;YACb,IAAI,EAAE,aAAa;YACnB,OAAO,EACL,uEAAuE;SAC1E,CAAC,CACH,CAAC;IAEJ,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
export interface AuthGetChallengeMessage {
|
|
2
|
+
type: "auth:getChallenge";
|
|
3
|
+
}
|
|
4
|
+
export interface AuthLockedMessage {
|
|
5
|
+
type: "auth:locked";
|
|
6
|
+
message: string;
|
|
7
|
+
}
|
|
1
8
|
export interface AuthChallengeMessage {
|
|
2
9
|
type: "auth:challenge";
|
|
3
10
|
challenge: string;
|
|
@@ -20,7 +27,7 @@ export interface AuthFailureMessage {
|
|
|
20
27
|
type: "auth:failure";
|
|
21
28
|
reason: "invalid_signature" | "expired" | "unknown_credential";
|
|
22
29
|
}
|
|
23
|
-
export type AuthMessage = AuthChallengeMessage | AuthResponseMessage | AuthSuccessMessage | AuthFailureMessage;
|
|
30
|
+
export type AuthMessage = AuthGetChallengeMessage | AuthChallengeMessage | AuthResponseMessage | AuthSuccessMessage | AuthFailureMessage | AuthLockedMessage;
|
|
24
31
|
export interface PasskeyCredential {
|
|
25
32
|
publicKey: string;
|
|
26
33
|
credentialId: string;
|
|
@@ -2,10 +2,12 @@ export * from "./listAllowedPorts";
|
|
|
2
2
|
export * from "./getChallenge";
|
|
3
3
|
export * from "./unlock";
|
|
4
4
|
export * from "./lock";
|
|
5
|
+
export * from "./reloadConfig";
|
|
5
6
|
import { listAllowedPorts } from "./listAllowedPorts";
|
|
6
7
|
export { makeGetChallengeTool } from "./getChallenge";
|
|
7
8
|
export { makeUnlockTool } from "./unlock";
|
|
8
9
|
export { makeLockTool } from "./lock";
|
|
10
|
+
export { makeReloadConfigTool } from "./reloadConfig";
|
|
9
11
|
declare const _default: {
|
|
10
12
|
tools: {
|
|
11
13
|
listAllowedPorts: typeof listAllowedPorts;
|
|
@@ -14,11 +14,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.makeLockTool = exports.makeUnlockTool = exports.makeGetChallengeTool = void 0;
|
|
17
|
+
exports.makeReloadConfigTool = exports.makeLockTool = exports.makeUnlockTool = exports.makeGetChallengeTool = void 0;
|
|
18
18
|
__exportStar(require("./listAllowedPorts"), exports);
|
|
19
19
|
__exportStar(require("./getChallenge"), exports);
|
|
20
20
|
__exportStar(require("./unlock"), exports);
|
|
21
21
|
__exportStar(require("./lock"), exports);
|
|
22
|
+
__exportStar(require("./reloadConfig"), exports);
|
|
22
23
|
const listAllowedPorts_1 = require("./listAllowedPorts");
|
|
23
24
|
var getChallenge_1 = require("./getChallenge");
|
|
24
25
|
Object.defineProperty(exports, "makeGetChallengeTool", { enumerable: true, get: function () { return getChallenge_1.makeGetChallengeTool; } });
|
|
@@ -26,6 +27,8 @@ var unlock_1 = require("./unlock");
|
|
|
26
27
|
Object.defineProperty(exports, "makeUnlockTool", { enumerable: true, get: function () { return unlock_1.makeUnlockTool; } });
|
|
27
28
|
var lock_1 = require("./lock");
|
|
28
29
|
Object.defineProperty(exports, "makeLockTool", { enumerable: true, get: function () { return lock_1.makeLockTool; } });
|
|
30
|
+
var reloadConfig_1 = require("./reloadConfig");
|
|
31
|
+
Object.defineProperty(exports, "makeReloadConfigTool", { enumerable: true, get: function () { return reloadConfig_1.makeReloadConfigTool; } });
|
|
29
32
|
exports.default = {
|
|
30
33
|
tools: { listAllowedPorts: listAllowedPorts_1.listAllowedPorts },
|
|
31
34
|
definitions: [listAllowedPorts_1.listAllowedPortsDefinition],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/workers/tools/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qDAAmC;AACnC,iDAA+B;AAC/B,2CAAyB;AACzB,yCAAuB;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/workers/tools/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qDAAmC;AACnC,iDAA+B;AAC/B,2CAAyB;AACzB,yCAAuB;AACvB,iDAA+B;AAE/B,yDAG4B;AAE5B,+CAAsD;AAA7C,oHAAA,oBAAoB,OAAA;AAC7B,mCAA0C;AAAjC,wGAAA,cAAc,OAAA;AACvB,+BAAsC;AAA7B,oGAAA,YAAY,OAAA;AACrB,+CAAsD;AAA7C,oHAAA,oBAAoB,OAAA;AAE7B,kBAAe;IACb,KAAK,EAAE,EAAE,gBAAgB,EAAhB,mCAAgB,EAAE;IAC3B,WAAW,EAAE,CAAC,6CAA0B,CAAC;CAC1C,CAAC"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { Tool } from "../../clients/types";
|
|
2
|
+
import { McpServerService } from "../../services/McpServer";
|
|
3
|
+
import { McpService } from "../../services/Mcp";
|
|
4
|
+
import { ToolsService } from "../../services/Tools";
|
|
5
|
+
export interface ReloadConfigResult {
|
|
6
|
+
success: boolean;
|
|
7
|
+
toolCount: number;
|
|
8
|
+
mcpCount: number;
|
|
9
|
+
message: string;
|
|
10
|
+
}
|
|
11
|
+
export declare function makeReloadConfigTool(Mcp: McpService, Tools: ToolsService, mcpServer: McpServerService, setToolsToUse: (tools: ReturnType<typeof Tools.getToolsByNames>) => void): {
|
|
12
|
+
reloadConfig: () => Promise<ReloadConfigResult>;
|
|
13
|
+
reloadConfigDefinition: Tool;
|
|
14
|
+
};
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.makeReloadConfigTool = makeReloadConfigTool;
|
|
4
|
+
const config_1 = require("../../config");
|
|
5
|
+
function makeReloadConfigTool(Mcp, Tools, mcpServer, setToolsToUse) {
|
|
6
|
+
const reloadConfig = async () => {
|
|
7
|
+
try {
|
|
8
|
+
const freshConfig = await (0, config_1.getConfig)();
|
|
9
|
+
await Mcp.closeAll();
|
|
10
|
+
await Mcp.connectToConfigured(Tools);
|
|
11
|
+
const allowedToolNames = freshConfig.worker?.allowedTools ?? Tools.getToolNames();
|
|
12
|
+
const newToolsToUse = Tools.getToolsByNames(allowedToolNames);
|
|
13
|
+
setToolsToUse(newToolsToUse);
|
|
14
|
+
mcpServer.withTools(newToolsToUse);
|
|
15
|
+
const mcpCount = freshConfig.mcps?.length ?? 0;
|
|
16
|
+
return {
|
|
17
|
+
success: true,
|
|
18
|
+
toolCount: newToolsToUse.length,
|
|
19
|
+
mcpCount,
|
|
20
|
+
message: `Config reloaded: ${newToolsToUse.length} tools active, ${mcpCount} MCP(s) configured`,
|
|
21
|
+
};
|
|
22
|
+
}
|
|
23
|
+
catch (err) {
|
|
24
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
25
|
+
return {
|
|
26
|
+
success: false,
|
|
27
|
+
toolCount: 0,
|
|
28
|
+
mcpCount: 0,
|
|
29
|
+
message: `Failed to reload config: ${message}`,
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
};
|
|
33
|
+
const reloadConfigDefinition = {
|
|
34
|
+
type: "function",
|
|
35
|
+
function: {
|
|
36
|
+
name: "reloadConfig",
|
|
37
|
+
description: "Reload the worker config from disk, reconnect all MCPs, and rebuild the active tool list. " +
|
|
38
|
+
"Call this after running `knowhow cloudworker --pull <id>` to apply updated MCPs without restarting the worker.",
|
|
39
|
+
parameters: {
|
|
40
|
+
type: "object",
|
|
41
|
+
properties: {},
|
|
42
|
+
required: [],
|
|
43
|
+
},
|
|
44
|
+
},
|
|
45
|
+
};
|
|
46
|
+
return { reloadConfig, reloadConfigDefinition };
|
|
47
|
+
}
|
|
48
|
+
//# sourceMappingURL=reloadConfig.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reloadConfig.js","sourceRoot":"","sources":["../../../../src/workers/tools/reloadConfig.ts"],"names":[],"mappings":";;AAsBA,oDA6DC;AAlFD,yCAAyC;AAqBzC,SAAgB,oBAAoB,CAClC,GAAe,EACf,KAAmB,EACnB,SAA2B,EAC3B,aAAwE;IAExE,MAAM,YAAY,GAAG,KAAK,IAAiC,EAAE;QAC3D,IAAI,CAAC;YAEH,MAAM,WAAW,GAAG,MAAM,IAAA,kBAAS,GAAE,CAAC;YAGtC,MAAM,GAAG,CAAC,QAAQ,EAAE,CAAC;YAGrB,MAAM,GAAG,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;YAGrC,MAAM,gBAAgB,GACpB,WAAW,CAAC,MAAM,EAAE,YAAY,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;YAC3D,MAAM,aAAa,GAAG,KAAK,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC;YAC9D,aAAa,CAAC,aAAa,CAAC,CAAC;YAG7B,SAAS,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;YAEnC,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC,CAAC;YAE/C,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,SAAS,EAAE,aAAa,CAAC,MAAM;gBAC/B,QAAQ;gBACR,OAAO,EAAE,oBAAoB,aAAa,CAAC,MAAM,kBAAkB,QAAQ,oBAAoB;aAChG,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACjE,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,SAAS,EAAE,CAAC;gBACZ,QAAQ,EAAE,CAAC;gBACX,OAAO,EAAE,4BAA4B,OAAO,EAAE;aAC/C,CAAC;QACJ,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,sBAAsB,GAAS;QACnC,IAAI,EAAE,UAAmB;QACzB,QAAQ,EAAE;YACR,IAAI,EAAE,cAAc;YACpB,WAAW,EACT,4FAA4F;gBAC5F,gHAAgH;YAClH,UAAU,EAAE;gBACV,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE,EAAE;gBACd,QAAQ,EAAE,EAAE;aACb;SACF;KACF,CAAC;IAEF,OAAO,EAAE,YAAY,EAAE,sBAAsB,EAAE,CAAC;AAClD,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const Mcp_1 = require("../../src/services/Mcp");
|
|
4
|
+
const Tools_1 = require("../../src/services/Tools");
|
|
5
|
+
async function simulateReloadConfig(Mcp, Tools, mcpServer, getConfig, toolsToUseRef) {
|
|
6
|
+
const freshConfig = await getConfig();
|
|
7
|
+
await Mcp.closeAll();
|
|
8
|
+
await Mcp.connectToConfigured(Tools);
|
|
9
|
+
const allowedToolNames = freshConfig.worker?.allowedTools ?? Tools.getToolNames();
|
|
10
|
+
toolsToUseRef.value = Tools.getToolsByNames(allowedToolNames);
|
|
11
|
+
mcpServer.withTools(toolsToUseRef.value);
|
|
12
|
+
}
|
|
13
|
+
describe("Worker reloadConfig handler", () => {
|
|
14
|
+
let Mcp;
|
|
15
|
+
let Tools;
|
|
16
|
+
let mcpServer;
|
|
17
|
+
let toolsToUseRef;
|
|
18
|
+
beforeEach(() => {
|
|
19
|
+
Mcp = new Mcp_1.McpService();
|
|
20
|
+
Tools = new Tools_1.ToolsService();
|
|
21
|
+
mcpServer = { withTools: jest.fn() };
|
|
22
|
+
toolsToUseRef = { value: [] };
|
|
23
|
+
jest.spyOn(Mcp, "closeAll").mockResolvedValue(undefined);
|
|
24
|
+
jest.spyOn(Mcp, "connectToConfigured").mockResolvedValue(undefined);
|
|
25
|
+
});
|
|
26
|
+
afterEach(() => {
|
|
27
|
+
jest.restoreAllMocks();
|
|
28
|
+
});
|
|
29
|
+
it("should call closeAll() to tear down existing MCP connections", async () => {
|
|
30
|
+
const getConfig = jest
|
|
31
|
+
.fn()
|
|
32
|
+
.mockResolvedValue({ worker: { allowedTools: [] } });
|
|
33
|
+
await simulateReloadConfig(Mcp, Tools, mcpServer, getConfig, toolsToUseRef);
|
|
34
|
+
expect(Mcp.closeAll).toHaveBeenCalledTimes(1);
|
|
35
|
+
});
|
|
36
|
+
it("should call connectToConfigured() to reconnect MCPs from fresh config", async () => {
|
|
37
|
+
const getConfig = jest
|
|
38
|
+
.fn()
|
|
39
|
+
.mockResolvedValue({ worker: { allowedTools: [] } });
|
|
40
|
+
await simulateReloadConfig(Mcp, Tools, mcpServer, getConfig, toolsToUseRef);
|
|
41
|
+
expect(Mcp.connectToConfigured).toHaveBeenCalledWith(Tools);
|
|
42
|
+
});
|
|
43
|
+
it("should rebuild the tool list from allowedTools in fresh config", async () => {
|
|
44
|
+
const toolsByNamesSpy = jest
|
|
45
|
+
.spyOn(Tools, "getToolsByNames")
|
|
46
|
+
.mockReturnValue([{ function: { name: "execCommand" } }]);
|
|
47
|
+
const getConfig = jest
|
|
48
|
+
.fn()
|
|
49
|
+
.mockResolvedValue({ worker: { allowedTools: ["execCommand"] } });
|
|
50
|
+
await simulateReloadConfig(Mcp, Tools, mcpServer, getConfig, toolsToUseRef);
|
|
51
|
+
expect(toolsByNamesSpy).toHaveBeenCalledWith(["execCommand"]);
|
|
52
|
+
expect(toolsToUseRef.value).toHaveLength(1);
|
|
53
|
+
});
|
|
54
|
+
it("should fall back to all tool names when allowedTools is not set", async () => {
|
|
55
|
+
const allNames = ["execCommand", "readFile", "writeFileChunk"];
|
|
56
|
+
jest.spyOn(Tools, "getToolNames").mockReturnValue(allNames);
|
|
57
|
+
const toolsByNamesSpy = jest
|
|
58
|
+
.spyOn(Tools, "getToolsByNames")
|
|
59
|
+
.mockReturnValue([]);
|
|
60
|
+
const getConfig = jest.fn().mockResolvedValue({});
|
|
61
|
+
await simulateReloadConfig(Mcp, Tools, mcpServer, getConfig, toolsToUseRef);
|
|
62
|
+
expect(toolsByNamesSpy).toHaveBeenCalledWith(allNames);
|
|
63
|
+
});
|
|
64
|
+
it("should call mcpServer.withTools() with the rebuilt tool list", async () => {
|
|
65
|
+
const fakeTools = [{ function: { name: "readFile" } }];
|
|
66
|
+
jest.spyOn(Tools, "getToolsByNames").mockReturnValue(fakeTools);
|
|
67
|
+
const getConfig = jest
|
|
68
|
+
.fn()
|
|
69
|
+
.mockResolvedValue({ worker: { allowedTools: ["readFile"] } });
|
|
70
|
+
await simulateReloadConfig(Mcp, Tools, mcpServer, getConfig, toolsToUseRef);
|
|
71
|
+
expect(mcpServer.withTools).toHaveBeenCalledWith(fakeTools);
|
|
72
|
+
});
|
|
73
|
+
it("should re-read the config on every reload (not use stale config)", async () => {
|
|
74
|
+
const getConfig = jest
|
|
75
|
+
.fn()
|
|
76
|
+
.mockResolvedValueOnce({ worker: { allowedTools: ["execCommand"] } })
|
|
77
|
+
.mockResolvedValueOnce({ worker: { allowedTools: ["readFile", "writeFileChunk"] } });
|
|
78
|
+
jest.spyOn(Tools, "getToolsByNames").mockReturnValue([]);
|
|
79
|
+
await simulateReloadConfig(Mcp, Tools, mcpServer, getConfig, toolsToUseRef);
|
|
80
|
+
await simulateReloadConfig(Mcp, Tools, mcpServer, getConfig, toolsToUseRef);
|
|
81
|
+
expect(getConfig).toHaveBeenCalledTimes(2);
|
|
82
|
+
expect(Mcp.closeAll).toHaveBeenCalledTimes(2);
|
|
83
|
+
expect(Mcp.connectToConfigured).toHaveBeenCalledTimes(2);
|
|
84
|
+
});
|
|
85
|
+
});
|
|
86
|
+
//# sourceMappingURL=WorkerReloadConfig.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"WorkerReloadConfig.test.js","sourceRoot":"","sources":["../../../tests/services/WorkerReloadConfig.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,146 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
jest.mock("../../../src/config", () => ({
|
|
4
|
+
getConfig: jest.fn().mockResolvedValue({ modules: [] }),
|
|
5
|
+
getGlobalConfig: jest.fn().mockResolvedValue({ modules: [] }),
|
|
6
|
+
getConfigSync: jest.fn().mockReturnValue({}),
|
|
7
|
+
migrateConfig: jest.fn().mockResolvedValue(undefined),
|
|
8
|
+
}));
|
|
9
|
+
jest.mock("../../../src/clients", () => ({
|
|
10
|
+
AIClient: jest.fn(),
|
|
11
|
+
Clients: { registerClient: jest.fn(), registerModels: jest.fn() },
|
|
12
|
+
}));
|
|
13
|
+
jest.mock("../../../src/services/KnowhowClient", () => ({
|
|
14
|
+
KnowhowSimpleClient: jest.fn().mockImplementation(() => ({
|
|
15
|
+
getGitCredential: jest.fn().mockResolvedValue({
|
|
16
|
+
protocol: "https",
|
|
17
|
+
host: "github.com",
|
|
18
|
+
username: "x-access-token",
|
|
19
|
+
password: "ghu_TESTTOKEN123",
|
|
20
|
+
}),
|
|
21
|
+
})),
|
|
22
|
+
}));
|
|
23
|
+
jest.mock("readline", () => ({
|
|
24
|
+
createInterface: jest.fn().mockReturnValue({
|
|
25
|
+
on: jest.fn().mockImplementation(function (event, cb) {
|
|
26
|
+
if (event === "close") {
|
|
27
|
+
setImmediate(() => cb());
|
|
28
|
+
}
|
|
29
|
+
return this;
|
|
30
|
+
}),
|
|
31
|
+
}),
|
|
32
|
+
}));
|
|
33
|
+
const commander_1 = require("commander");
|
|
34
|
+
const misc_1 = require("../../../src/commands/misc");
|
|
35
|
+
const logger_1 = require("../../../src/logger");
|
|
36
|
+
describe("github-credentials command", () => {
|
|
37
|
+
describe("early silencing (pre-module-load)", () => {
|
|
38
|
+
beforeEach(() => {
|
|
39
|
+
logger_1.logger.unsilence();
|
|
40
|
+
logger_1.logger.installConsoleOverload();
|
|
41
|
+
});
|
|
42
|
+
afterEach(() => {
|
|
43
|
+
logger_1.logger.unsilence();
|
|
44
|
+
logger_1.logger.uninstallConsoleOverload();
|
|
45
|
+
});
|
|
46
|
+
it("silences before module loading when github-credentials is in argv", () => {
|
|
47
|
+
const originalArgv = process.argv;
|
|
48
|
+
process.argv = ["node", "knowhow", "github-credentials", "get"];
|
|
49
|
+
const rawArgs = process.argv.slice(2);
|
|
50
|
+
const SILENT_COMMANDS = ["github-credentials"];
|
|
51
|
+
if (rawArgs.some((a) => SILENT_COMMANDS.includes(a))) {
|
|
52
|
+
logger_1.logger.silence();
|
|
53
|
+
}
|
|
54
|
+
const consoleSpy = jest.spyOn(process.stdout, "write");
|
|
55
|
+
console.warn("⚠️ Terminal module: no TunnelHandler in context — terminal addon not registered");
|
|
56
|
+
console.log("some other module loading noise");
|
|
57
|
+
expect(consoleSpy).not.toHaveBeenCalled();
|
|
58
|
+
consoleSpy.mockRestore();
|
|
59
|
+
process.argv = originalArgv;
|
|
60
|
+
});
|
|
61
|
+
it("does NOT silence for other commands", () => {
|
|
62
|
+
const originalArgv = process.argv;
|
|
63
|
+
process.argv = ["node", "knowhow", "chat"];
|
|
64
|
+
const rawArgs = process.argv.slice(2);
|
|
65
|
+
const SILENT_COMMANDS = ["github-credentials"];
|
|
66
|
+
if (rawArgs.some((a) => SILENT_COMMANDS.includes(a))) {
|
|
67
|
+
logger_1.logger.silence();
|
|
68
|
+
}
|
|
69
|
+
expect(logger_1.logger.isSilenced()).toBe(false);
|
|
70
|
+
process.argv = originalArgv;
|
|
71
|
+
});
|
|
72
|
+
});
|
|
73
|
+
let program;
|
|
74
|
+
let stdoutSpy;
|
|
75
|
+
let writtenToStdout;
|
|
76
|
+
beforeEach(() => {
|
|
77
|
+
jest.clearAllMocks();
|
|
78
|
+
logger_1.logger.unsilence();
|
|
79
|
+
writtenToStdout = [];
|
|
80
|
+
stdoutSpy = jest
|
|
81
|
+
.spyOn(process.stdout, "write")
|
|
82
|
+
.mockImplementation((chunk) => {
|
|
83
|
+
writtenToStdout.push(typeof chunk === "string" ? chunk : chunk.toString());
|
|
84
|
+
return true;
|
|
85
|
+
});
|
|
86
|
+
program = new commander_1.Command();
|
|
87
|
+
program.exitOverride();
|
|
88
|
+
(0, misc_1.addGithubCredentialsCommand)(program);
|
|
89
|
+
});
|
|
90
|
+
afterEach(() => {
|
|
91
|
+
stdoutSpy.mockRestore();
|
|
92
|
+
logger_1.logger.unsilence();
|
|
93
|
+
});
|
|
94
|
+
it("outputs only credential lines to stdout for 'get' action", async () => {
|
|
95
|
+
await program.parseAsync([
|
|
96
|
+
"node", "knowhow", "github-credentials", "get", "--repo", "myorg/myrepo",
|
|
97
|
+
]);
|
|
98
|
+
expect(writtenToStdout).toHaveLength(1);
|
|
99
|
+
expect(writtenToStdout[0]).toBe("protocol=https\nhost=github.com\nusername=x-access-token\npassword=ghu_TESTTOKEN123\n");
|
|
100
|
+
});
|
|
101
|
+
it("silences the logger immediately so module logs don't pollute stdout", async () => {
|
|
102
|
+
await program.parseAsync([
|
|
103
|
+
"node", "knowhow", "github-credentials", "get", "--repo", "myorg/myrepo",
|
|
104
|
+
]);
|
|
105
|
+
expect(logger_1.logger.isSilenced()).toBe(true);
|
|
106
|
+
});
|
|
107
|
+
it("produces exactly 4 credential field lines and nothing else", async () => {
|
|
108
|
+
await program.parseAsync([
|
|
109
|
+
"node", "knowhow", "github-credentials", "get", "--repo", "myorg/myrepo",
|
|
110
|
+
]);
|
|
111
|
+
const allOutput = writtenToStdout.join("");
|
|
112
|
+
const lines = allOutput.trim().split("\n");
|
|
113
|
+
expect(lines).toHaveLength(4);
|
|
114
|
+
expect(lines[0]).toMatch(/^protocol=/);
|
|
115
|
+
expect(lines[1]).toMatch(/^host=/);
|
|
116
|
+
expect(lines[2]).toMatch(/^username=/);
|
|
117
|
+
expect(lines[3]).toMatch(/^password=/);
|
|
118
|
+
});
|
|
119
|
+
it("exits cleanly for 'store' action without writing credentials", async () => {
|
|
120
|
+
let exitCode;
|
|
121
|
+
const exitSpy = jest
|
|
122
|
+
.spyOn(process, "exit")
|
|
123
|
+
.mockImplementation(((code) => {
|
|
124
|
+
exitCode = code ?? 0;
|
|
125
|
+
throw new Error(`process.exit(${exitCode})`);
|
|
126
|
+
}));
|
|
127
|
+
await expect(program.parseAsync(["node", "knowhow", "github-credentials", "store"])).rejects.toThrow("process.exit(0)");
|
|
128
|
+
expect(exitCode).toBe(0);
|
|
129
|
+
expect(writtenToStdout).toHaveLength(0);
|
|
130
|
+
exitSpy.mockRestore();
|
|
131
|
+
});
|
|
132
|
+
it("exits cleanly for 'erase' action without writing credentials", async () => {
|
|
133
|
+
let exitCode;
|
|
134
|
+
const exitSpy = jest
|
|
135
|
+
.spyOn(process, "exit")
|
|
136
|
+
.mockImplementation(((code) => {
|
|
137
|
+
exitCode = code ?? 0;
|
|
138
|
+
throw new Error(`process.exit(${exitCode})`);
|
|
139
|
+
}));
|
|
140
|
+
await expect(program.parseAsync(["node", "knowhow", "github-credentials", "erase"])).rejects.toThrow("process.exit(0)");
|
|
141
|
+
expect(exitCode).toBe(0);
|
|
142
|
+
expect(writtenToStdout).toHaveLength(0);
|
|
143
|
+
exitSpy.mockRestore();
|
|
144
|
+
});
|
|
145
|
+
});
|
|
146
|
+
//# sourceMappingURL=github-credentials.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"github-credentials.test.js","sourceRoot":"","sources":["../../../../tests/unit/commands/github-credentials.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,12 +23,14 @@ const mockGetConfig = config_1.getConfig;
|
|
|
23
23
|
const mockGetGlobalConfig = config_1.getGlobalConfig;
|
|
24
24
|
function makeContext(overrides) {
|
|
25
25
|
return {
|
|
26
|
+
Events: {
|
|
27
|
+
log: jest.fn(),
|
|
28
|
+
},
|
|
26
29
|
Agents: {
|
|
27
30
|
registerAgent: jest.fn(),
|
|
28
31
|
},
|
|
29
32
|
Plugins: {
|
|
30
33
|
registerPlugin: jest.fn(),
|
|
31
|
-
loadPluginsFromConfig: jest.fn().mockResolvedValue(undefined),
|
|
32
34
|
},
|
|
33
35
|
Clients: {
|
|
34
36
|
registerClient: jest.fn(),
|
|
@@ -71,7 +73,8 @@ describe("ModulesService.loadModulesFromConfig", () => {
|
|
|
71
73
|
});
|
|
72
74
|
const service = new modules_1.ModulesService();
|
|
73
75
|
const context = makeContext();
|
|
74
|
-
const requireSpy = jest
|
|
76
|
+
const requireSpy = jest
|
|
77
|
+
.spyOn(service, "loadModulesFromConfig")
|
|
75
78
|
.mockImplementation(async (ctx) => {
|
|
76
79
|
const resolvedCtx = ctx || context;
|
|
77
80
|
await mockModule.init({ config: {}, cwd: process.cwd() });
|
|
@@ -94,11 +97,14 @@ describe("ModulesService.loadModulesFromConfig", () => {
|
|
|
94
97
|
};
|
|
95
98
|
const mockToolHandler = jest.fn();
|
|
96
99
|
const mockModule = makeModule({
|
|
97
|
-
tools: [
|
|
100
|
+
tools: [
|
|
101
|
+
{ name: "myTool", handler: mockToolHandler, definition: mockToolDef },
|
|
102
|
+
],
|
|
98
103
|
});
|
|
99
104
|
const service = new modules_1.ModulesService();
|
|
100
105
|
const context = makeContext();
|
|
101
|
-
const spy = jest
|
|
106
|
+
const spy = jest
|
|
107
|
+
.spyOn(service, "loadModulesFromConfig")
|
|
102
108
|
.mockImplementation(async (ctx) => {
|
|
103
109
|
const resolvedCtx = ctx || context;
|
|
104
110
|
await mockModule.init({ config: {}, cwd: process.cwd() });
|
|
@@ -122,13 +128,16 @@ describe("ModulesService.loadModulesFromConfig", () => {
|
|
|
122
128
|
callMany: () => Promise.resolve(""),
|
|
123
129
|
embed: () => Promise.resolve([]),
|
|
124
130
|
};
|
|
125
|
-
const MockPluginClass = jest
|
|
131
|
+
const MockPluginClass = jest
|
|
132
|
+
.fn()
|
|
133
|
+
.mockImplementation(() => mockPluginInstance);
|
|
126
134
|
const mockModule = makeModule({
|
|
127
135
|
plugins: [{ name: "test-plugin", plugin: MockPluginClass }],
|
|
128
136
|
});
|
|
129
137
|
const service = new modules_1.ModulesService();
|
|
130
138
|
const context = makeContext();
|
|
131
|
-
const spy = jest
|
|
139
|
+
const spy = jest
|
|
140
|
+
.spyOn(service, "loadModulesFromConfig")
|
|
132
141
|
.mockImplementation(async (ctx) => {
|
|
133
142
|
const resolvedCtx = ctx || context;
|
|
134
143
|
await mockModule.init({ config: {}, cwd: process.cwd() });
|
|
@@ -141,26 +150,10 @@ describe("ModulesService.loadModulesFromConfig", () => {
|
|
|
141
150
|
expect(context.Plugins.registerPlugin).toHaveBeenCalledWith("test-plugin", mockPluginInstance);
|
|
142
151
|
spy.mockRestore();
|
|
143
152
|
});
|
|
144
|
-
it("should call loadPluginsFromConfig with both global and local configs", async () => {
|
|
145
|
-
const localConfig = {
|
|
146
|
-
modules: [],
|
|
147
|
-
pluginPackages: { asana: "@knowhow/plugin-asana" },
|
|
148
|
-
};
|
|
149
|
-
const globalConfig = {
|
|
150
|
-
modules: [],
|
|
151
|
-
pluginPackages: { linear: "@knowhow/plugin-linear" },
|
|
152
|
-
};
|
|
153
|
-
mockGetConfig.mockResolvedValue(localConfig);
|
|
154
|
-
mockGetGlobalConfig.mockResolvedValue(globalConfig);
|
|
155
|
-
const service = new modules_1.ModulesService();
|
|
156
|
-
const context = makeContext();
|
|
157
|
-
await service.loadModulesFromConfig(context);
|
|
158
|
-
expect(context.Plugins.loadPluginsFromConfig).toHaveBeenCalledTimes(2);
|
|
159
|
-
expect(context.Plugins.loadPluginsFromConfig).toHaveBeenCalledWith(localConfig);
|
|
160
|
-
expect(context.Plugins.loadPluginsFromConfig).toHaveBeenCalledWith(globalConfig);
|
|
161
|
-
});
|
|
162
153
|
it("should load modules from both global and local config paths", async () => {
|
|
163
|
-
const globalModule = makeModule({
|
|
154
|
+
const globalModule = makeModule({
|
|
155
|
+
agents: [{ name: "GlobalAgent" }],
|
|
156
|
+
});
|
|
164
157
|
const localModule = makeModule({ agents: [{ name: "LocalAgent" }] });
|
|
165
158
|
mockGetConfig.mockResolvedValue({
|
|
166
159
|
modules: ["./local-module"],
|
|
@@ -171,7 +164,8 @@ describe("ModulesService.loadModulesFromConfig", () => {
|
|
|
171
164
|
const service = new modules_1.ModulesService();
|
|
172
165
|
const context = makeContext();
|
|
173
166
|
const loadedPaths = [];
|
|
174
|
-
const spy = jest
|
|
167
|
+
const spy = jest
|
|
168
|
+
.spyOn(service, "loadModulesFromConfig")
|
|
175
169
|
.mockImplementation(async (ctx) => {
|
|
176
170
|
const resolvedCtx = ctx || context;
|
|
177
171
|
for (const [path, mod] of [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"moduleLoading.test.js","sourceRoot":"","sources":["../../../../tests/unit/modules/moduleLoading.test.ts"],"names":[],"mappings":";;AAGA,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,GAAG,EAAE,CAAC,CAAC;IACtC,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE;IACpB,eAAe,EAAE,IAAI,CAAC,EAAE,EAAE;IAC1B,aAAa,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC;CAC7C,CAAC,CAAC,CAAC;AAGJ,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,GAAG,EAAE,CAAC,CAAC;IACvC,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE;IACnB,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE;CACnB,CAAC,CAAC,CAAC;AAGJ,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,GAAG,EAAE,CAAC,CAAC;IACxC,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC;QAClC,OAAO,EAAE,EAAE;QACX,OAAO,EAAE,EAAE;QACX,MAAM,EAAE,EAAE;QACV,KAAK,EAAE,EAAE;KACV,CAAC;CACH,CAAC,CAAC,CAAC;AAEJ,2DAA+D;
|
|
1
|
+
{"version":3,"file":"moduleLoading.test.js","sourceRoot":"","sources":["../../../../tests/unit/modules/moduleLoading.test.ts"],"names":[],"mappings":"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"}
|