@zhin.js/agent 1.0.3 → 1.0.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/README.md +26 -0
- package/lib/activity-feedback/ai-bus.d.ts +20 -0
- package/lib/activity-feedback/ai-bus.d.ts.map +1 -0
- package/lib/activity-feedback/ai-bus.js +42 -0
- package/lib/activity-feedback/ai-bus.js.map +1 -0
- package/lib/activity-feedback/config-resolver.d.ts.map +1 -1
- package/lib/activity-feedback/config-resolver.js +34 -5
- package/lib/activity-feedback/config-resolver.js.map +1 -1
- package/lib/activity-feedback/index.d.ts +1 -0
- package/lib/activity-feedback/index.d.ts.map +1 -1
- package/lib/activity-feedback/index.js +1 -0
- package/lib/activity-feedback/index.js.map +1 -1
- package/lib/agent-prompt/registry.d.ts.map +1 -1
- package/lib/agent-prompt/registry.js +2 -2
- package/lib/agent-prompt/registry.js.map +1 -1
- package/lib/agent-prompt/resolver.d.ts.map +1 -1
- package/lib/agent-prompt/resolver.js +2 -2
- package/lib/agent-prompt/resolver.js.map +1 -1
- package/lib/ai-event-subscriber.d.ts +10 -0
- package/lib/ai-event-subscriber.d.ts.map +1 -1
- package/lib/ai-event-subscriber.js +32 -6
- package/lib/ai-event-subscriber.js.map +1 -1
- package/lib/ai-hook-handlers.d.ts +8 -0
- package/lib/ai-hook-handlers.d.ts.map +1 -0
- package/lib/ai-hook-handlers.js +46 -0
- package/lib/ai-hook-handlers.js.map +1 -0
- package/lib/ai-hook-runtime-bus.d.ts +19 -0
- package/lib/ai-hook-runtime-bus.d.ts.map +1 -0
- package/lib/ai-hook-runtime-bus.js +41 -0
- package/lib/ai-hook-runtime-bus.js.map +1 -0
- package/lib/aop/index.d.ts +7 -5
- package/lib/aop/index.d.ts.map +1 -1
- package/lib/aop/index.js +6 -5
- package/lib/aop/index.js.map +1 -1
- package/lib/assistant/domains/home-assistant.js +2 -2
- package/lib/assistant/domains/home-assistant.js.map +1 -1
- package/lib/assistant/event-ingress.js +2 -2
- package/lib/assistant/event-ingress.js.map +1 -1
- package/lib/assistant/index.d.ts +1 -1
- package/lib/assistant/index.d.ts.map +1 -1
- package/lib/assistant/index.js +1 -1
- package/lib/assistant/index.js.map +1 -1
- package/lib/assistant/job-engine.js +2 -2
- package/lib/assistant/job-engine.js.map +1 -1
- package/lib/assistant/job-store.js +2 -2
- package/lib/assistant/job-store.js.map +1 -1
- package/lib/assistant/job-worker.js +2 -2
- package/lib/assistant/job-worker.js.map +1 -1
- package/lib/assistant/notification-router.d.ts.map +1 -1
- package/lib/assistant/notification-router.js +2 -2
- package/lib/assistant/notification-router.js.map +1 -1
- package/lib/assistant/runtime-registry.d.ts +2 -0
- package/lib/assistant/runtime-registry.d.ts.map +1 -1
- package/lib/assistant/runtime-registry.js +19 -5
- package/lib/assistant/runtime-registry.js.map +1 -1
- package/lib/assistant/schedule-tool-runtime.js +2 -2
- package/lib/assistant/schedule-tool-runtime.js.map +1 -1
- package/lib/authoring/define-tool.d.ts +12 -2
- package/lib/authoring/define-tool.d.ts.map +1 -1
- package/lib/authoring/define-tool.js +11 -1
- package/lib/authoring/define-tool.js.map +1 -1
- package/lib/authoring/entries/tools.d.ts +2 -2
- package/lib/authoring/entries/tools.d.ts.map +1 -1
- package/lib/authoring/entries/tools.js +1 -1
- package/lib/authoring/entries/tools.js.map +1 -1
- package/lib/authoring/index.d.ts +2 -2
- package/lib/authoring/index.d.ts.map +1 -1
- package/lib/authoring/index.js +1 -1
- package/lib/authoring/index.js.map +1 -1
- package/lib/bootstrap.js +2 -2
- package/lib/bootstrap.js.map +1 -1
- package/lib/builtin/analyze-media-tool.d.ts.map +1 -1
- package/lib/builtin/analyze-media-tool.js +18 -19
- package/lib/builtin/analyze-media-tool.js.map +1 -1
- package/lib/builtin/bash-tool.d.ts.map +1 -1
- package/lib/builtin/bash-tool.js +7 -21
- package/lib/builtin/bash-tool.js.map +1 -1
- package/lib/builtin/edit-file-tool.d.ts.map +1 -1
- package/lib/builtin/edit-file-tool.js +13 -43
- package/lib/builtin/edit-file-tool.js.map +1 -1
- package/lib/builtin/glob-tool.d.ts.map +1 -1
- package/lib/builtin/glob-tool.js +5 -13
- package/lib/builtin/glob-tool.js.map +1 -1
- package/lib/builtin/grep-tool.d.ts.map +1 -1
- package/lib/builtin/grep-tool.js +5 -13
- package/lib/builtin/grep-tool.js.map +1 -1
- package/lib/builtin/install-skill-tool.d.ts.map +1 -1
- package/lib/builtin/install-skill-tool.js +2 -2
- package/lib/builtin/install-skill-tool.js.map +1 -1
- package/lib/builtin/list-dir-tool.d.ts.map +1 -1
- package/lib/builtin/list-dir-tool.js +5 -13
- package/lib/builtin/list-dir-tool.js.map +1 -1
- package/lib/builtin/read-file-tool.d.ts.map +1 -1
- package/lib/builtin/read-file-tool.js +20 -26
- package/lib/builtin/read-file-tool.js.map +1 -1
- package/lib/builtin/web-fetch-tool.d.ts.map +1 -1
- package/lib/builtin/web-fetch-tool.js +5 -8
- package/lib/builtin/web-fetch-tool.js.map +1 -1
- package/lib/builtin/write-file-tool.d.ts.map +1 -1
- package/lib/builtin/write-file-tool.js +12 -44
- package/lib/builtin/write-file-tool.js.map +1 -1
- package/lib/collaboration/collaboration-delegation.d.ts.map +1 -1
- package/lib/collaboration/collaboration-delegation.js +35 -6
- package/lib/collaboration/collaboration-delegation.js.map +1 -1
- package/lib/collaboration/inbound-turn-route.d.ts.map +1 -1
- package/lib/collaboration/inbound-turn-route.js +35 -18
- package/lib/collaboration/inbound-turn-route.js.map +1 -1
- package/lib/collaboration/index.d.ts +2 -0
- package/lib/collaboration/index.d.ts.map +1 -1
- package/lib/collaboration/index.js +1 -0
- package/lib/collaboration/index.js.map +1 -1
- package/lib/collaboration/runtime-inbound-gate.d.ts +35 -0
- package/lib/collaboration/runtime-inbound-gate.d.ts.map +1 -0
- package/lib/collaboration/runtime-inbound-gate.js +111 -0
- package/lib/collaboration/runtime-inbound-gate.js.map +1 -0
- package/lib/collaboration/runtime-registry.d.ts +2 -2
- package/lib/collaboration/runtime-registry.d.ts.map +1 -1
- package/lib/collaboration/runtime-registry.js +12 -7
- package/lib/collaboration/runtime-registry.js.map +1 -1
- package/lib/core/agent-core-run.d.ts.map +1 -1
- package/lib/core/agent-core-run.js +10 -5
- package/lib/core/agent-core-run.js.map +1 -1
- package/lib/core/agent-loop-standalone.js +2 -2
- package/lib/core/agent-loop-standalone.js.map +1 -1
- package/lib/deferred-worker-runner.d.ts.map +1 -1
- package/lib/deferred-worker-runner.js +2 -2
- package/lib/deferred-worker-runner.js.map +1 -1
- package/lib/discovery/agent-surface.d.ts.map +1 -1
- package/lib/discovery/agent-surface.js +2 -2
- package/lib/discovery/agent-surface.js.map +1 -1
- package/lib/discovery/agents.d.ts +1 -1
- package/lib/discovery/agents.d.ts.map +1 -1
- package/lib/discovery/agents.js +6 -6
- package/lib/discovery/agents.js.map +1 -1
- package/lib/discovery/register-agent-surface.d.ts +8 -2
- package/lib/discovery/register-agent-surface.d.ts.map +1 -1
- package/lib/discovery/register-agent-surface.js +22 -7
- package/lib/discovery/register-agent-surface.js.map +1 -1
- package/lib/discovery/skills.d.ts.map +1 -1
- package/lib/discovery/skills.js +2 -2
- package/lib/discovery/skills.js.map +1 -1
- package/lib/discovery/tools.d.ts.map +1 -1
- package/lib/discovery/tools.js +2 -2
- package/lib/discovery/tools.js.map +1 -1
- package/lib/event/event-emitter.d.ts.map +1 -1
- package/lib/event/event-emitter.js +7 -2
- package/lib/event/event-emitter.js.map +1 -1
- package/lib/event/event-system.js +2 -2
- package/lib/event/event-system.js.map +1 -1
- package/lib/event/logging-middleware.js +2 -2
- package/lib/event/logging-middleware.js.map +1 -1
- package/lib/features/agent-feature.d.ts +23 -0
- package/lib/features/agent-feature.d.ts.map +1 -0
- package/lib/features/agent-feature.js +51 -0
- package/lib/features/agent-feature.js.map +1 -0
- package/lib/features/index.d.ts +3 -0
- package/lib/features/index.d.ts.map +1 -0
- package/lib/features/index.js +3 -0
- package/lib/features/index.js.map +1 -0
- package/lib/features/mcp-feature.d.ts +25 -0
- package/lib/features/mcp-feature.d.ts.map +1 -0
- package/lib/features/mcp-feature.js +52 -0
- package/lib/features/mcp-feature.js.map +1 -0
- package/lib/hooks.d.ts +3 -2
- package/lib/hooks.d.ts.map +1 -1
- package/lib/hooks.js +8 -36
- package/lib/hooks.js.map +1 -1
- package/lib/index.d.ts +28 -10
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +18 -7
- package/lib/index.js.map +1 -1
- package/lib/ingress/capability-ingress.d.ts +75 -0
- package/lib/ingress/capability-ingress.d.ts.map +1 -0
- package/lib/ingress/capability-ingress.js +266 -0
- package/lib/ingress/capability-ingress.js.map +1 -0
- package/lib/ingress/index.d.ts +2 -0
- package/lib/ingress/index.d.ts.map +1 -0
- package/lib/ingress/index.js +2 -0
- package/lib/ingress/index.js.map +1 -0
- package/lib/init/activate-ai-database-storage.d.ts +2 -1
- package/lib/init/activate-ai-database-storage.d.ts.map +1 -1
- package/lib/init/activate-ai-database-storage.js +3 -3
- package/lib/init/activate-ai-database-storage.js.map +1 -1
- package/lib/init/configure-zhin-agent.js +2 -2
- package/lib/init/configure-zhin-agent.js.map +1 -1
- package/lib/init/define-ai-database-models.d.ts +4 -0
- package/lib/init/define-ai-database-models.d.ts.map +1 -0
- package/lib/init/define-ai-database-models.js +33 -0
- package/lib/init/define-ai-database-models.js.map +1 -0
- package/lib/init/register-ai-service.d.ts.map +1 -1
- package/lib/init/register-ai-service.js +3 -0
- package/lib/init/register-ai-service.js.map +1 -1
- package/lib/init/register-builtin-tools.d.ts.map +1 -1
- package/lib/init/register-builtin-tools.js +40 -22
- package/lib/init/register-builtin-tools.js.map +1 -1
- package/lib/init/register-capability-features.d.ts +2 -0
- package/lib/init/register-capability-features.d.ts.map +1 -0
- package/lib/init/register-capability-features.js +28 -0
- package/lib/init/register-capability-features.js.map +1 -0
- package/lib/init/register-db-models.d.ts.map +1 -1
- package/lib/init/register-db-models.js +3 -20
- package/lib/init/register-db-models.js.map +1 -1
- package/lib/init/register-mcp-from-config.d.ts.map +1 -1
- package/lib/init/register-mcp-from-config.js +8 -6
- package/lib/init/register-mcp-from-config.js.map +1 -1
- package/lib/init/types.d.ts +7 -0
- package/lib/init/types.d.ts.map +1 -1
- package/lib/init.d.ts.map +1 -1
- package/lib/init.js +3 -1
- package/lib/init.js.map +1 -1
- package/lib/internal/phase-trace.js +2 -2
- package/lib/internal/phase-trace.js.map +1 -1
- package/lib/internal/prompt-trace.js +2 -2
- package/lib/internal/prompt-trace.js.map +1 -1
- package/lib/memory-layers.d.ts.map +1 -1
- package/lib/memory-layers.js +2 -2
- package/lib/memory-layers.js.map +1 -1
- package/lib/orchestration-runtime-registry.d.ts +1 -1
- package/lib/orchestrator/hook-registry.js +2 -2
- package/lib/orchestrator/hook-registry.js.map +1 -1
- package/lib/orchestrator/index.d.ts +1 -1
- package/lib/orchestrator/index.d.ts.map +1 -1
- package/lib/orchestrator/index.js +1 -1
- package/lib/orchestrator/index.js.map +1 -1
- package/lib/orchestrator/mcp-registry.js +2 -2
- package/lib/orchestrator/mcp-registry.js.map +1 -1
- package/lib/orchestrator/orchestration-repository.js +3 -3
- package/lib/orchestrator/orchestration-repository.js.map +1 -1
- package/lib/orchestrator/orchestration-service.d.ts +3 -1
- package/lib/orchestrator/orchestration-service.d.ts.map +1 -1
- package/lib/orchestrator/orchestration-service.js +25 -6
- package/lib/orchestrator/orchestration-service.js.map +1 -1
- package/lib/orchestrator/remote-agent-registry.js +2 -2
- package/lib/orchestrator/remote-agent-registry.js.map +1 -1
- package/lib/orchestrator/remote-task-poller.js +2 -2
- package/lib/orchestrator/remote-task-poller.js.map +1 -1
- package/lib/orchestrator/tool-registry.d.ts.map +1 -1
- package/lib/orchestrator/tool-registry.js +2 -2
- package/lib/orchestrator/tool-registry.js.map +1 -1
- package/lib/orchestrator/tool-selection.d.ts.map +1 -1
- package/lib/orchestrator/tool-selection.js +2 -2
- package/lib/orchestrator/tool-selection.js.map +1 -1
- package/lib/plugin-ai-hook-bus.d.ts +8 -0
- package/lib/plugin-ai-hook-bus.d.ts.map +1 -1
- package/lib/plugin-ai-hook-bus.js +20 -1
- package/lib/plugin-ai-hook-bus.js.map +1 -1
- package/lib/plugin-runtime/agent-host-port.d.ts +11 -0
- package/lib/plugin-runtime/agent-host-port.d.ts.map +1 -0
- package/lib/plugin-runtime/agent-host-port.js +3 -0
- package/lib/plugin-runtime/agent-host-port.js.map +1 -0
- package/lib/plugin-runtime/agent-runtime.d.ts +11 -0
- package/lib/plugin-runtime/agent-runtime.d.ts.map +1 -0
- package/lib/plugin-runtime/agent-runtime.js +25 -0
- package/lib/plugin-runtime/agent-runtime.js.map +1 -0
- package/lib/plugin-runtime/capability-ingress.d.ts +25 -0
- package/lib/plugin-runtime/capability-ingress.d.ts.map +1 -0
- package/lib/plugin-runtime/capability-ingress.js +77 -0
- package/lib/plugin-runtime/capability-ingress.js.map +1 -0
- package/lib/plugin-runtime/index.d.ts +4 -0
- package/lib/plugin-runtime/index.d.ts.map +1 -0
- package/lib/plugin-runtime/index.js +4 -0
- package/lib/plugin-runtime/index.js.map +1 -0
- package/lib/schedule-manager.d.ts +2 -0
- package/lib/schedule-manager.d.ts.map +1 -1
- package/lib/schedule-manager.js +14 -3
- package/lib/schedule-manager.js.map +1 -1
- package/lib/security/audit-logger.d.ts +19 -5
- package/lib/security/audit-logger.d.ts.map +1 -1
- package/lib/security/audit-logger.js +87 -11
- package/lib/security/audit-logger.js.map +1 -1
- package/lib/security/exec-policy.d.ts +7 -1
- package/lib/security/exec-policy.d.ts.map +1 -1
- package/lib/security/exec-policy.js +92 -4
- package/lib/security/exec-policy.js.map +1 -1
- package/lib/security/index.d.ts +1 -0
- package/lib/security/index.d.ts.map +1 -1
- package/lib/security/index.js +1 -0
- package/lib/security/index.js.map +1 -1
- package/lib/security/owner-approve-always-store.d.ts +20 -15
- package/lib/security/owner-approve-always-store.d.ts.map +1 -1
- package/lib/security/owner-approve-always-store.js +131 -19
- package/lib/security/owner-approve-always-store.js.map +1 -1
- package/lib/security/policy-facade.d.ts +86 -0
- package/lib/security/policy-facade.d.ts.map +1 -0
- package/lib/security/policy-facade.js +230 -0
- package/lib/security/policy-facade.js.map +1 -0
- package/lib/stability/memory-pressure.d.ts.map +1 -1
- package/lib/stability/memory-pressure.js +2 -2
- package/lib/stability/memory-pressure.js.map +1 -1
- package/lib/subagent/subagent-runtime.d.ts.map +1 -1
- package/lib/subagent/subagent-runtime.js +2 -2
- package/lib/subagent/subagent-runtime.js.map +1 -1
- package/lib/subagent/subagent-system-init.js +2 -2
- package/lib/subagent/subagent-system-init.js.map +1 -1
- package/lib/task-executor.d.ts.map +1 -1
- package/lib/task-executor.js +2 -2
- package/lib/task-executor.js.map +1 -1
- package/lib/tool/sources.d.ts.map +1 -1
- package/lib/tool/sources.js +2 -10
- package/lib/tool/sources.js.map +1 -1
- package/lib/turn/auto-continue.js +2 -2
- package/lib/turn/auto-continue.js.map +1 -1
- package/lib/turn/turn-pipeline.js +2 -2
- package/lib/turn/turn-pipeline.js.map +1 -1
- package/lib/typing-indicator/index.d.ts.map +1 -1
- package/lib/typing-indicator/index.js +8 -1
- package/lib/typing-indicator/index.js.map +1 -1
- package/lib/user-profile.js +2 -2
- package/lib/user-profile.js.map +1 -1
- package/lib/zhin-agent/index.d.ts +14 -1
- package/lib/zhin-agent/index.d.ts.map +1 -1
- package/lib/zhin-agent/index.js +21 -2
- package/lib/zhin-agent/index.js.map +1 -1
- package/package.json +16 -6
- package/lib/aop/coordination/index.d.ts +0 -7
- package/lib/aop/coordination/index.d.ts.map +0 -1
- package/lib/aop/coordination/index.js +0 -7
- package/lib/aop/coordination/index.js.map +0 -1
- package/lib/aop/inbound/index.d.ts +0 -7
- package/lib/aop/inbound/index.d.ts.map +0 -1
- package/lib/aop/inbound/index.js +0 -6
- package/lib/aop/inbound/index.js.map +0 -1
|
@@ -3,8 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import * as fs from 'node:fs/promises';
|
|
5
5
|
import * as path from 'node:path';
|
|
6
|
-
import {
|
|
7
|
-
import { checkFilePermission, resolveFilePermissionGate, toolRequesterRoleToFileRole } from '../security/file-role-policy.js';
|
|
6
|
+
import { runToolPolicies, toolPolicyResultToMessage } from '../security/policy-facade.js';
|
|
8
7
|
import { expandHome, nodeErrToFileMessage } from '../discovery/utils.js';
|
|
9
8
|
import { BuiltinBaseTool } from './builtin-base-tool.js';
|
|
10
9
|
import { normalizeContentPartsToPayloads } from '../media/media-normalize.js';
|
|
@@ -40,25 +39,25 @@ export class AnalyzeMediaBuiltinTool extends BuiltinBaseTool {
|
|
|
40
39
|
if (typeof filePathArg !== 'string' || !filePathArg.trim()) {
|
|
41
40
|
return 'Error: file_path is required';
|
|
42
41
|
}
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
42
|
+
// 统一安全策略门面(与原三层手写链等价,旧链以 read_file 身份执行):
|
|
43
|
+
// role-gate(read_file) → file-permission-matrix(read) → sensitive-path
|
|
44
|
+
let fp;
|
|
45
|
+
try {
|
|
46
|
+
fp = expandHome(filePathArg);
|
|
48
47
|
}
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
48
|
+
catch (e) {
|
|
49
|
+
return nodeErrToFileMessage(e, String(filePathArg), 'read');
|
|
50
|
+
}
|
|
51
|
+
const policyGate = toolPolicyResultToMessage(runToolPolicies({
|
|
52
|
+
toolName: 'read_file',
|
|
53
|
+
filePath: fp,
|
|
54
|
+
rawFilePath: filePathArg,
|
|
55
|
+
fileOperation: 'read',
|
|
56
|
+
commMessage,
|
|
57
|
+
}), 'analyze_media');
|
|
58
|
+
if (policyGate)
|
|
59
|
+
return policyGate;
|
|
54
60
|
try {
|
|
55
|
-
const fp = expandHome(filePathArg);
|
|
56
|
-
const sensitiveDecision = checkSensitiveFilePathAccess('read_file', fp, commMessage);
|
|
57
|
-
if (!sensitiveDecision.allowed) {
|
|
58
|
-
if (sensitiveDecision.needsOwnerApproval)
|
|
59
|
-
return toOwnerSignal(sensitiveDecision);
|
|
60
|
-
return toDenyError(sensitiveDecision);
|
|
61
|
-
}
|
|
62
61
|
if (!isMediaPath(fp)) {
|
|
63
62
|
return 'Error: analyze_media 仅支持图片/音频/视频扩展名;文本请用 read_file。';
|
|
64
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyze-media-tool.js","sourceRoot":"","sources":["../../src/builtin/analyze-media-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"analyze-media-tool.js","sourceRoot":"","sources":["../../src/builtin/analyze-media-tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bash-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/bash-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAQ,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAE5D,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,IAAI,EAAE,KAAK,OAAO,EAAE,KAAK,oBAAoB,EAAE,KAAK,UAAU,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"bash-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/bash-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAQ,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAE5D,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,IAAI,EAAE,KAAK,OAAO,EAAE,KAAK,oBAAoB,EAAE,KAAK,UAAU,EAAE,MAAM,eAAe,CAAC;AAOjH,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAIzD,oCAAoC;AACpC,MAAM,MAAM,aAAa,GAAG,CAC1B,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,WAAW,KAClB,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEjD,eAAO,MAAM,eAAe,EAAE,oBAQ7B,CAAC;AAEF,qBAAa,eAAgB,SAAQ,eAAe;IAYhD,OAAO,CAAC,QAAQ,CAAC,SAAS;IAX5B,QAAQ,CAAC,IAAI,UAAU;IACvB,QAAQ,CAAC,WAAW,kJAC6H;IACjJ,QAAQ,CAAC,UAAU,4CAAmB;IACtC,QAAQ,CAAC,IAAI,WAAW;IAExB,mCAAmC;IACnC,OAAO,CAAC,UAAU,CAAU;IAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAS;gBAGlB,SAAS,GAAE,aAAgC,EAC5D,OAAO,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;IAS/C,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;CA+DrF;AAED,wBAAgB,cAAc,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAEpD"}
|
package/lib/builtin/bash-tool.js
CHANGED
|
@@ -3,10 +3,8 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import { exec } from 'node:child_process';
|
|
5
5
|
import { promisify } from 'node:util';
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
8
|
-
import { checkBashCommandSafety, classifyBashCommand, } from '../security/file-policy.js';
|
|
9
|
-
import { checkBashSensitiveReadAccess, toDenyError, toOwnerSignal } from '../security/dangerous-tool-policy.js';
|
|
6
|
+
import { classifyBashCommand, } from '../security/file-policy.js';
|
|
7
|
+
import { runToolPolicies, toolPolicyResultToMessage } from '../security/policy-facade.js';
|
|
10
8
|
import { getSandbox } from '../security/sandbox.js';
|
|
11
9
|
import { errMsg } from '../discovery/utils.js';
|
|
12
10
|
import { BuiltinBaseTool } from './builtin-base-tool.js';
|
|
@@ -42,23 +40,11 @@ export class BashBuiltinTool extends BuiltinBaseTool {
|
|
|
42
40
|
const cmd = String(args.command || '');
|
|
43
41
|
if (!cmd.trim())
|
|
44
42
|
return 'Error: command is required';
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
if (sensitiveRead.needsOwnerApproval)
|
|
51
|
-
return toOwnerSignal(sensitiveRead);
|
|
52
|
-
return toDenyError(sensitiveRead);
|
|
53
|
-
}
|
|
54
|
-
const requesterRole = commMessage && this.hostPlugin
|
|
55
|
-
? resolveToolRequesterRole(this.hostPlugin, commMessage)
|
|
56
|
-
: 'unknown';
|
|
57
|
-
const role = toolRequesterRoleToFileRole(requesterRole);
|
|
58
|
-
const filePermResult = checkBashFilePermission(role, cmd);
|
|
59
|
-
const filePermGate = resolveFilePermissionGate(filePermResult, 'bash');
|
|
60
|
-
if (filePermGate)
|
|
61
|
-
return filePermGate;
|
|
43
|
+
// 统一安全策略门面(与原三层手写链等价;不传 config,exec-policy 层不激活):
|
|
44
|
+
// bash-command-safety → bash-sensitive-read → bash-file-permission
|
|
45
|
+
const policyGate = toolPolicyResultToMessage(runToolPolicies({ toolName: 'bash', command: cmd, commMessage, hostPlugin: this.hostPlugin }), 'bash');
|
|
46
|
+
if (policyGate)
|
|
47
|
+
return policyGate;
|
|
62
48
|
const timeout = args.timeout ?? 30000;
|
|
63
49
|
const classification = classifyBashCommand(cmd);
|
|
64
50
|
const cwd = args.cwd || process.cwd();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bash-tool.js","sourceRoot":"","sources":["../../src/builtin/bash-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,IAAI,EAAoB,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,
|
|
1
|
+
{"version":3,"file":"bash-tool.js","sourceRoot":"","sources":["../../src/builtin/bash-tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edit-file-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/edit-file-tool.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"edit-file-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/edit-file-tool.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAOrF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAMzD,eAAO,MAAM,oBAAoB,EAAE,oBAWlC,CAAC;AAEF,qBAAa,mBAAoB,SAAQ,eAAe;IACtD,QAAQ,CAAC,IAAI,eAAe;IAC5B,QAAQ,CAAC,WAAW,6JACwI;IAC5J,QAAQ,CAAC,UAAU,4CAAwB;IAC3C,QAAQ,CAAC,IAAI,UAAU;;IAiBjB,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;CAgErF;AAED,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC"}
|
|
@@ -2,11 +2,9 @@
|
|
|
2
2
|
* edit_file — 内置查找替换编辑
|
|
3
3
|
*/
|
|
4
4
|
import * as fs from 'node:fs/promises';
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
7
|
-
import { checkFileToolAccess, checkSensitiveFilePathAccess, checkDangerousToolAccess, toDenyError, toOwnerSignal } from '../security/dangerous-tool-policy.js';
|
|
5
|
+
import { MAX_EDIT_FILE_SIZE, isFileStale, } from '../security/file-policy.js';
|
|
6
|
+
import { runToolPolicies, toolPolicyResultToMessage } from '../security/policy-facade.js';
|
|
8
7
|
import { expandHome, nodeErrToFileMessage } from '../discovery/utils.js';
|
|
9
|
-
import { checkMemoryWritePath } from '../memory-layers.js';
|
|
10
8
|
import { BuiltinBaseTool } from './builtin-base-tool.js';
|
|
11
9
|
import { findActualStringInFile, preserveQuoteStyleInEdit, } from './file-edit-quote-utils.js';
|
|
12
10
|
export const EDIT_FILE_PARAMETERS = {
|
|
@@ -44,48 +42,20 @@ export class EditFileBuiltinTool extends BuiltinBaseTool {
|
|
|
44
42
|
if (typeof newStringArg !== 'string') {
|
|
45
43
|
return 'Error: new_string is required';
|
|
46
44
|
}
|
|
47
|
-
//
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
}
|
|
54
|
-
// 第 1.5 层:危险工具审批
|
|
55
|
-
const dangerousDecision = checkDangerousToolAccess('edit_file', commMessage);
|
|
56
|
-
if (!dangerousDecision.allowed) {
|
|
57
|
-
if (dangerousDecision.needsOwnerApproval)
|
|
58
|
-
return toOwnerSignal(dangerousDecision);
|
|
59
|
-
return toDenyError(dangerousDecision);
|
|
45
|
+
// 统一安全策略门面(与原七层手写链等价):
|
|
46
|
+
// role-gate → dangerous-tool-approval → file-permission-matrix(update) →
|
|
47
|
+
// memory-write-path → sensitive-path → blocked-device-path → workspace-access
|
|
48
|
+
let fp;
|
|
49
|
+
try {
|
|
50
|
+
fp = expandHome(filePathArg);
|
|
60
51
|
}
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
const permResult = checkFilePermission(fileRole, 'update', filePathArg);
|
|
64
|
-
if (!permResult.allowed) {
|
|
65
|
-
return formatFilePermissionMessage(permResult, 'edit_file');
|
|
52
|
+
catch (e) {
|
|
53
|
+
return nodeErrToFileMessage(e, String(filePathArg), 'edit');
|
|
66
54
|
}
|
|
67
|
-
const
|
|
68
|
-
if (
|
|
69
|
-
return
|
|
55
|
+
const policyGate = toolPolicyResultToMessage(runToolPolicies({ toolName: 'edit_file', filePath: fp, rawFilePath: filePathArg, commMessage }), 'edit_file');
|
|
56
|
+
if (policyGate)
|
|
57
|
+
return policyGate;
|
|
70
58
|
try {
|
|
71
|
-
const fp = expandHome(filePathArg);
|
|
72
|
-
const memoryDecision = checkMemoryWritePath(fp, commMessage);
|
|
73
|
-
if (!memoryDecision.allowed) {
|
|
74
|
-
return `Error: ${memoryDecision.reason}`;
|
|
75
|
-
}
|
|
76
|
-
const sensitiveDecision = checkSensitiveFilePathAccess('edit_file', fp, commMessage);
|
|
77
|
-
if (!sensitiveDecision.allowed) {
|
|
78
|
-
if (sensitiveDecision.needsOwnerApproval)
|
|
79
|
-
return toOwnerSignal(sensitiveDecision);
|
|
80
|
-
return toDenyError(sensitiveDecision);
|
|
81
|
-
}
|
|
82
|
-
if (isBlockedDevicePath(fp)) {
|
|
83
|
-
return `Error: 禁止访问设备路径: ${fp}`;
|
|
84
|
-
}
|
|
85
|
-
const access = checkFileAccess(fp);
|
|
86
|
-
if (!access.allowed) {
|
|
87
|
-
return `ZHIN_NEEDS_OWNER:\n${access.reason}\n\n(文件访问策略拒绝;仅 Owner 确认后在受控环境可重试或调整策略。)`;
|
|
88
|
-
}
|
|
89
59
|
const stat = await fs.stat(fp);
|
|
90
60
|
if (stat.size > MAX_EDIT_FILE_SIZE) {
|
|
91
61
|
return `Error: 文件过大 (${(stat.size / 1024 / 1024).toFixed(1)} MiB),超过 ${MAX_EDIT_FILE_SIZE / 1024 / 1024} MiB 限制。`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edit-file-tool.js","sourceRoot":"","sources":["../../src/builtin/edit-file-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEvC,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"edit-file-tool.js","sourceRoot":"","sources":["../../src/builtin/edit-file-tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glob-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/glob-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAQ,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAE5D,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAIrF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAIzD,oCAAoC;AACpC,MAAM,MAAM,aAAa,GAAG,CAC1B,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,WAAW,KAClB,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEjD,eAAO,MAAM,eAAe,EAAE,oBAO7B,CAAC;AAEF,qBAAa,eAAgB,SAAQ,eAAe;IAOtC,OAAO,CAAC,QAAQ,CAAC,SAAS;IANtC,QAAQ,CAAC,IAAI,UAAU;IACvB,QAAQ,CAAC,WAAW,uHACkG;IACtH,QAAQ,CAAC,UAAU,4CAAmB;IACtC,QAAQ,CAAC,IAAI,UAAU;gBAEM,SAAS,GAAE,aAAgC;IAMlE,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"glob-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/glob-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAQ,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAE5D,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAIrF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAIzD,oCAAoC;AACpC,MAAM,MAAM,aAAa,GAAG,CAC1B,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,WAAW,KAClB,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEjD,eAAO,MAAM,eAAe,EAAE,oBAO7B,CAAC;AAEF,qBAAa,eAAgB,SAAQ,eAAe;IAOtC,OAAO,CAAC,QAAQ,CAAC,SAAS;IANtC,QAAQ,CAAC,IAAI,UAAU;IACvB,QAAQ,CAAC,WAAW,uHACkG;IACtH,QAAQ,CAAC,UAAU,4CAAmB;IACtC,QAAQ,CAAC,IAAI,UAAU;gBAEM,SAAS,GAAE,aAAgC;IAMlE,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;CA2BrF;AAED,wBAAgB,cAAc,IAAI,IAAI,CAErC"}
|
package/lib/builtin/glob-tool.js
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
import { exec } from 'node:child_process';
|
|
5
5
|
import { promisify } from 'node:util';
|
|
6
6
|
import { shellEscape } from '../security/file-policy.js';
|
|
7
|
-
import {
|
|
7
|
+
import { runToolPolicies, toolPolicyResultToMessage } from '../security/policy-facade.js';
|
|
8
8
|
import { errMsg } from '../discovery/utils.js';
|
|
9
9
|
import { BuiltinBaseTool } from './builtin-base-tool.js';
|
|
10
10
|
const defaultExecAsync = promisify(exec);
|
|
@@ -36,18 +36,10 @@ export class GlobBuiltinTool extends BuiltinBaseTool {
|
|
|
36
36
|
try {
|
|
37
37
|
const cwdRaw = args.cwd;
|
|
38
38
|
const cwd = typeof cwdRaw === 'string' && cwdRaw.trim() ? cwdRaw : process.cwd();
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
return toDenyError(roleDecision);
|
|
44
|
-
}
|
|
45
|
-
const sensitiveDecision = checkSensitiveFilePathAccess('glob', cwd, commMessage);
|
|
46
|
-
if (!sensitiveDecision.allowed) {
|
|
47
|
-
if (sensitiveDecision.needsOwnerApproval)
|
|
48
|
-
return toOwnerSignal(sensitiveDecision);
|
|
49
|
-
return toDenyError(sensitiveDecision);
|
|
50
|
-
}
|
|
39
|
+
// 统一安全策略门面(与原两层手写链等价):role-gate → sensitive-path
|
|
40
|
+
const policyGate = toolPolicyResultToMessage(runToolPolicies({ toolName: 'glob', filePath: cwd, commMessage }), 'glob');
|
|
41
|
+
if (policyGate)
|
|
42
|
+
return policyGate;
|
|
51
43
|
const safePattern = shellEscape(patternArg);
|
|
52
44
|
const { stdout } = await this.execAsync(`find . -path ./${safePattern} -type f 2>/dev/null | head -100`, { cwd });
|
|
53
45
|
const files = stdout.trim().split('\n').filter(Boolean);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glob-tool.js","sourceRoot":"","sources":["../../src/builtin/glob-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,IAAI,EAAoB,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"glob-tool.js","sourceRoot":"","sources":["../../src/builtin/glob-tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grep-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/grep-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAQ,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAG5D,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAIrF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAIzD,oCAAoC;AACpC,MAAM,MAAM,aAAa,GAAG,CAC1B,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,WAAW,KAClB,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEjD,eAAO,MAAM,eAAe,EAAE,oBAc7B,CAAC;AAEF,qBAAa,eAAgB,SAAQ,eAAe;IAOtC,OAAO,CAAC,QAAQ,CAAC,SAAS;IANtC,QAAQ,CAAC,IAAI,UAAU;IACvB,QAAQ,CAAC,WAAW,wHACmG;IACvH,QAAQ,CAAC,UAAU,4CAAmB;IACtC,QAAQ,CAAC,IAAI,UAAU;gBAEM,SAAS,GAAE,aAAgC;IAMlE,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"grep-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/grep-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAQ,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAG5D,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAIrF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAIzD,oCAAoC;AACpC,MAAM,MAAM,aAAa,GAAG,CAC1B,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,WAAW,KAClB,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEjD,eAAO,MAAM,eAAe,EAAE,oBAc7B,CAAC;AAEF,qBAAa,eAAgB,SAAQ,eAAe;IAOtC,OAAO,CAAC,QAAQ,CAAC,SAAS;IANtC,QAAQ,CAAC,IAAI,UAAU;IACvB,QAAQ,CAAC,WAAW,wHACmG;IACvH,QAAQ,CAAC,UAAU,4CAAmB;IACtC,QAAQ,CAAC,IAAI,UAAU;gBAEM,SAAS,GAAE,aAAgC;IAMlE,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;CAgFrF;AAED,wBAAgB,cAAc,IAAI,IAAI,CAErC"}
|
package/lib/builtin/grep-tool.js
CHANGED
|
@@ -5,7 +5,7 @@ import { exec } from 'node:child_process';
|
|
|
5
5
|
import { promisify } from 'node:util';
|
|
6
6
|
import * as path from 'node:path';
|
|
7
7
|
import { shellEscape, buildSensitiveSearchExcludeGlobs } from '../security/file-policy.js';
|
|
8
|
-
import {
|
|
8
|
+
import { runToolPolicies, toolPolicyResultToMessage } from '../security/policy-facade.js';
|
|
9
9
|
import { errMsg } from '../discovery/utils.js';
|
|
10
10
|
import { BuiltinBaseTool } from './builtin-base-tool.js';
|
|
11
11
|
const defaultExecAsync = promisify(exec);
|
|
@@ -43,19 +43,11 @@ export class GrepBuiltinTool extends BuiltinBaseTool {
|
|
|
43
43
|
}
|
|
44
44
|
try {
|
|
45
45
|
const searchPath = typeof args.path === 'string' && args.path.trim() ? args.path : '.';
|
|
46
|
-
const roleDecision = checkFileToolAccess('grep', commMessage);
|
|
47
|
-
if (!roleDecision.allowed) {
|
|
48
|
-
if (roleDecision.needsOwnerApproval)
|
|
49
|
-
return toOwnerSignal(roleDecision);
|
|
50
|
-
return toDenyError(roleDecision);
|
|
51
|
-
}
|
|
52
46
|
const absSearchPath = path.resolve(process.cwd(), searchPath);
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
return toDenyError(sensitiveDecision);
|
|
58
|
-
}
|
|
47
|
+
// 统一安全策略门面(与原两层手写链等价):role-gate → sensitive-path
|
|
48
|
+
const policyGate = toolPolicyResultToMessage(runToolPolicies({ toolName: 'grep', filePath: absSearchPath, commMessage }), 'grep');
|
|
49
|
+
if (policyGate)
|
|
50
|
+
return policyGate;
|
|
59
51
|
const safePattern = shellEscape(patternArg);
|
|
60
52
|
const safePath = shellEscape(searchPath);
|
|
61
53
|
const limit = typeof args.limit === 'number' && Number.isFinite(args.limit) ? args.limit : 50;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grep-tool.js","sourceRoot":"","sources":["../../src/builtin/grep-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,IAAI,EAAoB,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,WAAW,EAAE,gCAAgC,EAAE,MAAM,4BAA4B,CAAC;AAC3F,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"grep-tool.js","sourceRoot":"","sources":["../../src/builtin/grep-tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-skill-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/install-skill-tool.ts"],"names":[],"mappings":"AAKA,OAAO,
|
|
1
|
+
{"version":3,"file":"install-skill-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/install-skill-tool.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,IAAI,EAAE,KAAK,OAAO,EAAE,KAAK,oBAAoB,EAAE,KAAK,UAAU,EAAa,MAAM,eAAe,CAAC;AAE/G,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,WAAW,uBAAuB;IACtC;;;OAGG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,mBAAmB;IACnB,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;CAC1B;AAED,eAAO,MAAM,wBAAwB,EAAE,oBAStC,CAAC;AAIF,qBAAa,uBAAwB,SAAQ,eAAe;IAO9C,OAAO,CAAC,QAAQ,CAAC,IAAI;IANjC,QAAQ,CAAC,IAAI,mBAAmB;IAChC,QAAQ,CAAC,WAAW,mIAC8G;IAClI,QAAQ,CAAC,UAAU,4CAA4B;IAC/C,QAAQ,CAAC,IAAI,WAAW;gBAEK,IAAI,GAAE,uBAA4B;IAgB/D,OAAO,CAAC,UAAU;IAIZ,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;CAoCtF;AAED,wBAAgB,sBAAsB,CAAC,IAAI,CAAC,EAAE,uBAAuB,GAAG,IAAI,CAE3E"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import * as fs from 'node:fs/promises';
|
|
5
5
|
import * as path from 'node:path';
|
|
6
|
-
import {
|
|
6
|
+
import { getLogger } from '@zhin.js/core';
|
|
7
7
|
import { errMsg } from '../discovery/utils.js';
|
|
8
8
|
import { BuiltinBaseTool } from './builtin-base-tool.js';
|
|
9
9
|
export const INSTALL_SKILL_PARAMETERS = {
|
|
@@ -16,7 +16,7 @@ export const INSTALL_SKILL_PARAMETERS = {
|
|
|
16
16
|
},
|
|
17
17
|
required: ['url'],
|
|
18
18
|
};
|
|
19
|
-
const logger =
|
|
19
|
+
const logger = getLogger('install-skill-tool');
|
|
20
20
|
export class InstallSkillBuiltinTool extends BuiltinBaseTool {
|
|
21
21
|
opts;
|
|
22
22
|
name = 'install_skill';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-skill-tool.js","sourceRoot":"","sources":["../../src/builtin/install-skill-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,
|
|
1
|
+
{"version":3,"file":"install-skill-tool.js","sourceRoot":"","sources":["../../src/builtin/install-skill-tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-dir-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/list-dir-tool.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAGrF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,eAAO,MAAM,mBAAmB,EAAE,oBASjC,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,eAAe;IACrD,QAAQ,CAAC,IAAI,cAAc;IAC3B,QAAQ,CAAC,WAAW,8GACyF;IAC7G,QAAQ,CAAC,UAAU,4CAAuB;IAC1C,QAAQ,CAAC,IAAI,UAAU;;IAmBjB,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"list-dir-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/list-dir-tool.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAGrF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,eAAO,MAAM,mBAAmB,EAAE,oBASjC,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,eAAe;IACrD,QAAQ,CAAC,IAAI,cAAc;IAC3B,QAAQ,CAAC,WAAW,8GACyF;IAC7G,QAAQ,CAAC,UAAU,4CAAuB;IAC1C,QAAQ,CAAC,IAAI,UAAU;;IAmBjB,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;CA8BrF;AAED,wBAAgB,iBAAiB,IAAI,IAAI,CAExC"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import * as fs from 'node:fs/promises';
|
|
5
5
|
import * as path from 'node:path';
|
|
6
|
-
import {
|
|
6
|
+
import { runToolPolicies, toolPolicyResultToMessage } from '../security/policy-facade.js';
|
|
7
7
|
import { expandHome, nodeErrToFileMessage } from '../discovery/utils.js';
|
|
8
8
|
import { BuiltinBaseTool } from './builtin-base-tool.js';
|
|
9
9
|
export const LIST_DIR_PARAMETERS = {
|
|
@@ -33,18 +33,10 @@ export class ListDirBuiltinTool extends BuiltinBaseTool {
|
|
|
33
33
|
}
|
|
34
34
|
try {
|
|
35
35
|
const dirPath = path.resolve(process.cwd(), expandHome(pathArg));
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
return toDenyError(roleDecision);
|
|
41
|
-
}
|
|
42
|
-
const sensitiveDecision = checkSensitiveFilePathAccess('list_dir', dirPath, commMessage);
|
|
43
|
-
if (!sensitiveDecision.allowed) {
|
|
44
|
-
if (sensitiveDecision.needsOwnerApproval)
|
|
45
|
-
return toOwnerSignal(sensitiveDecision);
|
|
46
|
-
return toDenyError(sensitiveDecision);
|
|
47
|
-
}
|
|
36
|
+
// 统一安全策略门面(与原两层手写链等价):role-gate → sensitive-path
|
|
37
|
+
const policyGate = toolPolicyResultToMessage(runToolPolicies({ toolName: 'list_dir', filePath: dirPath, commMessage }), 'list_dir');
|
|
38
|
+
if (policyGate)
|
|
39
|
+
return policyGate;
|
|
48
40
|
const stat = await fs.stat(dirPath);
|
|
49
41
|
if (!stat.isDirectory()) {
|
|
50
42
|
return `Error: Not a directory: ${pathArg}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-dir-tool.js","sourceRoot":"","sources":["../../src/builtin/list-dir-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"list-dir-tool.js","sourceRoot":"","sources":["../../src/builtin/list-dir-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,eAAe,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AAC1F,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,CAAC,MAAM,mBAAmB,GAAyB;IACvD,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,+DAA+D;SAC7E;KACF;IACD,QAAQ,EAAE,CAAC,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,OAAO,kBAAmB,SAAQ,eAAe;IAC5C,IAAI,GAAG,UAAU,CAAC;IAClB,WAAW,GAClB,0GAA0G,CAAC;IACpG,UAAU,GAAG,mBAAmB,CAAC;IACjC,IAAI,GAAG,MAAM,CAAC;IAEvB;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC/B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAChB,KAAK,EACL,MAAM,EACN,MAAM,EACN,MAAM,EACN,gBAAgB,EAChB,UAAU,EACV,IAAI,EACJ,KAAK,EACL,MAAM,EACN,OAAO,CACR,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,IAA6B,EAAE,WAAqB;QAC5D,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC;QAC1B,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;YACnD,OAAO,yBAAyB,CAAC;QACnC,CAAC;QACD,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;YACjE,iDAAiD;YACjD,MAAM,UAAU,GAAG,yBAAyB,CAC1C,eAAe,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,EACzE,UAAU,CACX,CAAC;YACF,IAAI,UAAU;gBAAE,OAAO,UAAU,CAAC;YAClC,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACpC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;gBACxB,OAAO,2BAA2B,OAAO,EAAE,CAAC;YAC9C,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;YACnE,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACzB,OAAO,aAAa,OAAO,WAAW,CAAC;YACzC,CAAC;YACD,MAAM,KAAK,GAAa,EAAE,CAAC;YAC3B,KAAK,MAAM,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;gBACrE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC;YACjE,CAAC;YACD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YACpB,OAAO,oBAAoB,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAClD,CAAC;IACH,CAAC;CACF;AAED,MAAM,UAAU,iBAAiB;IAC/B,OAAO,IAAI,kBAAkB,EAAE,CAAC,MAAM,EAAE,CAAC;AAC3C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-file-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/read-file-tool.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"read-file-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/read-file-tool.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAMrF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAUzD,eAAO,MAAM,oBAAoB,EAAE,oBAWlC,CAAC;AAEF,qBAAa,mBAAoB,SAAQ,eAAe;IACtD,QAAQ,CAAC,IAAI,eAAe;IAC5B,QAAQ,CAAC,WAAW,yGACoF;IACxG,QAAQ,CAAC,UAAU,4CAAwB;IAC3C,QAAQ,CAAC,IAAI,UAAU;;IAmBjB,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;CAgDrF;AAED,sCAAsC;AACtC,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC"}
|
|
@@ -3,9 +3,8 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import * as fs from 'node:fs/promises';
|
|
5
5
|
import * as path from 'node:path';
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
8
|
-
import { checkFileToolAccess, checkSensitiveFilePathAccess, toDenyError, toOwnerSignal } from '../security/dangerous-tool-policy.js';
|
|
6
|
+
import { MAX_READ_FILE_SIZE, } from '../security/file-policy.js';
|
|
7
|
+
import { runToolPolicies, toolPolicyResultToMessage } from '../security/policy-facade.js';
|
|
9
8
|
import { expandHome, nodeErrToFileMessage } from '../discovery/utils.js';
|
|
10
9
|
import { BuiltinBaseTool } from './builtin-base-tool.js';
|
|
11
10
|
const IMAGE_EXTENSIONS = new Set([
|
|
@@ -41,31 +40,26 @@ export class ReadFileBuiltinTool extends BuiltinBaseTool {
|
|
|
41
40
|
if (typeof filePathArg !== 'string' || !filePathArg.trim()) {
|
|
42
41
|
return 'Error: file_path is required';
|
|
43
42
|
}
|
|
44
|
-
//
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
43
|
+
// 统一安全策略门面(与原四层手写链等价):
|
|
44
|
+
// role-gate → file-permission-matrix(read) → sensitive-path → blocked-device-path(读类措辞)
|
|
45
|
+
let fp;
|
|
46
|
+
try {
|
|
47
|
+
fp = expandHome(filePathArg);
|
|
48
|
+
}
|
|
49
|
+
catch (e) {
|
|
50
|
+
return nodeErrToFileMessage(e, String(filePathArg), 'read');
|
|
50
51
|
}
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
52
|
+
const policyGate = toolPolicyResultToMessage(runToolPolicies({
|
|
53
|
+
toolName: 'read_file',
|
|
54
|
+
filePath: fp,
|
|
55
|
+
rawFilePath: filePathArg,
|
|
56
|
+
fileOperation: 'read',
|
|
57
|
+
devicePathGuard: true,
|
|
58
|
+
commMessage,
|
|
59
|
+
}), 'read_file');
|
|
60
|
+
if (policyGate)
|
|
61
|
+
return policyGate;
|
|
58
62
|
try {
|
|
59
|
-
const fp = expandHome(filePathArg);
|
|
60
|
-
const sensitiveDecision = checkSensitiveFilePathAccess('read_file', fp, commMessage);
|
|
61
|
-
if (!sensitiveDecision.allowed) {
|
|
62
|
-
if (sensitiveDecision.needsOwnerApproval)
|
|
63
|
-
return toOwnerSignal(sensitiveDecision);
|
|
64
|
-
return toDenyError(sensitiveDecision);
|
|
65
|
-
}
|
|
66
|
-
if (isBlockedDevicePath(fp)) {
|
|
67
|
-
return `Error: 禁止读取设备文件 ${fp}(会导致进程挂起或注入攻击)`;
|
|
68
|
-
}
|
|
69
63
|
const stat = await fs.stat(fp);
|
|
70
64
|
if (stat.size > MAX_READ_FILE_SIZE) {
|
|
71
65
|
return `Error: 文件过大 (${(stat.size / 1024 / 1024).toFixed(1)} MiB),超过 ${MAX_READ_FILE_SIZE / 1024 / 1024} MiB 限制。请使用 offset/limit 分段读取。`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-file-tool.js","sourceRoot":"","sources":["../../src/builtin/read-file-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"read-file-tool.js","sourceRoot":"","sources":["../../src/builtin/read-file-tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-fetch-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/web-fetch-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,KAAK,IAAI,EAAE,KAAK,OAAO,EAAE,KAAK,oBAAoB,EAAE,KAAK,UAAU,EAAmB,MAAM,eAAe,CAAC;AAGrH,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,eAAO,MAAM,4BAA4B,QAAY,CAAC;AAEtD,eAAO,MAAM,oBAAoB,EAAE,oBAOlC,CAAC;AAEF,+EAA+E;AAC/E,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE3D;AAED,kCAAkC;AAClC,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAGtE,qBAAa,mBAAoB,SAAQ,eAAe;IACtD,QAAQ,CAAC,IAAI,eAAe;IAC5B,QAAQ,CAAC,WAAW,8FACyE;IAC7F,QAAQ,CAAC,UAAU,4CAAwB;IAC3C,QAAQ,CAAC,IAAI,SAAS;;IAiBhB,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"web-fetch-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/web-fetch-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,KAAK,IAAI,EAAE,KAAK,OAAO,EAAE,KAAK,oBAAoB,EAAE,KAAK,UAAU,EAAmB,MAAM,eAAe,CAAC;AAGrH,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,eAAO,MAAM,4BAA4B,QAAY,CAAC;AAEtD,eAAO,MAAM,oBAAoB,EAAE,oBAOlC,CAAC;AAEF,+EAA+E;AAC/E,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE3D;AAED,kCAAkC;AAClC,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAGtE,qBAAa,mBAAoB,SAAQ,eAAe;IACtD,QAAQ,CAAC,IAAI,eAAe;IAC5B,QAAQ,CAAC,WAAW,8FACyE;IAC7F,QAAQ,CAAC,UAAU,4CAAwB;IAC3C,QAAQ,CAAC,IAAI,SAAS;;IAiBhB,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;CA0ErF;AAED,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC"}
|