siclaw 0.1.1 → 0.1.2
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 +74 -114
- package/dist/agentbox/gateway-client.d.ts +2 -1
- package/dist/agentbox/gateway-client.js +6 -2
- package/dist/agentbox/gateway-client.js.map +1 -1
- package/dist/agentbox/http-server.js +184 -19
- package/dist/agentbox/http-server.js.map +1 -1
- package/dist/agentbox/resource-handlers.d.ts +1 -0
- package/dist/agentbox/resource-handlers.js +23 -23
- package/dist/agentbox/resource-handlers.js.map +1 -1
- package/dist/agentbox/session.js +85 -5
- package/dist/agentbox/session.js.map +1 -1
- package/dist/agentbox-main.d.ts +2 -1
- package/dist/agentbox-main.js +65 -18
- package/dist/agentbox-main.js.map +1 -1
- package/dist/cli-credentials.d.ts +1 -0
- package/dist/cli-credentials.js +109 -0
- package/dist/cli-credentials.js.map +1 -0
- package/dist/cli-first-run.d.ts +11 -0
- package/dist/cli-first-run.js +99 -0
- package/dist/cli-first-run.js.map +1 -0
- package/dist/cli-main.js +33 -11
- package/dist/cli-main.js.map +1 -1
- package/dist/cli-setup.d.ts +5 -11
- package/dist/cli-setup.js +12 -225
- package/dist/cli-setup.js.map +1 -1
- package/dist/core/agent-factory.d.ts +4 -0
- package/dist/core/agent-factory.js +102 -151
- package/dist/core/agent-factory.js.map +1 -1
- package/dist/core/config.d.ts +10 -3
- package/dist/core/config.js +11 -95
- package/dist/core/config.js.map +1 -1
- package/dist/core/extensions/deep-investigation.d.ts +2 -1
- package/dist/core/extensions/deep-investigation.js +144 -24
- package/dist/core/extensions/deep-investigation.js.map +1 -1
- package/dist/core/extensions/setup.d.ts +8 -0
- package/dist/core/extensions/setup.js +669 -0
- package/dist/core/extensions/setup.js.map +1 -0
- package/dist/core/llm-proxy.js +7 -3
- package/dist/core/llm-proxy.js.map +1 -1
- package/dist/core/mcp-client.d.ts +0 -10
- package/dist/core/mcp-client.js +0 -65
- package/dist/core/mcp-client.js.map +1 -1
- package/dist/core/prompt.d.ts +1 -1
- package/dist/core/prompt.js +42 -5
- package/dist/core/prompt.js.map +1 -1
- package/dist/core/provider-presets.d.ts +14 -0
- package/dist/core/provider-presets.js +81 -0
- package/dist/core/provider-presets.js.map +1 -0
- package/dist/cron/cron-coordinator.d.ts +2 -0
- package/dist/cron/cron-coordinator.js +46 -14
- package/dist/cron/cron-coordinator.js.map +1 -1
- package/dist/cron/cron-executor.js +33 -8
- package/dist/cron/cron-executor.js.map +1 -1
- package/dist/cron/cron-scheduler.d.ts +1 -1
- package/dist/cron/gateway-client.d.ts +5 -0
- package/dist/cron/gateway-client.js +43 -8
- package/dist/cron/gateway-client.js.map +1 -1
- package/dist/cron-main.js +39 -9
- package/dist/cron-main.js.map +1 -1
- package/dist/gateway/agentbox/client.d.ts +11 -0
- package/dist/gateway/agentbox/client.js +18 -0
- package/dist/gateway/agentbox/client.js.map +1 -1
- package/dist/gateway/agentbox/k8s-spawner.d.ts +11 -2
- package/dist/gateway/agentbox/k8s-spawner.js +95 -52
- package/dist/gateway/agentbox/k8s-spawner.js.map +1 -1
- package/dist/gateway/agentbox/local-spawner.d.ts +1 -1
- package/dist/gateway/agentbox/local-spawner.js +4 -2
- package/dist/gateway/agentbox/local-spawner.js.map +1 -1
- package/dist/gateway/agentbox/manager.d.ts +0 -10
- package/dist/gateway/agentbox/manager.js +11 -30
- package/dist/gateway/agentbox/manager.js.map +1 -1
- package/dist/gateway/agentbox/types.d.ts +6 -4
- package/dist/gateway/cron/cron-service.d.ts +49 -0
- package/dist/gateway/cron/cron-service.js +259 -0
- package/dist/gateway/cron/cron-service.js.map +1 -0
- package/dist/gateway/db/init-schema.js +44 -0
- package/dist/gateway/db/init-schema.js.map +1 -1
- package/dist/gateway/db/migrate-sqlite.js +73 -4
- package/dist/gateway/db/migrate-sqlite.js.map +1 -1
- package/dist/gateway/db/repositories/chat-repo.d.ts +56 -2
- package/dist/gateway/db/repositories/chat-repo.js +132 -2
- package/dist/gateway/db/repositories/chat-repo.js.map +1 -1
- package/dist/gateway/db/repositories/config-repo.d.ts +31 -2
- package/dist/gateway/db/repositories/config-repo.js +57 -7
- package/dist/gateway/db/repositories/config-repo.js.map +1 -1
- package/dist/gateway/db/repositories/env-repo.d.ts +14 -0
- package/dist/gateway/db/repositories/env-repo.js +15 -2
- package/dist/gateway/db/repositories/env-repo.js.map +1 -1
- package/dist/gateway/db/repositories/model-config-repo.js +6 -5
- package/dist/gateway/db/repositories/model-config-repo.js.map +1 -1
- package/dist/gateway/db/repositories/skill-repo.d.ts +0 -5
- package/dist/gateway/db/repositories/skill-review-repo.d.ts +1 -0
- package/dist/gateway/db/repositories/skill-review-repo.js +4 -1
- package/dist/gateway/db/repositories/skill-review-repo.js.map +1 -1
- package/dist/gateway/db/repositories/skill-version-repo.js +0 -1
- package/dist/gateway/db/repositories/skill-version-repo.js.map +1 -1
- package/dist/gateway/db/repositories/system-config-repo.d.ts +1 -1
- package/dist/gateway/db/repositories/system-config-repo.js +2 -1
- package/dist/gateway/db/repositories/system-config-repo.js.map +1 -1
- package/dist/gateway/db/repositories/user-env-config-repo.d.ts +13 -0
- package/dist/gateway/db/repositories/user-env-config-repo.js +11 -0
- package/dist/gateway/db/repositories/user-env-config-repo.js.map +1 -1
- package/dist/gateway/db/repositories/workspace-repo.d.ts +3 -2
- package/dist/gateway/db/repositories/workspace-repo.js +6 -2
- package/dist/gateway/db/repositories/workspace-repo.js.map +1 -1
- package/dist/gateway/db/schema-mysql.d.ts +473 -51
- package/dist/gateway/db/schema-mysql.js +35 -4
- package/dist/gateway/db/schema-mysql.js.map +1 -1
- package/dist/gateway/db/schema-sqlite.d.ts +522 -57
- package/dist/gateway/db/schema-sqlite.js +38 -6
- package/dist/gateway/db/schema-sqlite.js.map +1 -1
- package/dist/gateway/db/schema.d.ts +471 -51
- package/dist/gateway/db/schema.js +1 -1
- package/dist/gateway/db/schema.js.map +1 -1
- package/dist/gateway/metrics-aggregator.d.ts +65 -0
- package/dist/gateway/metrics-aggregator.js +244 -0
- package/dist/gateway/metrics-aggregator.js.map +1 -0
- package/dist/gateway/plugins/channel-bridge.d.ts +4 -1
- package/dist/gateway/plugins/channel-bridge.js +78 -86
- package/dist/gateway/plugins/channel-bridge.js.map +1 -1
- package/dist/gateway/rpc-methods.d.ts +4 -2
- package/dist/gateway/rpc-methods.js +852 -166
- package/dist/gateway/rpc-methods.js.map +1 -1
- package/dist/gateway/security/cert-manager.d.ts +2 -2
- package/dist/gateway/security/cert-manager.js +4 -2
- package/dist/gateway/security/cert-manager.js.map +1 -1
- package/dist/gateway/server.d.ts +4 -8
- package/dist/gateway/server.js +297 -261
- package/dist/gateway/server.js.map +1 -1
- package/dist/gateway/skills/file-writer.js +17 -11
- package/dist/gateway/skills/file-writer.js.map +1 -1
- package/dist/gateway/skills/script-evaluator.js +12 -9
- package/dist/gateway/skills/script-evaluator.js.map +1 -1
- package/dist/gateway/web/dist/assets/index-0p17ZeTP.js +740 -0
- package/dist/gateway/web/dist/assets/index-9eP6nPUq.js +741 -0
- package/dist/gateway/web/dist/assets/index-9eP6nPUq.js.map +1 -0
- package/dist/gateway/web/dist/assets/index-DyowBCEj.css +1 -0
- package/dist/gateway/web/dist/assets/index-PDK5JJDO.css +1 -0
- package/dist/gateway/web/dist/index.html +2 -2
- package/dist/gateway-main.js +27 -10
- package/dist/gateway-main.js.map +1 -1
- package/dist/memory/embeddings.js +5 -4
- package/dist/memory/embeddings.js.map +1 -1
- package/dist/memory/indexer.d.ts +23 -3
- package/dist/memory/indexer.js +235 -23
- package/dist/memory/indexer.js.map +1 -1
- package/dist/memory/schema.js +15 -1
- package/dist/memory/schema.js.map +1 -1
- package/dist/memory/types.d.ts +18 -0
- package/dist/memory/types.js +6 -1
- package/dist/memory/types.js.map +1 -1
- package/dist/shared/detect-language.d.ts +12 -0
- package/dist/shared/detect-language.js +78 -0
- package/dist/shared/detect-language.js.map +1 -0
- package/dist/shared/diagnostic-events.d.ts +70 -0
- package/dist/shared/diagnostic-events.js +38 -0
- package/dist/shared/diagnostic-events.js.map +1 -0
- package/dist/shared/local-collector.d.ts +56 -0
- package/dist/shared/local-collector.js +284 -0
- package/dist/shared/local-collector.js.map +1 -0
- package/dist/shared/metrics-types.d.ts +64 -0
- package/dist/shared/metrics-types.js +25 -0
- package/dist/shared/metrics-types.js.map +1 -0
- package/dist/shared/metrics.d.ts +19 -0
- package/dist/shared/metrics.js +185 -0
- package/dist/shared/metrics.js.map +1 -0
- package/dist/shared/path-utils.d.ts +15 -0
- package/dist/shared/path-utils.js +23 -0
- package/dist/shared/path-utils.js.map +1 -0
- package/dist/shared/retry.d.ts +35 -0
- package/dist/shared/retry.js +61 -0
- package/dist/shared/retry.js.map +1 -0
- package/dist/tools/command-sets.d.ts +18 -2
- package/dist/tools/command-sets.js +207 -32
- package/dist/tools/command-sets.js.map +1 -1
- package/dist/tools/command-validator.d.ts +56 -0
- package/dist/tools/command-validator.js +357 -0
- package/dist/tools/command-validator.js.map +1 -0
- package/dist/tools/create-skill.js +26 -1
- package/dist/tools/create-skill.js.map +1 -1
- package/dist/tools/credential-list.js +1 -23
- package/dist/tools/credential-list.js.map +1 -1
- package/dist/tools/credential-manager.d.ts +98 -0
- package/dist/tools/credential-manager.js +313 -0
- package/dist/tools/credential-manager.js.map +1 -0
- package/dist/tools/deep-search/engine.js +184 -127
- package/dist/tools/deep-search/engine.js.map +1 -1
- package/dist/tools/deep-search/prompts.d.ts +10 -2
- package/dist/tools/deep-search/prompts.js +37 -36
- package/dist/tools/deep-search/prompts.js.map +1 -1
- package/dist/tools/deep-search/schemas.d.ts +87 -0
- package/dist/tools/deep-search/schemas.js +85 -0
- package/dist/tools/deep-search/schemas.js.map +1 -0
- package/dist/tools/deep-search/sub-agent.d.ts +21 -0
- package/dist/tools/deep-search/sub-agent.js +153 -4
- package/dist/tools/deep-search/sub-agent.js.map +1 -1
- package/dist/tools/deep-search/tool.js +1 -0
- package/dist/tools/deep-search/tool.js.map +1 -1
- package/dist/tools/deep-search/types.d.ts +2 -0
- package/dist/tools/deep-search/types.js.map +1 -1
- package/dist/tools/dp-tools.js +29 -5
- package/dist/tools/dp-tools.js.map +1 -1
- package/dist/tools/exec-utils.d.ts +85 -0
- package/dist/tools/exec-utils.js +294 -0
- package/dist/tools/exec-utils.js.map +1 -0
- package/dist/tools/fork-skill.js +14 -2
- package/dist/tools/fork-skill.js.map +1 -1
- package/dist/tools/investigation-feedback.d.ts +3 -0
- package/dist/tools/investigation-feedback.js +71 -0
- package/dist/tools/investigation-feedback.js.map +1 -0
- package/dist/tools/manage-schedule.js +16 -6
- package/dist/tools/manage-schedule.js.map +1 -1
- package/dist/tools/netns-script.js +27 -281
- package/dist/tools/netns-script.js.map +1 -1
- package/dist/tools/node-exec.d.ts +2 -14
- package/dist/tools/node-exec.js +18 -225
- package/dist/tools/node-exec.js.map +1 -1
- package/dist/tools/node-script.js +14 -168
- package/dist/tools/node-script.js.map +1 -1
- package/dist/tools/pod-exec.d.ts +1 -1
- package/dist/tools/pod-exec.js +10 -26
- package/dist/tools/pod-exec.js.map +1 -1
- package/dist/tools/pod-nsenter-exec.js +21 -225
- package/dist/tools/pod-nsenter-exec.js.map +1 -1
- package/dist/tools/pod-script.js +10 -19
- package/dist/tools/pod-script.js.map +1 -1
- package/dist/tools/restricted-bash.d.ts +1 -17
- package/dist/tools/restricted-bash.js +38 -252
- package/dist/tools/restricted-bash.js.map +1 -1
- package/dist/tools/run-skill.d.ts +3 -1
- package/dist/tools/run-skill.js +21 -1
- package/dist/tools/run-skill.js.map +1 -1
- package/dist/tools/script-resolver.d.ts +3 -1
- package/dist/tools/script-resolver.js +74 -30
- package/dist/tools/script-resolver.js.map +1 -1
- package/dist/tools/update-skill.js +17 -6
- package/dist/tools/update-skill.js.map +1 -1
- package/package.json +4 -2
- package/siclaw.mjs +10 -1
- package/skills/core/cluster-events/SKILL.md +1 -1
- package/skills/core/deep-investigation/SKILL.md +11 -0
- package/skills/core/deployment-rollout-debug/SKILL.md +1 -1
- package/skills/core/dns-debug/SKILL.md +1 -0
- package/skills/core/meta.json +12 -1
- package/skills/core/networkpolicy-debug/SKILL.md +332 -0
- package/skills/core/node-logs/scripts/get-node-logs.sh +19 -9
- package/skills/core/pod-pending-debug/SKILL.md +1 -0
- package/skills/core/quota-debug/SKILL.md +203 -0
- package/skills/core/service-debug/SKILL.md +1 -0
- package/skills/core/statefulset-debug/SKILL.md +280 -0
- package/skills/core/volcano-diagnose-pod/SKILL.md +196 -0
- package/skills/core/volcano-diagnose-pod/scripts/diagnose-pod.sh +175 -0
- package/skills/core/volcano-gang-scheduling/SKILL.md +299 -0
- package/skills/core/volcano-job-diagnose/SKILL.md +319 -0
- package/skills/core/volcano-job-diagnose/scripts/diagnose-job.sh +253 -0
- package/skills/core/volcano-node-resources/SKILL.md +334 -0
- package/skills/core/volcano-node-resources/scripts/get-node-resources.sh +281 -0
- package/skills/core/volcano-queue-diagnose/SKILL.md +294 -0
- package/skills/core/volcano-queue-diagnose/scripts/diagnose-queue.sh +283 -0
- package/skills/core/volcano-resource-insufficient/SKILL.md +315 -0
- package/skills/core/volcano-scheduler-config/SKILL.md +371 -0
- package/skills/core/volcano-scheduler-config/scripts/get-scheduler-config.sh +297 -0
- package/skills/core/volcano-scheduler-logs/SKILL.md +241 -0
- package/skills/core/volcano-scheduler-logs/scripts/get-scheduler-logs.sh +159 -0
- package/skills/platform/create-skill/SKILL.md +35 -3
- package/skills/platform/manage-skill/SKILL.md +9 -2
- package/skills/platform/update-skill/SKILL.md +17 -6
package/dist/tools/pod-exec.js
CHANGED
|
@@ -4,22 +4,12 @@ import { promisify } from "node:util";
|
|
|
4
4
|
import { Text } from "@mariozechner/pi-tui";
|
|
5
5
|
import { renderTextResult, processToolOutput } from "./tool-render.js";
|
|
6
6
|
import { checkPodRunning } from "./k8s-checks.js";
|
|
7
|
-
import { resolveKubeconfigPath } from "./kubeconfig-resolver.js";
|
|
8
|
-
import { sanitizeEnv } from "./sanitize-env.js";
|
|
9
|
-
import { validateCommand } from "./node-exec.js";
|
|
10
7
|
import { parseArgs } from "./command-sets.js";
|
|
8
|
+
import { validateCommand } from "./command-validator.js";
|
|
9
|
+
import { validatePodName, prepareExecEnv } from "./exec-utils.js";
|
|
11
10
|
const execFileAsync = promisify(execFile);
|
|
12
|
-
//
|
|
13
|
-
|
|
14
|
-
export function validatePodName(pod) {
|
|
15
|
-
if (!pod || !pod.trim()) {
|
|
16
|
-
return "Pod name must not be empty.";
|
|
17
|
-
}
|
|
18
|
-
if (!POD_NAME_RE.test(pod)) {
|
|
19
|
-
return `Invalid pod name "${pod}". Pod names may only contain lowercase letters, digits, hyphens, and dots.`;
|
|
20
|
-
}
|
|
21
|
-
return null;
|
|
22
|
-
}
|
|
11
|
+
// Re-export for backward compatibility (tests + downstream imports)
|
|
12
|
+
export { validatePodName } from "./exec-utils.js";
|
|
23
13
|
export function createPodExecTool(kubeconfigRef) {
|
|
24
14
|
return {
|
|
25
15
|
name: "pod_exec",
|
|
@@ -81,13 +71,7 @@ Examples:
|
|
|
81
71
|
renderResult: renderTextResult,
|
|
82
72
|
async execute(_toolCallId, rawParams) {
|
|
83
73
|
const params = rawParams;
|
|
84
|
-
const
|
|
85
|
-
const kubeconfigArgs = kubeconfigPath ? [`--kubeconfig=${kubeconfigPath}`] : [];
|
|
86
|
-
const childEnv = {
|
|
87
|
-
...sanitizeEnv(process.env),
|
|
88
|
-
...(kubeconfigRef?.credentialsDir ? { SICLAW_CREDENTIALS_DIR: kubeconfigRef.credentialsDir } : {}),
|
|
89
|
-
KUBECONFIG: "/dev/null",
|
|
90
|
-
};
|
|
74
|
+
const env = prepareExecEnv(kubeconfigRef);
|
|
91
75
|
const pod = params.pod?.trim();
|
|
92
76
|
const namespace = params.namespace?.trim() || "default";
|
|
93
77
|
// Validate pod name
|
|
@@ -98,8 +82,8 @@ Examples:
|
|
|
98
82
|
details: { blocked: true, reason: "invalid_pod_name" },
|
|
99
83
|
};
|
|
100
84
|
}
|
|
101
|
-
// Validate command
|
|
102
|
-
const cmdErr = validateCommand(params.command);
|
|
85
|
+
// Validate command
|
|
86
|
+
const cmdErr = validateCommand(params.command, { context: "pod" });
|
|
103
87
|
if (cmdErr) {
|
|
104
88
|
return {
|
|
105
89
|
content: [{ type: "text", text: cmdErr }],
|
|
@@ -107,7 +91,7 @@ Examples:
|
|
|
107
91
|
};
|
|
108
92
|
}
|
|
109
93
|
// Check pod exists and is Running
|
|
110
|
-
const podCheckErr = await checkPodRunning(pod, namespace, childEnv, kubeconfigPath ?? undefined);
|
|
94
|
+
const podCheckErr = await checkPodRunning(pod, namespace, env.childEnv, env.kubeconfigPath ?? undefined);
|
|
111
95
|
if (podCheckErr) {
|
|
112
96
|
return {
|
|
113
97
|
content: [{ type: "text", text: JSON.stringify({ error: podCheckErr }, null, 2) }],
|
|
@@ -117,13 +101,13 @@ Examples:
|
|
|
117
101
|
const timeout = Math.min(params.timeout_seconds ?? 30, 120) * 1000;
|
|
118
102
|
const cmdArgs = parseArgs(params.command);
|
|
119
103
|
// Build kubectl exec args
|
|
120
|
-
const kubectlArgs = [...kubeconfigArgs, "exec", pod, "-n", namespace];
|
|
104
|
+
const kubectlArgs = [...env.kubeconfigArgs, "exec", pod, "-n", namespace];
|
|
121
105
|
if (params.container?.trim()) {
|
|
122
106
|
kubectlArgs.push("-c", params.container.trim());
|
|
123
107
|
}
|
|
124
108
|
kubectlArgs.push("--", ...cmdArgs);
|
|
125
109
|
try {
|
|
126
|
-
const { stdout, stderr } = await execFileAsync("kubectl", kubectlArgs, { timeout, env: childEnv });
|
|
110
|
+
const { stdout, stderr } = await execFileAsync("kubectl", kubectlArgs, { timeout, env: env.childEnv });
|
|
127
111
|
const output = stdout.trim() + (stderr.trim() ? `\n\nSTDERR:\n${stderr.trim()}` : "");
|
|
128
112
|
return {
|
|
129
113
|
content: [{ type: "text", text: processToolOutput(output) }],
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"pod-exec.js","sourceRoot":"","sources":["../../src/tools/pod-exec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,54 +1,11 @@
|
|
|
1
1
|
import { Type } from "@sinclair/typebox";
|
|
2
|
-
import { spawn } from "node:child_process";
|
|
3
|
-
import { randomBytes } from "node:crypto";
|
|
4
2
|
import { Text } from "@mariozechner/pi-tui";
|
|
5
|
-
import { renderTextResult
|
|
6
|
-
import { checkNodeReady, waitForPodDone } from "./k8s-checks.js";
|
|
7
|
-
import { validateCommand } from "./node-exec.js";
|
|
8
|
-
import { parseArgs } from "./command-sets.js";
|
|
9
|
-
import { validatePodName } from "./pod-exec.js";
|
|
3
|
+
import { renderTextResult } from "./tool-render.js";
|
|
10
4
|
import { loadConfig } from "../core/config.js";
|
|
11
|
-
import {
|
|
5
|
+
import { parseArgs } from "./command-sets.js";
|
|
6
|
+
import { validateCommand } from "./command-validator.js";
|
|
7
|
+
import { validatePodName, prepareExecEnv, resolveContainerNetns, runInDebugPod, formatExecOutput, } from "./exec-utils.js";
|
|
12
8
|
const DEFAULT_IMAGE = loadConfig().debugImage;
|
|
13
|
-
// Valid pod name: RFC 1123 subdomain
|
|
14
|
-
const POD_NAME_RE = /^[a-z0-9][a-z0-9.\-]*$/;
|
|
15
|
-
function spawnAsync(cmd, args, timeout, env) {
|
|
16
|
-
return new Promise((resolve, reject) => {
|
|
17
|
-
let stdout = "";
|
|
18
|
-
let stderr = "";
|
|
19
|
-
const child = spawn(cmd, args, {
|
|
20
|
-
stdio: ["ignore", "pipe", "pipe"],
|
|
21
|
-
env,
|
|
22
|
-
});
|
|
23
|
-
child.stdout.on("data", (chunk) => {
|
|
24
|
-
stdout += chunk.toString();
|
|
25
|
-
});
|
|
26
|
-
child.stderr.on("data", (chunk) => {
|
|
27
|
-
stderr += chunk.toString();
|
|
28
|
-
});
|
|
29
|
-
const timer = setTimeout(() => {
|
|
30
|
-
child.kill("SIGKILL");
|
|
31
|
-
}, timeout);
|
|
32
|
-
child.on("close", (code) => {
|
|
33
|
-
clearTimeout(timer);
|
|
34
|
-
if (code === 0)
|
|
35
|
-
resolve({ stdout, stderr });
|
|
36
|
-
else
|
|
37
|
-
reject(Object.assign(new Error(`exit ${code}`), { code, stdout, stderr }));
|
|
38
|
-
});
|
|
39
|
-
child.on("error", (err) => {
|
|
40
|
-
clearTimeout(timer);
|
|
41
|
-
reject(err);
|
|
42
|
-
});
|
|
43
|
-
});
|
|
44
|
-
}
|
|
45
|
-
function filterPodNoise(stderr) {
|
|
46
|
-
return stderr
|
|
47
|
-
.split("\n")
|
|
48
|
-
.filter((line) => !line.match(/^pod "node-debug-.*" deleted$/))
|
|
49
|
-
.join("\n")
|
|
50
|
-
.trim();
|
|
51
|
-
}
|
|
52
9
|
export function createPodNsenterExecTool(kubeconfigRef) {
|
|
53
10
|
return {
|
|
54
11
|
name: "pod_nsenter_exec",
|
|
@@ -108,13 +65,9 @@ Examples:
|
|
|
108
65
|
" " + cmd, 0, 0);
|
|
109
66
|
},
|
|
110
67
|
renderResult: renderTextResult,
|
|
111
|
-
async execute(_toolCallId, rawParams) {
|
|
68
|
+
async execute(_toolCallId, rawParams, signal) {
|
|
112
69
|
const params = rawParams;
|
|
113
|
-
const env =
|
|
114
|
-
...sanitizeEnv(process.env),
|
|
115
|
-
...(kubeconfigRef?.credentialsDir ? { SICLAW_CREDENTIALS_DIR: kubeconfigRef.credentialsDir } : {}),
|
|
116
|
-
KUBECONFIG: "/dev/null",
|
|
117
|
-
};
|
|
70
|
+
const env = prepareExecEnv(kubeconfigRef);
|
|
118
71
|
const pod = params.pod?.trim();
|
|
119
72
|
const namespace = params.namespace?.trim() || "default";
|
|
120
73
|
// Validate pod name
|
|
@@ -126,102 +79,21 @@ Examples:
|
|
|
126
79
|
};
|
|
127
80
|
}
|
|
128
81
|
// Validate command
|
|
129
|
-
const cmdErr = validateCommand(params.command);
|
|
82
|
+
const cmdErr = validateCommand(params.command, { context: "nsenter" });
|
|
130
83
|
if (cmdErr) {
|
|
131
84
|
return {
|
|
132
85
|
content: [{ type: "text", text: cmdErr }],
|
|
133
86
|
details: { blocked: true, reason: "command_blocked" },
|
|
134
87
|
};
|
|
135
88
|
}
|
|
136
|
-
//
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
const result = await spawnAsync("kubectl", [
|
|
140
|
-
"get", "pod", pod, "-n", namespace,
|
|
141
|
-
"-o", "jsonpath={.status.phase},{.spec.nodeName}",
|
|
142
|
-
], 10_000, env);
|
|
143
|
-
const parts = result.stdout.trim().split(",");
|
|
144
|
-
const phase = parts[0];
|
|
145
|
-
nodeName = parts[1] || "";
|
|
146
|
-
if (phase !== "Running") {
|
|
147
|
-
return {
|
|
148
|
-
content: [{
|
|
149
|
-
type: "text",
|
|
150
|
-
text: `Error: Pod "${pod}" in namespace "${namespace}" is not Running (phase: ${phase || "unknown"}). Cannot enter its network namespace.`,
|
|
151
|
-
}],
|
|
152
|
-
details: { error: true },
|
|
153
|
-
};
|
|
154
|
-
}
|
|
155
|
-
if (!nodeName) {
|
|
156
|
-
return {
|
|
157
|
-
content: [{
|
|
158
|
-
type: "text",
|
|
159
|
-
text: `Error: could not determine node for pod "${pod}" in namespace "${namespace}".`,
|
|
160
|
-
}],
|
|
161
|
-
details: { error: true },
|
|
162
|
-
};
|
|
163
|
-
}
|
|
164
|
-
}
|
|
165
|
-
catch (err) {
|
|
166
|
-
const stderr = (err.stderr?.trim() || err.message);
|
|
167
|
-
if (stderr.includes("not found")) {
|
|
168
|
-
return {
|
|
169
|
-
content: [{
|
|
170
|
-
type: "text",
|
|
171
|
-
text: `Error: Pod "${pod}" not found in namespace "${namespace}". Check the pod name and namespace.`,
|
|
172
|
-
}],
|
|
173
|
-
details: { error: true },
|
|
174
|
-
};
|
|
175
|
-
}
|
|
176
|
-
return {
|
|
177
|
-
content: [{
|
|
178
|
-
type: "text",
|
|
179
|
-
text: `Error: failed to get pod info: ${stderr}`,
|
|
180
|
-
}],
|
|
181
|
-
details: { error: true },
|
|
182
|
-
};
|
|
183
|
-
}
|
|
184
|
-
// Check node is Ready before creating debug pod
|
|
185
|
-
const nodeCheckErr = await checkNodeReady(nodeName, env);
|
|
186
|
-
if (nodeCheckErr) {
|
|
187
|
-
return {
|
|
188
|
-
content: [{ type: "text", text: `Error: ${nodeCheckErr}` }],
|
|
189
|
-
details: { error: true },
|
|
190
|
-
};
|
|
191
|
-
}
|
|
192
|
-
// Step 2: Get the container ID
|
|
193
|
-
let containerID;
|
|
194
|
-
try {
|
|
195
|
-
const jsonpathExpr = params.container?.trim()
|
|
196
|
-
? `{.status.containerStatuses[?(@.name=="${params.container.trim()}")].containerID}`
|
|
197
|
-
: "{.status.containerStatuses[0].containerID}";
|
|
198
|
-
const result = await spawnAsync("kubectl", ["get", "pod", pod, "-n", namespace, "-o", `jsonpath=${jsonpathExpr}`], 10_000, env);
|
|
199
|
-
containerID = result.stdout.trim();
|
|
200
|
-
if (!containerID) {
|
|
201
|
-
return {
|
|
202
|
-
content: [{
|
|
203
|
-
type: "text",
|
|
204
|
-
text: `Error: could not determine container ID for pod "${pod}". Is the pod running?`,
|
|
205
|
-
}],
|
|
206
|
-
details: { error: true },
|
|
207
|
-
};
|
|
208
|
-
}
|
|
209
|
-
// Strip the runtime prefix (e.g. "containerd://")
|
|
210
|
-
const prefixIdx = containerID.indexOf("://");
|
|
211
|
-
if (prefixIdx !== -1) {
|
|
212
|
-
containerID = containerID.slice(prefixIdx + 3);
|
|
213
|
-
}
|
|
214
|
-
}
|
|
215
|
-
catch (err) {
|
|
89
|
+
// Resolve container network namespace (pod phase + node + container ID)
|
|
90
|
+
const netns = await resolveContainerNetns(pod, namespace, params.container, env);
|
|
91
|
+
if ("error" in netns) {
|
|
216
92
|
return {
|
|
217
|
-
content: [{
|
|
218
|
-
type: "text",
|
|
219
|
-
text: `Error: failed to get container ID: ${err.stderr?.trim() || err.message}`,
|
|
220
|
-
}],
|
|
93
|
+
content: [{ type: "text", text: `Error: ${netns.error}` }],
|
|
221
94
|
details: { error: true },
|
|
222
95
|
};
|
|
223
96
|
}
|
|
224
|
-
// Step 3: Build debug pod with nsenter into pod's netns
|
|
225
97
|
const image = params.image || DEFAULT_IMAGE;
|
|
226
98
|
const timeout = Math.min(params.timeout_seconds ?? 30, 120) * 1000;
|
|
227
99
|
const cmdArgs = parseArgs(params.command);
|
|
@@ -231,7 +103,7 @@ Examples:
|
|
|
231
103
|
// then uses inner nsenter to enter only the pod's network namespace.
|
|
232
104
|
// unshare --mount + sysfs remount ensures /sys reflects the pod's netns.
|
|
233
105
|
const innerScript = `
|
|
234
|
-
CONTAINER_ID="${containerID}"
|
|
106
|
+
CONTAINER_ID="${netns.containerID}"
|
|
235
107
|
PID=$(crictl inspect "$CONTAINER_ID" 2>/dev/null | jq -r ".info.pid")
|
|
236
108
|
if [ -z "$PID" ] || [ "$PID" = "null" ]; then
|
|
237
109
|
echo "Error: cannot find PID for container $CONTAINER_ID" >&2
|
|
@@ -239,94 +111,18 @@ if [ -z "$PID" ] || [ "$PID" = "null" ]; then
|
|
|
239
111
|
fi
|
|
240
112
|
unshare --mount sh -c 'nsenter -t '"$PID"' -n -- mount -t sysfs none /sys 2>/dev/null; nsenter -t '"$PID"' -n -- ${escapedArgs}'
|
|
241
113
|
`.trim();
|
|
242
|
-
const
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
hostNetwork: true,
|
|
249
|
-
containers: [{
|
|
250
|
-
name: podName,
|
|
251
|
-
image,
|
|
252
|
-
securityContext: { privileged: true },
|
|
253
|
-
command: [
|
|
254
|
-
"nsenter", "-t", "1", "-m", "-u", "-i", "-n", "-p",
|
|
255
|
-
"--", "sh", "-c", innerScript,
|
|
256
|
-
],
|
|
257
|
-
}],
|
|
258
|
-
restartPolicy: "Never",
|
|
259
|
-
},
|
|
260
|
-
});
|
|
261
|
-
try {
|
|
262
|
-
// Phase 1: Create pod
|
|
263
|
-
await spawnAsync("kubectl", [
|
|
264
|
-
"run", podName,
|
|
265
|
-
"--restart=Never",
|
|
266
|
-
`--image=${image}`,
|
|
267
|
-
`--overrides=${overrides}`,
|
|
268
|
-
], 30_000, env);
|
|
269
|
-
// Phase 2: Wait for pod to reach terminal phase (Succeeded or Failed)
|
|
270
|
-
try {
|
|
271
|
-
await waitForPodDone(podName, timeout, env);
|
|
272
|
-
}
|
|
273
|
-
catch {
|
|
274
|
-
// Timed out — still fetch logs before cleanup
|
|
275
|
-
}
|
|
276
|
-
// Phase 3: Fetch logs
|
|
277
|
-
let stdout = "";
|
|
278
|
-
let stderr = "";
|
|
279
|
-
try {
|
|
280
|
-
const logsResult = await spawnAsync("kubectl", ["logs", podName], 10_000, env);
|
|
281
|
-
stdout = logsResult.stdout;
|
|
282
|
-
stderr = logsResult.stderr;
|
|
283
|
-
}
|
|
284
|
-
catch (logErr) {
|
|
285
|
-
stdout = logErr.stdout ?? "";
|
|
286
|
-
stderr = logErr.stderr ?? "";
|
|
287
|
-
}
|
|
288
|
-
// Phase 4: Get exit code
|
|
289
|
-
let exitCode = null;
|
|
290
|
-
try {
|
|
291
|
-
const statusResult = await spawnAsync("kubectl", [
|
|
292
|
-
"get", "pod", podName,
|
|
293
|
-
"-o", "jsonpath={.status.containerStatuses[0].state.terminated.exitCode}",
|
|
294
|
-
], 5_000, env);
|
|
295
|
-
const code = parseInt(statusResult.stdout.trim(), 10);
|
|
296
|
-
if (!isNaN(code))
|
|
297
|
-
exitCode = code;
|
|
298
|
-
}
|
|
299
|
-
catch {
|
|
300
|
-
// ignore
|
|
301
|
-
}
|
|
302
|
-
// Phase 5: Cleanup
|
|
303
|
-
spawnAsync("kubectl", ["delete", "pod", podName, "--force", "--grace-period=0"], 10_000, env).catch(() => { });
|
|
304
|
-
const filteredStderr = filterPodNoise(stderr);
|
|
305
|
-
const output = stdout.trim() +
|
|
306
|
-
(filteredStderr ? `\n\nSTDERR:\n${filteredStderr}` : "");
|
|
307
|
-
if (exitCode === 0 || (exitCode === null && stdout.trim())) {
|
|
308
|
-
return {
|
|
309
|
-
content: [{ type: "text", text: processToolOutput(output) }],
|
|
310
|
-
details: { exitCode: exitCode ?? 0 },
|
|
311
|
-
};
|
|
312
|
-
}
|
|
313
|
-
else {
|
|
314
|
-
const errOutput = `Exit code: ${exitCode ?? "unknown"}\n${output}`;
|
|
315
|
-
return {
|
|
316
|
-
content: [{ type: "text", text: processToolOutput(errOutput) }],
|
|
317
|
-
details: { exitCode, error: true },
|
|
318
|
-
};
|
|
319
|
-
}
|
|
320
|
-
}
|
|
321
|
-
catch (err) {
|
|
322
|
-
// Cleanup on unexpected error
|
|
323
|
-
spawnAsync("kubectl", ["delete", "pod", podName, "--force", "--grace-period=0"], 10_000, env).catch(() => { });
|
|
324
|
-
const output = `Exit code: ${err.code ?? "unknown"}\n${err.stdout?.trim() ?? ""}\n${err.stderr?.trim() ?? err.message}`;
|
|
114
|
+
const nsenterCmd = [
|
|
115
|
+
"nsenter", "-t", "1", "-m", "-u", "-i", "-n", "-p",
|
|
116
|
+
"--", "sh", "-c", innerScript,
|
|
117
|
+
];
|
|
118
|
+
const execResult = await runInDebugPod({ nodeName: netns.nodeName, command: nsenterCmd, image }, env, { timeoutMs: timeout, signal });
|
|
119
|
+
if (signal?.aborted) {
|
|
325
120
|
return {
|
|
326
|
-
content: [{ type: "text", text:
|
|
327
|
-
details: {
|
|
121
|
+
content: [{ type: "text", text: "Aborted." }],
|
|
122
|
+
details: { error: true },
|
|
328
123
|
};
|
|
329
124
|
}
|
|
125
|
+
return formatExecOutput(execResult);
|
|
330
126
|
},
|
|
331
127
|
};
|
|
332
128
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pod-nsenter-exec.js","sourceRoot":"","sources":["../../src/tools/pod-nsenter-exec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAG5C,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,aAAa,GAAG,UAAU,EAAE,CAAC,UAAU,CAAC;AAE9C,qCAAqC;AACrC,MAAM,WAAW,GAAG,wBAAwB,CAAC;AAE7C,SAAS,UAAU,CACjB,GAAW,EACX,IAAc,EACd,OAAe,EACf,GAAuB;IAEvB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE;YAC7B,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;YACjC,GAAG;SACJ,CAAC,CAAC;QACH,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;YACxC,MAAM,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;YACxC,MAAM,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC5B,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACxB,CAAC,EAAE,OAAO,CAAC,CAAC;QACZ,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;YACzB,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,IAAI,IAAI,KAAK,CAAC;gBAAE,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;;gBAE1C,MAAM,CACJ,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CACnE,CAAC;QACN,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YACxB,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,MAAM,CAAC,GAAG,CAAC,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,cAAc,CAAC,MAAc;IACpC,OAAO,MAAM;SACV,KAAK,CAAC,IAAI,CAAC;SACX,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;SAC9D,IAAI,CAAC,IAAI,CAAC;SACV,IAAI,EAAE,CAAC;AACZ,CAAC;AAWD,MAAM,UAAU,wBAAwB,CAAC,aAA6B;IACpE,OAAO;QACL,IAAI,EAAE,kBAAkB;QACxB,KAAK,EAAE,kBAAkB;QACzB,WAAW,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;mDA0BkC;QAC/C,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC;YACtB,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC;gBACf,WAAW,EAAE,oDAAoD;aAClE,CAAC;YACF,SAAS,EAAE,IAAI,CAAC,QAAQ,CACtB,IAAI,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,gCAAgC,EAAE,CAAC,CAC/D;YACD,SAAS,EAAE,IAAI,CAAC,QAAQ,CACtB,IAAI,CAAC,MAAM,CAAC;gBACV,WAAW,EACT,+DAA+D;aAClE,CAAC,CACH;YACD,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC;gBACnB,WAAW,EACT,6FAA6F;aAChG,CAAC;YACF,KAAK,EAAE,IAAI,CAAC,QAAQ,CAClB,IAAI,CAAC,MAAM,CAAC;gBACV,WAAW,EAAE,mCAAmC,aAAa,GAAG;aACjE,CAAC,CACH;YACD,eAAe,EAAE,IAAI,CAAC,QAAQ,CAC5B,IAAI,CAAC,MAAM,CAAC;gBACV,WAAW,EAAE,4CAA4C;aAC1D,CAAC,CACH;SACF,CAAC;QACF,UAAU,CAAC,IAAS,EAAE,KAAU;YAC9B,MAAM,GAAG,GAAG,IAAI,EAAE,GAAG,IAAI,KAAK,CAAC;YAC/B,MAAM,EAAE,GAAG,IAAI,EAAE,SAAS,IAAI,SAAS,CAAC;YACxC,MAAM,GAAG,GAAG,IAAI,EAAE,OAAO,IAAI,KAAK,CAAC;YACnC,OAAO,IAAI,IAAI,CACb,KAAK,CAAC,EAAE,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;gBACnD,GAAG,GAAG,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,IAAI,GAAG,EAAE,CAAC;gBACxC,GAAG,GAAG,KAAK,CAAC,EAAE,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC5C,GAAG,GAAG,GAAG,EACX,CAAC,EAAE,CAAC,CACL,CAAC;QACJ,CAAC;QACD,YAAY,EAAE,gBAAgB;QAC9B,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS;YAClC,MAAM,MAAM,GAAG,SAAiC,CAAC;YACjD,MAAM,GAAG,GAAG;gBACV,GAAG,WAAW,CAAC,OAAO,CAAC,GAA6B,CAAC;gBACrD,GAAG,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,sBAAsB,EAAE,aAAa,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAClG,UAAU,EAAE,WAAW;aACxB,CAAC;YACF,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC;YAC/B,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,SAAS,CAAC;YAExD,oBAAoB;YACpB,MAAM,MAAM,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;YACpC,IAAI,MAAM,EAAE,CAAC;gBACX,OAAO;oBACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;oBAC7E,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,kBAAkB,EAAE;iBACvD,CAAC;YACJ,CAAC;YAED,mBAAmB;YACnB,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC/C,IAAI,MAAM,EAAE,CAAC;gBACX,OAAO;oBACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;oBACzC,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,iBAAiB,EAAE;iBACtD,CAAC;YACJ,CAAC;YAED,2CAA2C;YAC3C,IAAI,QAAgB,CAAC;YACrB,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,UAAU,CAC7B,SAAS,EACT;oBACE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS;oBAClC,IAAI,EAAE,2CAA2C;iBAClD,EACD,MAAM,EACN,GAAG,CACJ,CAAC;gBACF,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC9C,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBACvB,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBAC1B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;oBACxB,OAAO;wBACL,OAAO,EAAE,CAAC;gCACR,IAAI,EAAE,MAAM;gCACZ,IAAI,EAAE,eAAe,GAAG,mBAAmB,SAAS,4BAA4B,KAAK,IAAI,SAAS,wCAAwC;6BAC3I,CAAC;wBACF,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;qBACzB,CAAC;gBACJ,CAAC;gBACD,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACd,OAAO;wBACL,OAAO,EAAE,CAAC;gCACR,IAAI,EAAE,MAAM;gCACZ,IAAI,EAAE,4CAA4C,GAAG,mBAAmB,SAAS,IAAI;6BACtF,CAAC;wBACF,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;qBACzB,CAAC;gBACJ,CAAC;YACH,CAAC;YAAC,OAAO,GAAQ,EAAE,CAAC;gBAClB,MAAM,MAAM,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,CAAC,OAAO,CAAW,CAAC;gBAC7D,IAAI,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;oBACjC,OAAO;wBACL,OAAO,EAAE,CAAC;gCACR,IAAI,EAAE,MAAM;gCACZ,IAAI,EAAE,eAAe,GAAG,6BAA6B,SAAS,sCAAsC;6BACrG,CAAC;wBACF,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;qBACzB,CAAC;gBACJ,CAAC;gBACD,OAAO;oBACL,OAAO,EAAE,CAAC;4BACR,IAAI,EAAE,MAAM;4BACZ,IAAI,EAAE,kCAAkC,MAAM,EAAE;yBACjD,CAAC;oBACF,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;iBACzB,CAAC;YACJ,CAAC;YAED,gDAAgD;YAChD,MAAM,YAAY,GAAG,MAAM,cAAc,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;YACzD,IAAI,YAAY,EAAE,CAAC;gBACjB,OAAO;oBACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,YAAY,EAAE,EAAE,CAAC;oBAC3D,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;iBACzB,CAAC;YACJ,CAAC;YAED,+BAA+B;YAC/B,IAAI,WAAmB,CAAC;YACxB,IAAI,CAAC;gBACH,MAAM,YAAY,GAAG,MAAM,CAAC,SAAS,EAAE,IAAI,EAAE;oBAC3C,CAAC,CAAC,yCAAyC,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,kBAAkB;oBACpF,CAAC,CAAC,4CAA4C,CAAC;gBACjD,MAAM,MAAM,GAAG,MAAM,UAAU,CAC7B,SAAS,EACT,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,YAAY,YAAY,EAAE,CAAC,EACtE,MAAM,EACN,GAAG,CACJ,CAAC;gBACF,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;gBACnC,IAAI,CAAC,WAAW,EAAE,CAAC;oBACjB,OAAO;wBACL,OAAO,EAAE,CAAC;gCACR,IAAI,EAAE,MAAM;gCACZ,IAAI,EAAE,oDAAoD,GAAG,wBAAwB;6BACtF,CAAC;wBACF,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;qBACzB,CAAC;gBACJ,CAAC;gBACD,kDAAkD;gBAClD,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBAC7C,IAAI,SAAS,KAAK,CAAC,CAAC,EAAE,CAAC;oBACrB,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;gBACjD,CAAC;YACH,CAAC;YAAC,OAAO,GAAQ,EAAE,CAAC;gBAClB,OAAO;oBACL,OAAO,EAAE,CAAC;4BACR,IAAI,EAAE,MAAM;4BACZ,IAAI,EAAE,sCAAsC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,CAAC,OAAO,EAAE;yBAChF,CAAC;oBACF,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;iBACzB,CAAC;YACJ,CAAC;YAED,wDAAwD;YACxD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,aAAa,CAAC;YAC5C,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,eAAe,IAAI,EAAE,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;YACnE,MAAM,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAE1C,qEAAqE;YACrE,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAE5F,uDAAuD;YACvD,qEAAqE;YACrE,yEAAyE;YACzE,MAAM,WAAW,GAAG;gBACV,WAAW;;;;;;mHAMwF,WAAW;CAC7H,CAAC,IAAI,EAAE,CAAC;YAEH,MAAM,KAAK,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAC7C,MAAM,OAAO,GAAG,cAAc,KAAK,EAAE,CAAC;YAEtC,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;gBAC/B,IAAI,EAAE;oBACJ,QAAQ;oBACR,OAAO,EAAE,IAAI;oBACb,WAAW,EAAE,IAAI;oBACjB,UAAU,EAAE,CAAC;4BACX,IAAI,EAAE,OAAO;4BACb,KAAK;4BACL,eAAe,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE;4BACrC,OAAO,EAAE;gCACP,SAAS,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;gCAClD,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW;6BAC9B;yBACF,CAAC;oBACF,aAAa,EAAE,OAAO;iBACvB;aACF,CAAC,CAAC;YAEH,IAAI,CAAC;gBACH,sBAAsB;gBACtB,MAAM,UAAU,CACd,SAAS,EACT;oBACE,KAAK,EAAE,OAAO;oBACd,iBAAiB;oBACjB,WAAW,KAAK,EAAE;oBAClB,eAAe,SAAS,EAAE;iBAC3B,EACD,MAAM,EACN,GAAG,CACJ,CAAC;gBAEF,sEAAsE;gBACtE,IAAI,CAAC;oBACH,MAAM,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;gBAC9C,CAAC;gBAAC,MAAM,CAAC;oBACP,8CAA8C;gBAChD,CAAC;gBAED,sBAAsB;gBACtB,IAAI,MAAM,GAAG,EAAE,CAAC;gBAChB,IAAI,MAAM,GAAG,EAAE,CAAC;gBAChB,IAAI,CAAC;oBACH,MAAM,UAAU,GAAG,MAAM,UAAU,CACjC,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,CAC1C,CAAC;oBACF,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;oBAC3B,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;gBAC7B,CAAC;gBAAC,OAAO,MAAW,EAAE,CAAC;oBACrB,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;oBAC7B,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;gBAC/B,CAAC;gBAED,yBAAyB;gBACzB,IAAI,QAAQ,GAAkB,IAAI,CAAC;gBACnC,IAAI,CAAC;oBACH,MAAM,YAAY,GAAG,MAAM,UAAU,CACnC,SAAS,EACT;wBACE,KAAK,EAAE,KAAK,EAAE,OAAO;wBACrB,IAAI,EAAE,mEAAmE;qBAC1E,EACD,KAAK,EACL,GAAG,CACJ,CAAC;oBACF,MAAM,IAAI,GAAG,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;oBACtD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;wBAAE,QAAQ,GAAG,IAAI,CAAC;gBACpC,CAAC;gBAAC,MAAM,CAAC;oBACP,SAAS;gBACX,CAAC;gBAED,mBAAmB;gBACnB,UAAU,CACR,SAAS,EACT,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,kBAAkB,CAAC,EACzD,MAAM,EACN,GAAG,CACJ,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;gBAElB,MAAM,cAAc,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;gBAC9C,MAAM,MAAM,GACV,MAAM,CAAC,IAAI,EAAE;oBACb,CAAC,cAAc,CAAC,CAAC,CAAC,gBAAgB,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAE3D,IAAI,QAAQ,KAAK,CAAC,IAAI,CAAC,QAAQ,KAAK,IAAI,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;oBAC3D,OAAO;wBACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC;wBAC5D,OAAO,EAAE,EAAE,QAAQ,EAAE,QAAQ,IAAI,CAAC,EAAE;qBACrC,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,MAAM,SAAS,GAAG,cAAc,QAAQ,IAAI,SAAS,KAAK,MAAM,EAAE,CAAC;oBACnE,OAAO;wBACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,CAAC,SAAS,CAAC,EAAE,CAAC;wBAC/D,OAAO,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE;qBACnC,CAAC;gBACJ,CAAC;YACH,CAAC;YAAC,OAAO,GAAQ,EAAE,CAAC;gBAClB,8BAA8B;gBAC9B,UAAU,CACR,SAAS,EACT,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,kBAAkB,CAAC,EACzD,MAAM,EACN,GAAG,CACJ,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;gBAClB,MAAM,MAAM,GAAG,cAAc,GAAG,CAAC,IAAI,IAAI,SAAS,KAAK,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;gBACxH,OAAO;oBACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC;oBAC5D,OAAO,EAAE,EAAE,QAAQ,EAAE,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE;iBAC7C,CAAC;YACJ,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"pod-nsenter-exec.js","sourceRoot":"","sources":["../../src/tools/pod-nsenter-exec.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/pod-script.js
CHANGED
|
@@ -4,11 +4,8 @@ import { Text } from "@mariozechner/pi-tui";
|
|
|
4
4
|
import { resolveScript } from "./script-resolver.js";
|
|
5
5
|
import { processToolOutput, renderTextResult } from "./tool-render.js";
|
|
6
6
|
import { checkPodRunning } from "./k8s-checks.js";
|
|
7
|
-
import { resolveKubeconfigPath } from "./kubeconfig-resolver.js";
|
|
8
|
-
import { sanitizeEnv } from "./sanitize-env.js";
|
|
9
7
|
import { parseArgs, shellEscape } from "./command-sets.js";
|
|
10
|
-
|
|
11
|
-
const POD_NAME_RE = /^[a-z0-9][a-z0-9.\-]*$/;
|
|
8
|
+
import { validatePodName, prepareExecEnv } from "./exec-utils.js";
|
|
12
9
|
export function createPodScriptTool(kubeconfigRef) {
|
|
13
10
|
return {
|
|
14
11
|
name: "pod_script",
|
|
@@ -60,16 +57,17 @@ Examples:
|
|
|
60
57
|
}),
|
|
61
58
|
async execute(_toolCallId, rawParams, signal) {
|
|
62
59
|
const params = rawParams;
|
|
60
|
+
const env = prepareExecEnv(kubeconfigRef);
|
|
63
61
|
const pod = params.pod?.trim();
|
|
64
62
|
const namespace = params.namespace?.trim() || "default";
|
|
65
|
-
|
|
63
|
+
// Validate pod name
|
|
64
|
+
const podErr = validatePodName(pod);
|
|
65
|
+
if (podErr) {
|
|
66
66
|
return {
|
|
67
|
-
content: [
|
|
68
|
-
{
|
|
67
|
+
content: [{
|
|
69
68
|
type: "text",
|
|
70
69
|
text: `Error: invalid pod name "${pod}". Pod names may only contain lowercase letters, digits, hyphens, and dots.`,
|
|
71
|
-
},
|
|
72
|
-
],
|
|
70
|
+
}],
|
|
73
71
|
details: { error: true },
|
|
74
72
|
};
|
|
75
73
|
}
|
|
@@ -89,14 +87,7 @@ Examples:
|
|
|
89
87
|
const escapedArgs = args ? parseArgs(args).map(shellEscape).join(" ") : "";
|
|
90
88
|
const timeout = Math.min(params.timeout_seconds ?? 180, 300) * 1000;
|
|
91
89
|
// Pre-check: pod exists and is Running
|
|
92
|
-
const
|
|
93
|
-
const kubeconfigArgs = kubeconfigPath ? [`--kubeconfig=${kubeconfigPath}`] : [];
|
|
94
|
-
const childEnv = {
|
|
95
|
-
...sanitizeEnv(process.env),
|
|
96
|
-
...(kubeconfigRef?.credentialsDir ? { SICLAW_CREDENTIALS_DIR: kubeconfigRef.credentialsDir } : {}),
|
|
97
|
-
KUBECONFIG: "/dev/null",
|
|
98
|
-
};
|
|
99
|
-
const podCheckErr = await checkPodRunning(pod, namespace, childEnv, kubeconfigPath ?? undefined);
|
|
90
|
+
const podCheckErr = await checkPodRunning(pod, namespace, env.childEnv, env.kubeconfigPath ?? undefined);
|
|
100
91
|
if (podCheckErr) {
|
|
101
92
|
return {
|
|
102
93
|
content: [{ type: "text", text: `Error: ${podCheckErr}` }],
|
|
@@ -104,7 +95,7 @@ Examples:
|
|
|
104
95
|
};
|
|
105
96
|
}
|
|
106
97
|
// Build kubectl exec args
|
|
107
|
-
const kubectlArgs = [...kubeconfigArgs, "exec", "-i", pod, "-n", namespace];
|
|
98
|
+
const kubectlArgs = [...env.kubeconfigArgs, "exec", "-i", pod, "-n", namespace];
|
|
108
99
|
if (params.container?.trim()) {
|
|
109
100
|
kubectlArgs.push("-c", params.container.trim());
|
|
110
101
|
}
|
|
@@ -119,7 +110,7 @@ Examples:
|
|
|
119
110
|
let stderr = "";
|
|
120
111
|
const child = spawn("kubectl", kubectlArgs, {
|
|
121
112
|
stdio: ["pipe", "pipe", "pipe"],
|
|
122
|
-
env: childEnv,
|
|
113
|
+
env: env.childEnv,
|
|
123
114
|
});
|
|
124
115
|
const onAbort = () => child.kill("SIGKILL");
|
|
125
116
|
signal?.addEventListener("abort", onAbort, { once: true });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pod-script.js","sourceRoot":"","sources":["../../src/tools/pod-script.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE3C,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"pod-script.js","sourceRoot":"","sources":["../../src/tools/pod-script.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,6 @@
|
|
|
1
1
|
import type { ToolDefinition } from "@mariozechner/pi-coding-agent";
|
|
2
2
|
import type { KubeconfigRef } from "../core/agent-factory.js";
|
|
3
|
-
|
|
4
|
-
* Extract individual commands from a shell pipeline.
|
|
5
|
-
* Splits on |, &&, ;, || while respecting quotes and subshells.
|
|
6
|
-
*/
|
|
7
|
-
export declare function extractCommands(input: string): string[];
|
|
8
|
-
/**
|
|
9
|
-
* Validate that a command does not use dangerous shell operators.
|
|
10
|
-
* Scans character-by-character respecting quotes.
|
|
11
|
-
* Blocks: > >> (output redirection, except >&N fd duplication and >/dev/null),
|
|
12
|
-
* $() and backticks (command substitution), <() >() (process substitution).
|
|
13
|
-
* Returns an error message if blocked, or null if safe.
|
|
14
|
-
*/
|
|
15
|
-
export declare function validateShellOperators(command: string): string | null;
|
|
3
|
+
export { extractCommands, validateShellOperators } from "./command-validator.js";
|
|
16
4
|
export { getCommandBinary, ALLOWED_COMMANDS as ALLOWED_BINARIES } from "./command-sets.js";
|
|
17
5
|
/**
|
|
18
6
|
* Validate kubectl commands within a pipeline.
|
|
@@ -20,10 +8,6 @@ export { getCommandBinary, ALLOWED_COMMANDS as ALLOWED_BINARIES } from "./comman
|
|
|
20
8
|
* Returns an error message if blocked, or null if all kubectl commands are safe.
|
|
21
9
|
*/
|
|
22
10
|
export declare function validateKubectlInPipeline(commands: string[]): string | null;
|
|
23
|
-
/**
|
|
24
|
-
* Compatibility wrappers — delegate to shared validateCommandRestrictions.
|
|
25
|
-
* Keeps old imports (validateFindInPipeline etc.) working for tests.
|
|
26
|
-
*/
|
|
27
11
|
export declare function validateFindInPipeline(commands: string[]): string | null;
|
|
28
12
|
/** @deprecated awk/gawk have been removed from the allowed commands list. */
|
|
29
13
|
export declare function validateAwkInPipeline(_commands: string[]): string | null;
|