siclaw 0.1.2 → 0.1.4
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/agentbox/gateway-client.d.ts +4 -0
- package/dist/agentbox/gateway-client.js +9 -1
- package/dist/agentbox/gateway-client.js.map +1 -1
- package/dist/agentbox/http-server.js +25 -1
- package/dist/agentbox/http-server.js.map +1 -1
- package/dist/agentbox/session.d.ts +2 -0
- package/dist/agentbox/session.js +11 -7
- package/dist/agentbox/session.js.map +1 -1
- package/dist/agentbox-main.js +10 -0
- package/dist/agentbox-main.js.map +1 -1
- package/dist/cli-main.js +19 -3
- package/dist/cli-main.js.map +1 -1
- package/dist/core/agent-factory.d.ts +2 -0
- package/dist/core/agent-factory.js +87 -21
- package/dist/core/agent-factory.js.map +1 -1
- package/dist/core/compaction.d.ts +80 -0
- package/dist/core/compaction.js +442 -0
- package/dist/core/compaction.js.map +1 -0
- package/dist/core/config.d.ts +7 -0
- package/dist/core/config.js +27 -1
- package/dist/core/config.js.map +1 -1
- package/dist/core/extensions/compaction-safeguard.d.ts +2 -0
- package/dist/core/extensions/compaction-safeguard.js +681 -0
- package/dist/core/extensions/compaction-safeguard.js.map +1 -0
- package/dist/core/extensions/deep-investigation.js +47 -73
- package/dist/core/extensions/deep-investigation.js.map +1 -1
- package/dist/core/extensions/memory-flush.d.ts +2 -10
- package/dist/core/extensions/memory-flush.js +4 -86
- package/dist/core/extensions/memory-flush.js.map +1 -1
- package/dist/core/llm-proxy.js +25 -6
- package/dist/core/llm-proxy.js.map +1 -1
- package/dist/core/message-utils.d.ts +18 -0
- package/dist/core/message-utils.js +28 -0
- package/dist/core/message-utils.js.map +1 -0
- package/dist/core/prompt.js +4 -5
- package/dist/core/prompt.js.map +1 -1
- package/dist/core/session-tool-result-guard.d.ts +2 -0
- package/dist/core/session-tool-result-guard.js +159 -0
- package/dist/core/session-tool-result-guard.js.map +1 -0
- package/dist/core/stream-wrappers.d.ts +41 -0
- package/dist/core/stream-wrappers.js +369 -0
- package/dist/core/stream-wrappers.js.map +1 -0
- package/dist/core/thinking-blocks.d.ts +20 -0
- package/dist/core/thinking-blocks.js +45 -0
- package/dist/core/thinking-blocks.js.map +1 -0
- package/dist/core/tool-call-id.d.ts +22 -0
- package/dist/core/tool-call-id.js +226 -0
- package/dist/core/tool-call-id.js.map +1 -0
- package/dist/core/tool-call-repair.d.ts +18 -0
- package/dist/core/tool-call-repair.js +73 -0
- package/dist/core/tool-call-repair.js.map +1 -0
- package/dist/core/tool-result-context-guard.d.ts +36 -0
- package/dist/core/tool-result-context-guard.js +272 -0
- package/dist/core/tool-result-context-guard.js.map +1 -0
- package/dist/cron/cron-limits.d.ts +16 -0
- package/dist/cron/cron-limits.js +17 -0
- package/dist/cron/cron-limits.js.map +1 -0
- package/dist/cron/cron-matcher.d.ts +14 -0
- package/dist/cron/cron-matcher.js +29 -0
- package/dist/cron/cron-matcher.js.map +1 -1
- package/dist/gateway/agentbox/client.d.ts +0 -2
- package/dist/gateway/agentbox/client.js.map +1 -1
- package/dist/gateway/agentbox/k8s-spawner.d.ts +10 -10
- package/dist/gateway/agentbox/k8s-spawner.js +27 -55
- package/dist/gateway/agentbox/k8s-spawner.js.map +1 -1
- package/dist/gateway/agentbox/local-spawner.d.ts +5 -0
- package/dist/gateway/agentbox/local-spawner.js +10 -0
- package/dist/gateway/agentbox/local-spawner.js.map +1 -1
- package/dist/gateway/cron/cron-service.js +7 -0
- package/dist/gateway/cron/cron-service.js.map +1 -1
- package/dist/gateway/db/index.js +9 -1
- package/dist/gateway/db/index.js.map +1 -1
- package/dist/gateway/db/init-schema.js +65 -16
- package/dist/gateway/db/init-schema.js.map +1 -1
- package/dist/gateway/db/migrate-sqlite.js +73 -20
- package/dist/gateway/db/migrate-sqlite.js.map +1 -1
- package/dist/gateway/db/repositories/cluster-repo.d.ts +59 -0
- package/dist/gateway/db/repositories/cluster-repo.js +107 -0
- package/dist/gateway/db/repositories/cluster-repo.js.map +1 -0
- package/dist/gateway/db/repositories/config-repo.d.ts +4 -5
- package/dist/gateway/db/repositories/config-repo.js +17 -0
- package/dist/gateway/db/repositories/config-repo.js.map +1 -1
- package/dist/gateway/db/repositories/feedback-repo.d.ts +71 -0
- package/dist/gateway/db/repositories/feedback-repo.js +52 -0
- package/dist/gateway/db/repositories/feedback-repo.js.map +1 -0
- package/dist/gateway/db/repositories/knowledge-doc-repo.d.ts +37 -0
- package/dist/gateway/db/repositories/knowledge-doc-repo.js +48 -0
- package/dist/gateway/db/repositories/knowledge-doc-repo.js.map +1 -0
- package/dist/gateway/db/repositories/user-cluster-config-repo.d.ts +45 -0
- package/dist/gateway/db/repositories/user-cluster-config-repo.js +90 -0
- package/dist/gateway/db/repositories/user-cluster-config-repo.js.map +1 -0
- package/dist/gateway/db/repositories/workspace-repo.d.ts +2 -2
- package/dist/gateway/db/repositories/workspace-repo.js +12 -12
- package/dist/gateway/db/repositories/workspace-repo.js.map +1 -1
- package/dist/gateway/db/schema-mysql.d.ts +437 -44
- package/dist/gateway/db/schema-mysql.js +36 -9
- package/dist/gateway/db/schema-mysql.js.map +1 -1
- package/dist/gateway/db/schema-sqlite.d.ts +459 -46
- package/dist/gateway/db/schema-sqlite.js +36 -9
- package/dist/gateway/db/schema-sqlite.js.map +1 -1
- package/dist/gateway/db/schema.d.ts +435 -44
- package/dist/gateway/db/schema.js +1 -1
- package/dist/gateway/db/schema.js.map +1 -1
- package/dist/gateway/plugins/channel-bridge.js +1 -1
- package/dist/gateway/plugins/channel-bridge.js.map +1 -1
- package/dist/gateway/rpc-methods.d.ts +2 -1
- package/dist/gateway/rpc-methods.js +507 -172
- package/dist/gateway/rpc-methods.js.map +1 -1
- package/dist/gateway/server.js +191 -51
- package/dist/gateway/server.js.map +1 -1
- package/dist/gateway/web/dist/assets/index-DTD0P9j8.css +1 -0
- package/dist/gateway/web/dist/assets/index-DhqsS2E0.js +756 -0
- package/dist/gateway/web/dist/assets/index-DhqsS2E0.js.map +1 -0
- package/dist/gateway/web/dist/index.html +2 -2
- package/dist/gateway-main.js +1 -3
- package/dist/gateway-main.js.map +1 -1
- package/dist/memory/indexer.d.ts +13 -0
- package/dist/memory/indexer.js +91 -1
- package/dist/memory/indexer.js.map +1 -1
- package/dist/memory/knowledge-extractor.d.ts +47 -0
- package/dist/memory/knowledge-extractor.js +165 -0
- package/dist/memory/knowledge-extractor.js.map +1 -0
- package/dist/memory/overview-generator.d.ts +16 -0
- package/dist/memory/overview-generator.js +233 -0
- package/dist/memory/overview-generator.js.map +1 -0
- package/dist/memory/session-summarizer.d.ts +28 -0
- package/dist/memory/session-summarizer.js +20 -2
- package/dist/memory/session-summarizer.js.map +1 -1
- package/dist/memory/temporal-decay.js +2 -2
- package/dist/memory/temporal-decay.js.map +1 -1
- package/dist/memory/topic-consolidator.d.ts +52 -0
- package/dist/memory/topic-consolidator.js +197 -0
- package/dist/memory/topic-consolidator.js.map +1 -0
- package/dist/tools/cluster-info.d.ts +9 -0
- package/dist/tools/cluster-info.js +74 -0
- package/dist/tools/cluster-info.js.map +1 -0
- package/dist/tools/command-sets.js +15 -5
- package/dist/tools/command-sets.js.map +1 -1
- package/dist/tools/create-skill.js +1 -1
- package/dist/tools/create-skill.js.map +1 -1
- package/dist/tools/debug-pod.d.ts +217 -0
- package/dist/tools/debug-pod.js +603 -0
- package/dist/tools/debug-pod.js.map +1 -0
- package/dist/tools/deep-search/engine.d.ts +0 -5
- package/dist/tools/deep-search/engine.js +68 -28
- package/dist/tools/deep-search/engine.js.map +1 -1
- package/dist/tools/deep-search/format.d.ts +1 -1
- package/dist/tools/deep-search/format.js +1 -2
- package/dist/tools/deep-search/format.js.map +1 -1
- package/dist/tools/deep-search/prompts.d.ts +4 -1
- package/dist/tools/deep-search/prompts.js +47 -29
- package/dist/tools/deep-search/prompts.js.map +1 -1
- package/dist/tools/deep-search/quality-gate.d.ts +25 -0
- package/dist/tools/deep-search/quality-gate.js +81 -0
- package/dist/tools/deep-search/quality-gate.js.map +1 -0
- package/dist/tools/deep-search/schemas.d.ts +25 -0
- package/dist/tools/deep-search/schemas.js +26 -1
- package/dist/tools/deep-search/schemas.js.map +1 -1
- package/dist/tools/deep-search/sre-knowledge.d.ts +6 -10
- package/dist/tools/deep-search/sre-knowledge.js +21 -52
- package/dist/tools/deep-search/sre-knowledge.js.map +1 -1
- package/dist/tools/deep-search/sub-agent.js +24 -8
- package/dist/tools/deep-search/sub-agent.js.map +1 -1
- package/dist/tools/deep-search/tool.js +3 -6
- package/dist/tools/deep-search/tool.js.map +1 -1
- package/dist/tools/deep-search/types.d.ts +13 -0
- package/dist/tools/deep-search/types.js +4 -4
- package/dist/tools/deep-search/types.js.map +1 -1
- package/dist/tools/dp-tools.d.ts +9 -6
- package/dist/tools/dp-tools.js +26 -55
- package/dist/tools/dp-tools.js.map +1 -1
- package/dist/tools/exec-utils.d.ts +8 -21
- package/dist/tools/exec-utils.js +11 -95
- package/dist/tools/exec-utils.js.map +1 -1
- package/dist/tools/fork-skill.js +1 -1
- package/dist/tools/fork-skill.js.map +1 -1
- package/dist/tools/k8s-checks.d.ts +11 -5
- package/dist/tools/k8s-checks.js +28 -9
- package/dist/tools/k8s-checks.js.map +1 -1
- package/dist/tools/knowledge-search.d.ts +3 -0
- package/dist/tools/knowledge-search.js +115 -0
- package/dist/tools/knowledge-search.js.map +1 -0
- package/dist/tools/kubeconfig-resolver.d.ts +22 -0
- package/dist/tools/kubeconfig-resolver.js +98 -18
- package/dist/tools/kubeconfig-resolver.js.map +1 -1
- package/dist/tools/manage-schedule.js +23 -1
- package/dist/tools/manage-schedule.js.map +1 -1
- package/dist/tools/netns-script.d.ts +1 -1
- package/dist/tools/netns-script.js +19 -7
- package/dist/tools/netns-script.js.map +1 -1
- package/dist/tools/node-exec.d.ts +1 -1
- package/dist/tools/node-exec.js +19 -7
- package/dist/tools/node-exec.js.map +1 -1
- package/dist/tools/node-script.d.ts +1 -1
- package/dist/tools/node-script.js +19 -7
- package/dist/tools/node-script.js.map +1 -1
- package/dist/tools/pod-exec.js +12 -1
- package/dist/tools/pod-exec.js.map +1 -1
- package/dist/tools/pod-nsenter-exec.d.ts +1 -1
- package/dist/tools/pod-nsenter-exec.js +19 -7
- package/dist/tools/pod-nsenter-exec.js.map +1 -1
- package/dist/tools/pod-script.js +12 -1
- package/dist/tools/pod-script.js.map +1 -1
- package/dist/tools/restricted-bash.js +10 -3
- package/dist/tools/restricted-bash.js.map +1 -1
- package/dist/tools/run-skill.js +14 -2
- package/dist/tools/run-skill.js.map +1 -1
- package/dist/tools/save-feedback.d.ts +7 -0
- package/dist/tools/save-feedback.js +125 -0
- package/dist/tools/save-feedback.js.map +1 -0
- package/dist/tools/update-skill.js +1 -1
- package/dist/tools/update-skill.js.map +1 -1
- package/package.json +1 -1
- package/skills/core/deep-investigation/SKILL.md +11 -14
- package/skills/core/session-feedback/SKILL.md +146 -0
|
@@ -5,6 +5,22 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { readFileSync, existsSync } from "node:fs";
|
|
7
7
|
import { join } from "node:path";
|
|
8
|
+
import { resolveUnderDir } from "../shared/path-utils.js";
|
|
9
|
+
/**
|
|
10
|
+
* Read and parse manifest.json from the credentials directory.
|
|
11
|
+
* Returns an empty array on any failure (missing dir, missing file, parse error).
|
|
12
|
+
*/
|
|
13
|
+
function readManifestEntries(credentialsDir) {
|
|
14
|
+
const manifestPath = join(credentialsDir, "manifest.json");
|
|
15
|
+
if (!existsSync(manifestPath))
|
|
16
|
+
return [];
|
|
17
|
+
try {
|
|
18
|
+
return JSON.parse(readFileSync(manifestPath, "utf-8"));
|
|
19
|
+
}
|
|
20
|
+
catch {
|
|
21
|
+
return [];
|
|
22
|
+
}
|
|
23
|
+
}
|
|
8
24
|
/**
|
|
9
25
|
* Resolve the path to the first kubeconfig file from the credentials directory.
|
|
10
26
|
* Returns null if no credentials directory, no manifest, or no kubeconfig entry.
|
|
@@ -12,18 +28,15 @@ import { join } from "node:path";
|
|
|
12
28
|
export function resolveKubeconfigPath(credentialsDir) {
|
|
13
29
|
if (!credentialsDir)
|
|
14
30
|
return null;
|
|
15
|
-
const
|
|
16
|
-
|
|
31
|
+
const entries = readManifestEntries(credentialsDir);
|
|
32
|
+
const kubeEntry = entries.find((e) => e.type === "kubeconfig");
|
|
33
|
+
if (!kubeEntry)
|
|
34
|
+
return null;
|
|
35
|
+
const kubeconfigFile = kubeEntry.files.find((f) => f.endsWith(".kubeconfig")) ?? kubeEntry.files[0];
|
|
36
|
+
if (!kubeconfigFile)
|
|
17
37
|
return null;
|
|
18
38
|
try {
|
|
19
|
-
|
|
20
|
-
const kubeEntry = entries.find((e) => e.type === "kubeconfig");
|
|
21
|
-
if (!kubeEntry)
|
|
22
|
-
return null;
|
|
23
|
-
const kubeconfigFile = kubeEntry.files.find((f) => f.endsWith(".kubeconfig")) ?? kubeEntry.files[0];
|
|
24
|
-
if (!kubeconfigFile)
|
|
25
|
-
return null;
|
|
26
|
-
return join(credentialsDir, kubeconfigFile);
|
|
39
|
+
return resolveUnderDir(credentialsDir, kubeconfigFile);
|
|
27
40
|
}
|
|
28
41
|
catch {
|
|
29
42
|
return null;
|
|
@@ -35,19 +48,86 @@ export function resolveKubeconfigPath(credentialsDir) {
|
|
|
35
48
|
* Returns null if no match found.
|
|
36
49
|
*/
|
|
37
50
|
export function resolveKubeconfigByName(credentialsDir, name) {
|
|
38
|
-
const
|
|
39
|
-
|
|
51
|
+
const entries = readManifestEntries(credentialsDir);
|
|
52
|
+
const match = entries.find((e) => e.type === "kubeconfig" && e.name === name);
|
|
53
|
+
if (!match)
|
|
40
54
|
return null;
|
|
55
|
+
const kubeconfigFile = match.files.find((f) => f.endsWith(".kubeconfig")) ?? match.files[0];
|
|
41
56
|
try {
|
|
42
|
-
|
|
43
|
-
const match = entries.find((e) => e.type === "kubeconfig" && e.name === name);
|
|
44
|
-
if (!match)
|
|
45
|
-
return null;
|
|
46
|
-
const kubeconfigFile = match.files.find((f) => f.endsWith(".kubeconfig")) ?? match.files[0];
|
|
47
|
-
return kubeconfigFile ? join(credentialsDir, kubeconfigFile) : null;
|
|
57
|
+
return kubeconfigFile ? resolveUnderDir(credentialsDir, kubeconfigFile) : null;
|
|
48
58
|
}
|
|
49
59
|
catch {
|
|
50
60
|
return null;
|
|
51
61
|
}
|
|
52
62
|
}
|
|
63
|
+
/**
|
|
64
|
+
* Resolve kubeconfig with mandatory selection when multiple clusters exist.
|
|
65
|
+
*
|
|
66
|
+
* - 0 kubeconfigs → { path: null }
|
|
67
|
+
* - 1 kubeconfig, no name → auto-select
|
|
68
|
+
* - 1 kubeconfig, name given → resolve by name (error if mismatch)
|
|
69
|
+
* - >1 kubeconfigs, no name → error (ambiguous)
|
|
70
|
+
* - >1 kubeconfigs, name given → resolve by name (error if not found)
|
|
71
|
+
*/
|
|
72
|
+
export function resolveRequiredKubeconfig(credentialsDir, name) {
|
|
73
|
+
if (!credentialsDir)
|
|
74
|
+
return { path: null };
|
|
75
|
+
const entries = readManifestEntries(credentialsDir);
|
|
76
|
+
const kubeEntries = entries.filter((e) => e.type === "kubeconfig");
|
|
77
|
+
if (kubeEntries.length === 0)
|
|
78
|
+
return { path: null };
|
|
79
|
+
/** Safely resolve file under credentialsDir; returns error on path traversal. */
|
|
80
|
+
const safeResolve = (file) => {
|
|
81
|
+
try {
|
|
82
|
+
return { path: resolveUnderDir(credentialsDir, file) };
|
|
83
|
+
}
|
|
84
|
+
catch {
|
|
85
|
+
return { error: `Kubeconfig file path escapes credentials directory: ${file}` };
|
|
86
|
+
}
|
|
87
|
+
};
|
|
88
|
+
// Single kubeconfig — auto-select (name is optional)
|
|
89
|
+
if (kubeEntries.length === 1 && !name) {
|
|
90
|
+
const file = kubeEntries[0].files.find((f) => f.endsWith(".kubeconfig")) ?? kubeEntries[0].files[0];
|
|
91
|
+
return file ? safeResolve(file) : { path: null };
|
|
92
|
+
}
|
|
93
|
+
// Name required from here
|
|
94
|
+
if (!name) {
|
|
95
|
+
const names = kubeEntries.map((e) => e.name);
|
|
96
|
+
return {
|
|
97
|
+
error: `Multiple kubeconfigs available (${names.join(", ")}). You must specify the kubeconfig parameter to select a cluster. Use credential_list to see available credentials.`,
|
|
98
|
+
availableNames: names,
|
|
99
|
+
};
|
|
100
|
+
}
|
|
101
|
+
// Resolve by name
|
|
102
|
+
const match = kubeEntries.find((e) => e.name === name);
|
|
103
|
+
if (!match) {
|
|
104
|
+
const names = kubeEntries.map((e) => e.name);
|
|
105
|
+
return {
|
|
106
|
+
error: `Kubeconfig "${name}" not found. Available: ${names.join(", ")}`,
|
|
107
|
+
availableNames: names,
|
|
108
|
+
};
|
|
109
|
+
}
|
|
110
|
+
const file = match.files.find((f) => f.endsWith(".kubeconfig")) ?? match.files[0];
|
|
111
|
+
return file ? safeResolve(file) : { error: `Kubeconfig "${name}" has no files` };
|
|
112
|
+
}
|
|
113
|
+
/**
|
|
114
|
+
* Resolve the debug image for a specific kubeconfig credential.
|
|
115
|
+
* Returns the per-cluster debugImage from manifest metadata, or null if not set.
|
|
116
|
+
*
|
|
117
|
+
* When name is undefined and there's exactly one kubeconfig, auto-selects it.
|
|
118
|
+
*/
|
|
119
|
+
export function resolveDebugImage(credentialsDir, name) {
|
|
120
|
+
if (!credentialsDir)
|
|
121
|
+
return null;
|
|
122
|
+
const entries = readManifestEntries(credentialsDir);
|
|
123
|
+
const kubeEntries = entries.filter((e) => e.type === "kubeconfig");
|
|
124
|
+
let match;
|
|
125
|
+
if (name) {
|
|
126
|
+
match = kubeEntries.find((e) => e.name === name);
|
|
127
|
+
}
|
|
128
|
+
else if (kubeEntries.length === 1) {
|
|
129
|
+
match = kubeEntries[0];
|
|
130
|
+
}
|
|
131
|
+
return match?.metadata?.debugImage ?? null;
|
|
132
|
+
}
|
|
53
133
|
//# sourceMappingURL=kubeconfig-resolver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kubeconfig-resolver.js","sourceRoot":"","sources":["../../src/tools/kubeconfig-resolver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"kubeconfig-resolver.js","sourceRoot":"","sources":["../../src/tools/kubeconfig-resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { Type } from "@sinclair/typebox";
|
|
2
2
|
import { loadConfig } from "../core/config.js";
|
|
3
3
|
import { GatewayClient } from "../agentbox/gateway-client.js";
|
|
4
|
+
import { parseCronExpression, getAverageIntervalMs } from "../cron/cron-matcher.js";
|
|
5
|
+
import { CRON_LIMITS } from "../cron/cron-limits.js";
|
|
4
6
|
export function createManageScheduleTool(kubeconfigRef) {
|
|
5
7
|
return {
|
|
6
8
|
name: "manage_schedule",
|
|
@@ -79,7 +81,7 @@ Common cron patterns:
|
|
|
79
81
|
// List action: query Gateway for current schedules
|
|
80
82
|
if (params.action === "list") {
|
|
81
83
|
const cfg = loadConfig();
|
|
82
|
-
const gatewayUrl = cfg.server.gatewayUrl ||
|
|
84
|
+
const gatewayUrl = cfg.server.gatewayUrl || `http://localhost:${cfg.server.port}`;
|
|
83
85
|
const userId = cfg.userId;
|
|
84
86
|
const workspaceId = process.env.SICLAW_WORKSPACE_ID;
|
|
85
87
|
try {
|
|
@@ -176,6 +178,26 @@ Common cron patterns:
|
|
|
176
178
|
details: { error: true },
|
|
177
179
|
};
|
|
178
180
|
}
|
|
181
|
+
// Pre-validate cron expression + interval so the model sees errors
|
|
182
|
+
// before the frontend RPC call (which the model never observes)
|
|
183
|
+
try {
|
|
184
|
+
parseCronExpression(params.schedule.trim());
|
|
185
|
+
const { avg, min } = getAverageIntervalMs(params.schedule.trim(), CRON_LIMITS.INTERVAL_SAMPLE_COUNT);
|
|
186
|
+
if (min < CRON_LIMITS.ABSOLUTE_MIN_GAP_MS) {
|
|
187
|
+
const floorMin = Math.round(CRON_LIMITS.ABSOLUTE_MIN_GAP_MS / 60_000);
|
|
188
|
+
throw new Error(`Schedule has burst firing: minimum gap between executions must be at least ${floorMin} minutes`);
|
|
189
|
+
}
|
|
190
|
+
if (avg < CRON_LIMITS.MIN_INTERVAL_MS) {
|
|
191
|
+
const limitMin = Math.round(CRON_LIMITS.MIN_INTERVAL_MS / 60_000);
|
|
192
|
+
throw new Error(`Schedule interval too short: minimum ${limitMin} minutes between executions`);
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
catch (err) {
|
|
196
|
+
return {
|
|
197
|
+
content: [{ type: "text", text: JSON.stringify({ error: err instanceof Error ? err.message : String(err) }) }],
|
|
198
|
+
details: { error: true },
|
|
199
|
+
};
|
|
200
|
+
}
|
|
179
201
|
const result = {
|
|
180
202
|
action: params.action,
|
|
181
203
|
id: params.id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manage-schedule.js","sourceRoot":"","sources":["../../src/tools/manage-schedule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAGzC,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"manage-schedule.js","sourceRoot":"","sources":["../../src/tools/manage-schedule.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { ToolDefinition } from "@mariozechner/pi-coding-agent";
|
|
2
2
|
import type { KubeconfigRef } from "../core/agent-factory.js";
|
|
3
|
-
export declare function createNetnsScriptTool(kubeconfigRef?: KubeconfigRef): ToolDefinition;
|
|
3
|
+
export declare function createNetnsScriptTool(kubeconfigRef?: KubeconfigRef, userId?: string): ToolDefinition;
|
|
@@ -4,9 +4,10 @@ import { resolveScript } from "./script-resolver.js";
|
|
|
4
4
|
import { renderTextResult } from "./tool-render.js";
|
|
5
5
|
import { loadConfig } from "../core/config.js";
|
|
6
6
|
import { parseArgs, shellEscape } from "./command-sets.js";
|
|
7
|
-
import { validatePodName, prepareExecEnv, resolveContainerNetns,
|
|
8
|
-
|
|
9
|
-
|
|
7
|
+
import { validatePodName, prepareExecEnv, resolveContainerNetns, formatExecOutput, } from "./exec-utils.js";
|
|
8
|
+
import { runInDebugPod } from "./debug-pod.js";
|
|
9
|
+
import { resolveRequiredKubeconfig, resolveDebugImage } from "./kubeconfig-resolver.js";
|
|
10
|
+
export function createNetnsScriptTool(kubeconfigRef, userId) {
|
|
10
11
|
return {
|
|
11
12
|
name: "pod_netns_script",
|
|
12
13
|
label: "Pod Netns Script",
|
|
@@ -58,8 +59,11 @@ Examples:
|
|
|
58
59
|
})),
|
|
59
60
|
script: Type.String({ description: "Script filename" }),
|
|
60
61
|
args: Type.Optional(Type.String({ description: "Arguments to pass to the script" })),
|
|
62
|
+
kubeconfig: Type.Optional(Type.String({
|
|
63
|
+
description: "Credential name of the target cluster (from credential_list). If omitted, uses the default kubeconfig.",
|
|
64
|
+
})),
|
|
61
65
|
image: Type.Optional(Type.String({
|
|
62
|
-
description:
|
|
66
|
+
description: "Debug container image (default: SICLAW_DEBUG_IMAGE)",
|
|
63
67
|
})),
|
|
64
68
|
timeout_seconds: Type.Optional(Type.Number({
|
|
65
69
|
description: "Timeout in seconds (default: 180, max: 300)",
|
|
@@ -67,7 +71,14 @@ Examples:
|
|
|
67
71
|
}),
|
|
68
72
|
async execute(_toolCallId, rawParams, signal) {
|
|
69
73
|
const params = rawParams;
|
|
70
|
-
const
|
|
74
|
+
const kubeResult = resolveRequiredKubeconfig(kubeconfigRef?.credentialsDir, params.kubeconfig);
|
|
75
|
+
if ("error" in kubeResult) {
|
|
76
|
+
return {
|
|
77
|
+
content: [{ type: "text", text: `Error: ${kubeResult.error}` }],
|
|
78
|
+
details: { error: true },
|
|
79
|
+
};
|
|
80
|
+
}
|
|
81
|
+
const env = prepareExecEnv(kubeconfigRef, kubeResult.path);
|
|
71
82
|
const pod = params.pod?.trim();
|
|
72
83
|
const namespace = params.namespace?.trim() || "default";
|
|
73
84
|
// Validate pod name
|
|
@@ -100,7 +111,8 @@ Examples:
|
|
|
100
111
|
details: { error: true },
|
|
101
112
|
};
|
|
102
113
|
}
|
|
103
|
-
const
|
|
114
|
+
const clusterKey = params.kubeconfig || "default";
|
|
115
|
+
const image = params.image || resolveDebugImage(kubeconfigRef?.credentialsDir, params.kubeconfig) || loadConfig().debugImage;
|
|
104
116
|
const timeout = Math.min(params.timeout_seconds ?? 180, 300) * 1000;
|
|
105
117
|
const args = params.args?.trim() || "";
|
|
106
118
|
// Base64 encode script content
|
|
@@ -126,7 +138,7 @@ unshare --mount nsenter -t "$PID" -n -- sh -c 'mount -t sysfs none /sys 2>/dev/n
|
|
|
126
138
|
"nsenter", "-t", "1", "-m", "-u", "-i", "-n", "-p",
|
|
127
139
|
"--", "sh", "-c", innerScript,
|
|
128
140
|
];
|
|
129
|
-
const execResult = await runInDebugPod({ nodeName: netns.nodeName, command: nsenterCmd, image }, env, { timeoutMs: timeout, signal });
|
|
141
|
+
const execResult = await runInDebugPod({ userId: userId ?? "unknown", nodeName: netns.nodeName, command: nsenterCmd, image, clusterKey }, env, { timeoutMs: timeout, signal });
|
|
130
142
|
if (signal?.aborted) {
|
|
131
143
|
return {
|
|
132
144
|
content: [{ type: "text", text: "Aborted." }],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"netns-script.js","sourceRoot":"","sources":["../../src/tools/netns-script.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAEzC,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EACL,eAAe,EACf,cAAc,EACd,qBAAqB,EACrB,
|
|
1
|
+
{"version":3,"file":"netns-script.js","sourceRoot":"","sources":["../../src/tools/netns-script.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,4 +3,4 @@ import type { KubeconfigRef } from "../core/agent-factory.js";
|
|
|
3
3
|
export { ALLOWED_COMMANDS } from "./command-sets.js";
|
|
4
4
|
export { validateNodeName, validatePodName } from "./exec-utils.js";
|
|
5
5
|
export { validateCommand } from "./command-validator.js";
|
|
6
|
-
export declare function createNodeExecTool(kubeconfigRef?: KubeconfigRef): ToolDefinition;
|
|
6
|
+
export declare function createNodeExecTool(kubeconfigRef?: KubeconfigRef, userId?: string): ToolDefinition;
|
package/dist/tools/node-exec.js
CHANGED
|
@@ -5,13 +5,14 @@ import { checkNodeReady } from "./k8s-checks.js";
|
|
|
5
5
|
import { loadConfig } from "../core/config.js";
|
|
6
6
|
import { parseArgs } from "./command-sets.js";
|
|
7
7
|
import { validateCommand, extractCommands } from "./command-validator.js";
|
|
8
|
-
import { validateNodeName, prepareExecEnv,
|
|
9
|
-
|
|
8
|
+
import { validateNodeName, prepareExecEnv, formatExecOutput, } from "./exec-utils.js";
|
|
9
|
+
import { runInDebugPod } from "./debug-pod.js";
|
|
10
|
+
import { resolveRequiredKubeconfig, resolveDebugImage } from "./kubeconfig-resolver.js";
|
|
10
11
|
// Re-export for backward compatibility (tests + downstream imports)
|
|
11
12
|
export { ALLOWED_COMMANDS } from "./command-sets.js";
|
|
12
13
|
export { validateNodeName, validatePodName } from "./exec-utils.js";
|
|
13
14
|
export { validateCommand } from "./command-validator.js";
|
|
14
|
-
export function createNodeExecTool(kubeconfigRef) {
|
|
15
|
+
export function createNodeExecTool(kubeconfigRef, userId) {
|
|
15
16
|
return {
|
|
16
17
|
name: "node_exec",
|
|
17
18
|
label: "Node Exec",
|
|
@@ -69,8 +70,11 @@ Examples:
|
|
|
69
70
|
command: Type.String({
|
|
70
71
|
description: 'Diagnostic command to run on the node (e.g. "ip addr show", "nvidia-smi")',
|
|
71
72
|
}),
|
|
73
|
+
kubeconfig: Type.Optional(Type.String({
|
|
74
|
+
description: "Credential name of the target cluster (from credential_list). If omitted, uses the default kubeconfig.",
|
|
75
|
+
})),
|
|
72
76
|
image: Type.Optional(Type.String({
|
|
73
|
-
description:
|
|
77
|
+
description: "Debug container image (default: SICLAW_DEBUG_IMAGE)",
|
|
74
78
|
})),
|
|
75
79
|
timeout_seconds: Type.Optional(Type.Number({
|
|
76
80
|
description: "Timeout in seconds (default: 30, max: 120)",
|
|
@@ -87,7 +91,14 @@ Examples:
|
|
|
87
91
|
renderResult: renderTextResult,
|
|
88
92
|
async execute(_toolCallId, rawParams, signal) {
|
|
89
93
|
const params = rawParams;
|
|
90
|
-
const
|
|
94
|
+
const kubeResult = resolveRequiredKubeconfig(kubeconfigRef?.credentialsDir, params.kubeconfig);
|
|
95
|
+
if ("error" in kubeResult) {
|
|
96
|
+
return {
|
|
97
|
+
content: [{ type: "text", text: `Error: ${kubeResult.error}` }],
|
|
98
|
+
details: { error: true },
|
|
99
|
+
};
|
|
100
|
+
}
|
|
101
|
+
const env = prepareExecEnv(kubeconfigRef, kubeResult.path);
|
|
91
102
|
// Validate node name
|
|
92
103
|
const nodeErr = validateNodeName(params.node);
|
|
93
104
|
if (nodeErr) {
|
|
@@ -112,7 +123,8 @@ Examples:
|
|
|
112
123
|
details: { error: true },
|
|
113
124
|
};
|
|
114
125
|
}
|
|
115
|
-
const
|
|
126
|
+
const clusterKey = params.kubeconfig || "default";
|
|
127
|
+
const image = params.image || resolveDebugImage(kubeconfigRef?.credentialsDir, params.kubeconfig) || loadConfig().debugImage;
|
|
116
128
|
const timeout = Math.min(params.timeout_seconds ?? 30, 120) * 1000;
|
|
117
129
|
const commands = extractCommands(params.command);
|
|
118
130
|
const needsShell = commands.length > 1;
|
|
@@ -121,7 +133,7 @@ Examples:
|
|
|
121
133
|
const nsenterCmd = needsShell
|
|
122
134
|
? ["nsenter", "-t", "1", "-m", "-u", "-i", "-n", "-p", "--", "sh", "-c", params.command]
|
|
123
135
|
: ["nsenter", "-t", "1", "-m", "-u", "-i", "-n", "-p", "--", ...cmdArgs];
|
|
124
|
-
const execResult = await runInDebugPod({ nodeName: params.node, command: nsenterCmd, image }, env, { timeoutMs: timeout, signal });
|
|
136
|
+
const execResult = await runInDebugPod({ userId: userId ?? "unknown", nodeName: params.node, command: nsenterCmd, image, clusterKey }, env, { timeoutMs: timeout, signal });
|
|
125
137
|
if (signal?.aborted) {
|
|
126
138
|
return {
|
|
127
139
|
content: [{ type: "text", text: "Aborted." }],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-exec.js","sourceRoot":"","sources":["../../src/tools/node-exec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAG5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,
|
|
1
|
+
{"version":3,"file":"node-exec.js","sourceRoot":"","sources":["../../src/tools/node-exec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { ToolDefinition } from "@mariozechner/pi-coding-agent";
|
|
2
2
|
import type { KubeconfigRef } from "../core/agent-factory.js";
|
|
3
|
-
export declare function createNodeScriptTool(kubeconfigRef?: KubeconfigRef): ToolDefinition;
|
|
3
|
+
export declare function createNodeScriptTool(kubeconfigRef?: KubeconfigRef, userId?: string): ToolDefinition;
|
|
@@ -5,9 +5,10 @@ import { resolveScript } from "./script-resolver.js";
|
|
|
5
5
|
import { renderTextResult } from "./tool-render.js";
|
|
6
6
|
import { loadConfig } from "../core/config.js";
|
|
7
7
|
import { parseArgs, shellEscape } from "./command-sets.js";
|
|
8
|
-
import { validateNodeName, prepareExecEnv,
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
import { validateNodeName, prepareExecEnv, formatExecOutput, } from "./exec-utils.js";
|
|
9
|
+
import { runInDebugPod } from "./debug-pod.js";
|
|
10
|
+
import { resolveRequiredKubeconfig, resolveDebugImage } from "./kubeconfig-resolver.js";
|
|
11
|
+
export function createNodeScriptTool(kubeconfigRef, userId) {
|
|
11
12
|
return {
|
|
12
13
|
name: "node_script",
|
|
13
14
|
label: "Node Script",
|
|
@@ -45,8 +46,11 @@ Examples:
|
|
|
45
46
|
})),
|
|
46
47
|
script: Type.String({ description: "Script filename" }),
|
|
47
48
|
args: Type.Optional(Type.String({ description: "Arguments to pass to the script" })),
|
|
49
|
+
kubeconfig: Type.Optional(Type.String({
|
|
50
|
+
description: "Credential name of the target cluster (from credential_list). If omitted, uses the default kubeconfig.",
|
|
51
|
+
})),
|
|
48
52
|
image: Type.Optional(Type.String({
|
|
49
|
-
description:
|
|
53
|
+
description: "Debug container image (default: SICLAW_DEBUG_IMAGE)",
|
|
50
54
|
})),
|
|
51
55
|
timeout_seconds: Type.Optional(Type.Number({
|
|
52
56
|
description: "Timeout in seconds (default: 180, max: 300)",
|
|
@@ -54,7 +58,14 @@ Examples:
|
|
|
54
58
|
}),
|
|
55
59
|
async execute(_toolCallId, rawParams, signal) {
|
|
56
60
|
const params = rawParams;
|
|
57
|
-
const
|
|
61
|
+
const kubeResult = resolveRequiredKubeconfig(kubeconfigRef?.credentialsDir, params.kubeconfig);
|
|
62
|
+
if ("error" in kubeResult) {
|
|
63
|
+
return {
|
|
64
|
+
content: [{ type: "text", text: `Error: ${kubeResult.error}` }],
|
|
65
|
+
details: { error: true },
|
|
66
|
+
};
|
|
67
|
+
}
|
|
68
|
+
const env = prepareExecEnv(kubeconfigRef, kubeResult.path);
|
|
58
69
|
// Validate node name format
|
|
59
70
|
const nodeErr = validateNodeName(params.node);
|
|
60
71
|
if (nodeErr) {
|
|
@@ -82,7 +93,8 @@ Examples:
|
|
|
82
93
|
details: { error: true },
|
|
83
94
|
};
|
|
84
95
|
}
|
|
85
|
-
const
|
|
96
|
+
const clusterKey = params.kubeconfig || "default";
|
|
97
|
+
const image = params.image || resolveDebugImage(kubeconfigRef?.credentialsDir, params.kubeconfig) || loadConfig().debugImage;
|
|
86
98
|
const timeout = Math.min(params.timeout_seconds ?? 180, 300) * 1000;
|
|
87
99
|
const args = params.args?.trim() || "";
|
|
88
100
|
// Security: shell-escape each argument to prevent injection via args parameter
|
|
@@ -98,7 +110,7 @@ Examples:
|
|
|
98
110
|
"nsenter", "-t", "1", "-m", "-u", "-i", "-n", "-p",
|
|
99
111
|
"--", "sh", "-c", innerCmd,
|
|
100
112
|
];
|
|
101
|
-
const execResult = await runInDebugPod({ nodeName: params.node, command: nsenterCmd, image }, env, { timeoutMs: timeout, signal });
|
|
113
|
+
const execResult = await runInDebugPod({ userId: userId ?? "unknown", nodeName: params.node, command: nsenterCmd, image, clusterKey }, env, { timeoutMs: timeout, signal });
|
|
102
114
|
if (signal?.aborted) {
|
|
103
115
|
return {
|
|
104
116
|
content: [{ type: "text", text: "Aborted." }],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-script.js","sourceRoot":"","sources":["../../src/tools/node-script.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAEzC,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,
|
|
1
|
+
{"version":3,"file":"node-script.js","sourceRoot":"","sources":["../../src/tools/node-script.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/pod-exec.js
CHANGED
|
@@ -7,6 +7,7 @@ import { checkPodRunning } from "./k8s-checks.js";
|
|
|
7
7
|
import { parseArgs } from "./command-sets.js";
|
|
8
8
|
import { validateCommand } from "./command-validator.js";
|
|
9
9
|
import { validatePodName, prepareExecEnv } from "./exec-utils.js";
|
|
10
|
+
import { resolveRequiredKubeconfig } from "./kubeconfig-resolver.js";
|
|
10
11
|
const execFileAsync = promisify(execFile);
|
|
11
12
|
// Re-export for backward compatibility (tests + downstream imports)
|
|
12
13
|
export { validatePodName } from "./exec-utils.js";
|
|
@@ -55,6 +56,9 @@ Examples:
|
|
|
55
56
|
command: Type.String({
|
|
56
57
|
description: 'Diagnostic command to run in the pod (e.g. "ip addr show", "ps aux")',
|
|
57
58
|
}),
|
|
59
|
+
kubeconfig: Type.Optional(Type.String({
|
|
60
|
+
description: "Credential name of the target cluster (from credential_list). If omitted, uses the default kubeconfig.",
|
|
61
|
+
})),
|
|
58
62
|
timeout_seconds: Type.Optional(Type.Number({
|
|
59
63
|
description: "Timeout in seconds (default: 30, max: 120)",
|
|
60
64
|
})),
|
|
@@ -71,7 +75,14 @@ Examples:
|
|
|
71
75
|
renderResult: renderTextResult,
|
|
72
76
|
async execute(_toolCallId, rawParams) {
|
|
73
77
|
const params = rawParams;
|
|
74
|
-
const
|
|
78
|
+
const kubeResult = resolveRequiredKubeconfig(kubeconfigRef?.credentialsDir, params.kubeconfig);
|
|
79
|
+
if ("error" in kubeResult) {
|
|
80
|
+
return {
|
|
81
|
+
content: [{ type: "text", text: `Error: ${kubeResult.error}` }],
|
|
82
|
+
details: { error: true },
|
|
83
|
+
};
|
|
84
|
+
}
|
|
85
|
+
const env = prepareExecEnv(kubeconfigRef, kubeResult.path);
|
|
75
86
|
const pod = params.pod?.trim();
|
|
76
87
|
const namespace = params.namespace?.trim() || "default";
|
|
77
88
|
// Validate pod name
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pod-exec.js","sourceRoot":"","sources":["../../src/tools/pod-exec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAG5C,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"pod-exec.js","sourceRoot":"","sources":["../../src/tools/pod-exec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { ToolDefinition } from "@mariozechner/pi-coding-agent";
|
|
2
2
|
import type { KubeconfigRef } from "../core/agent-factory.js";
|
|
3
|
-
export declare function createPodNsenterExecTool(kubeconfigRef?: KubeconfigRef): ToolDefinition;
|
|
3
|
+
export declare function createPodNsenterExecTool(kubeconfigRef?: KubeconfigRef, userId?: string): ToolDefinition;
|