strands-darwin 0.0.47 → 0.0.49
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 +2 -2
- package/README.zh-CN.md +2 -2
- package/dist/patches/{@strands-agents+sdk+1.18.0.patch → @strands-agents+sdk+1.20.0.patch} +28 -52
- package/dist/src/agent/background-delegation.d.ts +1 -1
- package/dist/src/agent/background-delegation.js +3 -3
- package/dist/src/agent/cache-miss.d.ts +3 -3
- package/dist/src/agent/cache-miss.js +6 -3
- package/dist/src/agent/cache-miss.js.map +1 -1
- package/dist/src/agent/compact.js +1 -1
- package/dist/src/agent/cost.d.ts +1 -1
- package/dist/src/agent/permission-rules.d.ts +11 -7
- package/dist/src/agent/permission-rules.js +64 -7
- package/dist/src/agent/permission-rules.js.map +1 -1
- package/dist/src/agent/permission.js +2 -1
- package/dist/src/agent/permission.js.map +1 -1
- package/dist/src/agent/runtime.d.ts +28 -5
- package/dist/src/agent/runtime.js +152 -8
- package/dist/src/agent/runtime.js.map +1 -1
- package/dist/src/agent/session-label-write.d.ts +1 -0
- package/dist/src/agent/session-label-write.js +50 -0
- package/dist/src/agent/session-label-write.js.map +1 -0
- package/dist/src/agent/session-label.d.ts +19 -0
- package/dist/src/agent/session-label.js +112 -0
- package/dist/src/agent/session-label.js.map +1 -0
- package/dist/src/agent/usage-state.d.ts +29 -0
- package/dist/src/agent/usage-state.js +131 -0
- package/dist/src/agent/usage-state.js.map +1 -0
- package/dist/src/agent/usage.d.ts +1 -1
- package/dist/src/agents/child-result-text.d.ts +26 -0
- package/dist/src/agents/child-result-text.js +29 -0
- package/dist/src/agents/child-result-text.js.map +1 -0
- package/dist/src/agents/subagent-tool.js +6 -5
- package/dist/src/agents/subagent-tool.js.map +1 -1
- package/dist/src/agents/workflow-tool.d.ts +15 -2
- package/dist/src/agents/workflow-tool.js +24 -5
- package/dist/src/agents/workflow-tool.js.map +1 -1
- package/dist/src/cli-main.js +4 -0
- package/dist/src/cli-main.js.map +1 -1
- package/dist/src/cli-sessions.d.ts +30 -2
- package/dist/src/cli-sessions.js +53 -13
- package/dist/src/cli-sessions.js.map +1 -1
- package/dist/src/collaboration/local.d.ts +11 -0
- package/dist/src/collaboration/local.js +23 -4
- package/dist/src/collaboration/local.js.map +1 -1
- package/dist/src/commands/custom-commands.d.ts +1 -1
- package/dist/src/commands/custom-commands.js +3 -1
- package/dist/src/commands/custom-commands.js.map +1 -1
- package/dist/src/headless-runner.js +10 -7
- package/dist/src/headless-runner.js.map +1 -1
- package/dist/src/headless.d.ts +1 -1
- package/dist/src/headless.js +1 -1
- package/dist/src/mcp/codegraph-preflight.js +8 -4
- package/dist/src/mcp/codegraph-preflight.js.map +1 -1
- package/dist/src/mcp/oauth-login.js +1 -1
- package/dist/src/mcp/oauth-login.js.map +1 -1
- package/dist/src/mcp/oauth-provider.d.ts +1 -2
- package/dist/src/mcp/oauth-provider.js +9 -0
- package/dist/src/mcp/oauth-provider.js.map +1 -1
- package/dist/src/mcp/oauth-store.d.ts +1 -2
- package/dist/src/mcp/oauth-store.js +9 -2
- package/dist/src/mcp/oauth-store.js.map +1 -1
- package/dist/src/mcp/prompts.d.ts +0 -18
- package/dist/src/mcp/prompts.js +25 -4
- package/dist/src/mcp/prompts.js.map +1 -1
- package/dist/src/mcp/web-search-empty-results.js +8 -4
- package/dist/src/mcp/web-search-empty-results.js.map +1 -1
- package/dist/src/npm-package/patch-package-format.d.ts +5 -5
- package/dist/src/npm-package/patch-package-format.js +4 -4
- package/dist/src/sdk-patch-preflight.js +1 -1
- package/dist/src/tools/file-editor-serial.d.ts +5 -3
- package/dist/src/tools/file-editor-serial.js +5 -3
- package/dist/src/tools/file-editor-serial.js.map +1 -1
- package/dist/src/trajectory/record.d.ts +1 -1
- package/dist/src/tui/App.d.ts +1 -1
- package/dist/src/tui/App.js +48 -17
- package/dist/src/tui/App.js.map +1 -1
- package/dist/src/tui/InputBox.d.ts +4 -2
- package/dist/src/tui/InputBox.js +3 -3
- package/dist/src/tui/InputBox.js.map +1 -1
- package/dist/src/tui/help-format.d.ts +1 -1
- package/dist/src/tui/help-format.js +1 -1
- package/dist/src/tui/prompt-editor.d.ts +15 -7
- package/dist/src/tui/prompt-editor.js +23 -39
- package/dist/src/tui/prompt-editor.js.map +1 -1
- package/dist/src/tui/sessions-format.d.ts +10 -0
- package/dist/src/tui/sessions-format.js +46 -0
- package/dist/src/tui/sessions-format.js.map +1 -0
- package/dist/src/tui/status-format.d.ts +2 -0
- package/dist/src/tui/status-format.js +2 -1
- package/dist/src/tui/status-format.js.map +1 -1
- package/dist/src/tui/task-wake.d.ts +1 -1
- package/dist/src/tui/task-wake.js +1 -1
- package/dist/src/tui/turn-state.d.ts +1 -1
- package/dist/src/tui/turn-state.js +10 -2
- package/dist/src/tui/turn-state.js.map +1 -1
- package/package.json +3 -2
package/README.md
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
<p>
|
|
6
6
|
<a href="https://nodejs.org/"><img alt="Node.js >=22.0.0" src="https://img.shields.io/badge/Node.js-%3E%3D22.0.0-339933?logo=nodedotjs&logoColor=white"></a>
|
|
7
7
|
<a href="https://www.typescriptlang.org/"><img alt="TypeScript 7.0.2" src="https://img.shields.io/badge/TypeScript-7.0.2-3178C6?logo=typescript&logoColor=white"></a>
|
|
8
|
-
<a href="https://www.npmjs.com/package/@strands-agents/sdk"><img alt="Strands Agents SDK 1.
|
|
8
|
+
<a href="https://www.npmjs.com/package/@strands-agents/sdk"><img alt="Strands Agents SDK 1.20.0" src="https://img.shields.io/badge/Strands_Agents_SDK-1.20.0-5E4AE3"></a>
|
|
9
9
|
<a href="https://spdx.org/licenses/ISC.html"><img alt="ISC License" src="https://img.shields.io/badge/License-ISC-blue.svg"></a>
|
|
10
10
|
</p>
|
|
11
11
|
<img src="docs/images/welcome.png" alt="darwin terminal welcome screen" width="100%">
|
|
@@ -42,7 +42,7 @@ Run `darwin import --from claude-code` inside the target project to preview a bo
|
|
|
42
42
|
|
|
43
43
|
- **A readable Ink TUI:** streaming Markdown answers, proposed file-edit diffs, elapsed time and token spend, slash/path completion, prompt recall and queueing, local `!` commands, and bounded reports.
|
|
44
44
|
- **Safe approval modes:** `default`, classifier-assisted `auto`, read-only `plan`, and explicit `yolo`, with project-scoped allow rules reviewed in full before saving and revocable in-session, plus deny rules that hold in every mode, `yolo` included. A checkout's own hook commands, MCP servers and legacy allow rules stay held until you accept one [workspace-trust](docs/user-guide/permissions.md#workspace-trust) modal listing exactly what they would run; the answer lives outside the repository, and headless runs never ask.
|
|
45
|
-
- **Durable work:** resumable project-scoped sessions, append-only trajectories, replay/search/fork/export, cost records, optional diagnostics, background jobs, and parent-managed on-demand project memory with exact evidence and durable-turn commit.
|
|
45
|
+
- **Durable work:** resumable project-scoped sessions with user-assigned display labels (`/rename <label>`, shown in `/status`, `/sessions` and `darwin sessions`; `/sessions` locally lists saved sessions while idle or busy, resume still uses IDs), append-only trajectories, replay/search/fork/export, cost records, optional diagnostics, background jobs, and parent-managed on-demand project memory with exact evidence and durable-turn commit.
|
|
46
46
|
- **Extension layers:** built-in and project/global skills, custom commands, child agents with workflow-DAG delegation, tool hooks, and stdio/HTTP MCP servers, with portable `.agents/` discovery. Custom commands replace `$ARGUMENTS`; without it, nonempty trimmed arguments follow the untouched template and two newline characters. See [custom commands](docs/user-guide/extensions.md#custom-commands). Prompts that connected MCP servers offer appear last in `/` completion as `/mcp__<server>__<prompt>`; one is fetched only when you submit it, and its user text is sent as one ordinary prompt ([MCP prompts](docs/user-guide/extensions.md#mcp-prompts-as-slash-commands)).
|
|
47
47
|
- **Context visibility:** run `/context` to see the estimated request breakdown, including one token-cost row per registered skill beneath the skills catalogue. It is on demand, not a per-turn charge report; failed counts say `not reported`, and long lists are bounded. See [reading the breakdown](docs/user-guide/using-darwin.md#reading-context-costs).
|
|
48
48
|
- **Automation:** one-shot text output or versioned JSON/JSONL, strict session selection, bounded model-call and context-offload controls, and nonzero cancellation/failure exits.
|
package/README.zh-CN.md
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
<p>
|
|
6
6
|
<a href="https://nodejs.org/"><img alt="Node.js >=22.0.0" src="https://img.shields.io/badge/Node.js-%3E%3D22.0.0-339933?logo=nodedotjs&logoColor=white"></a>
|
|
7
7
|
<a href="https://www.typescriptlang.org/"><img alt="TypeScript 7.0.2" src="https://img.shields.io/badge/TypeScript-7.0.2-3178C6?logo=typescript&logoColor=white"></a>
|
|
8
|
-
<a href="https://www.npmjs.com/package/@strands-agents/sdk"><img alt="Strands Agents SDK 1.
|
|
8
|
+
<a href="https://www.npmjs.com/package/@strands-agents/sdk"><img alt="Strands Agents SDK 1.20.0" src="https://img.shields.io/badge/Strands_Agents_SDK-1.20.0-5E4AE3"></a>
|
|
9
9
|
<a href="https://spdx.org/licenses/ISC.html"><img alt="ISC License" src="https://img.shields.io/badge/License-ISC-blue.svg"></a>
|
|
10
10
|
</p>
|
|
11
11
|
<img src="docs/images/welcome.png" alt="darwin 终端欢迎界面" width="100%">
|
|
@@ -42,7 +42,7 @@ darwin 是一项自托管 AI 开发实验。[v0.0.1 基线版本](https://github
|
|
|
42
42
|
|
|
43
43
|
- **清晰的 Ink TUI:**流式 Markdown 回复、文件修改 diff、耗时与 token 消耗、斜杠命令与路径补全、提示词回看和排队、本地 `!` 命令,以及有长度上限的状态报告。
|
|
44
44
|
- **安全审批模式:**`default`、带分类器的 `auto`、只读 `plan` 和显式开启的 `yolo`;项目级放行规则保存前须完整预览,并可在会话内撤销;拒绝规则在所有模式下生效,包括 `yolo`。checkout 自带的钩子命令、MCP 服务器和旧式放行规则会一直保留不用,直到你在一个列出它们究竟会运行什么的[工作区信任](docs/user-guide/permissions.zh-CN.md#工作区信任)模态框中接受;答案保存在仓库之外,无头运行从不询问。
|
|
45
|
-
-
|
|
45
|
+
- **可持续的工作状态:**按项目保存的可恢复会话,支持用户设置显示标签(`/rename <label>`,在 `/status`、`/sessions` 和 `darwin sessions` 中展示;`/sessions` 在空闲或忙碌时本地列出已保存会话,恢复仍使用 ID)、只追加轨迹、回放/搜索/分叉/导出、费用记录、可选诊断日志、后台任务,以及由父 agent 按需管理、带精确证据并在回合持久化后提交的项目记忆。
|
|
46
46
|
- **扩展机制:**内置及项目/全局 skills、自定义命令、子代理与 workflow DAG 委派、工具 hooks、stdio/HTTP MCP 服务器,并兼容 `.agents/` 目录。自定义命令会替换 `$ARGUMENTS`;若模板没有该占位符,且参数去除首尾空白后非空,则在完整模板后追加两个换行符和参数。详见[自定义命令](docs/user-guide/extensions.zh-CN.md#自定义命令)。已连接的 MCP 服务器提供的提示词以 `/mcp__<server>__<prompt>` 的形式排在 `/` 补全最后;只有你提交时才会获取,其中的用户文本作为一条普通提示发送([MCP 提示词](docs/user-guide/extensions.zh-CN.md#把-mcp-提示词当作斜杠命令))。
|
|
47
47
|
- **上下文用量:**运行 `/context` 可查看当前请求的估算分项;技能目录下面按已注册技能分别显示 token 估算值。它只在调用时计算,不是每回合的实际费用;计数失败显示 `not reported`,过长列表会截断并标明余数。参见[查看上下文开销](docs/user-guide/using-darwin.zh-CN.md#查看上下文开销)。
|
|
48
48
|
- **自动化接口:**单次文本输出或带版本的 JSON/JSONL;严格选择会话;可限制模型调用次数和上下文卸载;取消或失败时返回非零状态码。
|
|
@@ -1,42 +1,20 @@
|
|
|
1
|
-
diff --git a/node_modules/@strands-agents/sdk/dist/src/conversation-manager/compression/context-compression.js b/node_modules/@strands-agents/sdk/dist/src/conversation-manager/compression/context-compression.js
|
|
2
|
-
index 84e3d1bb0bcd499d3dd2cd07c08baa79807ca79c..7e1c407bb04714309226c40b5daa00827799f477 100644
|
|
3
|
-
--- a/node_modules/@strands-agents/sdk/dist/src/conversation-manager/compression/context-compression.js
|
|
4
|
-
+++ b/node_modules/@strands-agents/sdk/dist/src/conversation-manager/compression/context-compression.js
|
|
5
|
-
@@ -126,9 +126,16 @@ export async function generateSummary(messagesToSummarize, model, systemPrompt)
|
|
6
|
-
if (!result?.done || !result.value) {
|
|
7
|
-
throw new Error('Failed to generate summary: no response from model');
|
|
8
|
-
}
|
|
9
|
-
+ // Thinking models include reasoning blocks in the summary response; a
|
|
10
|
-
+ // user-role message must never carry reasoning content (providers reject
|
|
11
|
-
+ // the request), so keep only the non-reasoning blocks.
|
|
12
|
-
+ const summaryContent = result.value.message.content.filter((block) => block.type !== 'reasoningBlock');
|
|
13
|
-
+ if (summaryContent.length === 0) {
|
|
14
|
-
+ throw new Error('Failed to generate summary: response contained no non-reasoning content');
|
|
15
|
-
+ }
|
|
16
|
-
return new Message({
|
|
17
|
-
role: 'user',
|
|
18
|
-
- content: result.value.message.content,
|
|
19
|
-
+ content: summaryContent,
|
|
20
|
-
});
|
|
21
|
-
}
|
|
22
|
-
/**
|
|
23
1
|
diff --git a/node_modules/@strands-agents/sdk/dist/src/index.d.ts b/node_modules/@strands-agents/sdk/dist/src/index.d.ts
|
|
24
|
-
index
|
|
2
|
+
index 7595798e7151f873e43eddd9ccfdba0dd383b28e..23b5c61f9836ae4bb9af2716ad533b3000e18af7 100644
|
|
25
3
|
--- a/node_modules/@strands-agents/sdk/dist/src/index.d.ts
|
|
26
4
|
+++ b/node_modules/@strands-agents/sdk/dist/src/index.d.ts
|
|
27
|
-
@@ -
|
|
5
|
+
@@ -65,6 +65,7 @@ export { ConversationManager, type ProactiveCompressionConfig, type Conversation
|
|
28
6
|
export { NullConversationManager } from './conversation-manager/null-conversation-manager.js';
|
|
29
7
|
export { SlidingWindowConversationManager, type SlidingWindowConversationManagerConfig, } from './conversation-manager/sliding-window-conversation-manager.js';
|
|
30
8
|
export { SummarizingConversationManager, type SummarizingConversationManagerConfig, } from './conversation-manager/summarizing-conversation-manager.js';
|
|
31
9
|
+export { DEFAULT_SUMMARIZATION_PROMPT } from './conversation-manager/compression/context-compression.js';
|
|
32
10
|
export { configureLogging } from './logging/logger.js';
|
|
33
11
|
export type { Logger } from './logging/types.js';
|
|
34
|
-
export { type McpClientOptions, type McpListToolsOptions, type McpToolFilterCallback, type McpToolFilters, type McpToolMatcher, type McpClientConfig, type McpClientCredentials, type McpTransport, type McpCallToolOptions, type TasksConfig, type McpConnectionState, type McpLoadServersOptions, type McpServerConfig, type SerializableMcpToolFilters, McpClient, } from './mcp/index.js';
|
|
12
|
+
export { type McpClientOptions, type McpListToolsOptions, type McpToolFilterCallback, type McpToolFilters, type McpToolMatcher, type McpClientConfig, type McpClientCredentials, type McpTransport, type McpCallToolOptions, type TasksConfig, type McpConnectionState, type McpLoadServersOptions, type McpServerConfig, type SerializableMcpToolFilters, McpClient, McpTaskCancelledError, McpTaskFailedError, } from './mcp/index.js';
|
|
35
13
|
diff --git a/node_modules/@strands-agents/sdk/dist/src/index.js b/node_modules/@strands-agents/sdk/dist/src/index.js
|
|
36
|
-
index
|
|
14
|
+
index 29310747d3224a66b2f09607ce8f84122aebda70..05e66c2edd18e8c763d0885538bbfbe705a83be2 100644
|
|
37
15
|
--- a/node_modules/@strands-agents/sdk/dist/src/index.js
|
|
38
16
|
+++ b/node_modules/@strands-agents/sdk/dist/src/index.js
|
|
39
|
-
@@ -
|
|
17
|
+
@@ -55,6 +55,7 @@ export { ConversationManager, } from './conversation-manager/conversation-manage
|
|
40
18
|
export { NullConversationManager } from './conversation-manager/null-conversation-manager.js';
|
|
41
19
|
export { SlidingWindowConversationManager, } from './conversation-manager/sliding-window-conversation-manager.js';
|
|
42
20
|
export { SummarizingConversationManager, } from './conversation-manager/summarizing-conversation-manager.js';
|
|
@@ -45,10 +23,10 @@ index 1ffe683b6944318f8524c231674eabcf8428f89f..ea8dfa7ae5d5cfb3166a6e23afe3042d
|
|
|
45
23
|
export { configureLogging } from './logging/logger.js';
|
|
46
24
|
// MCP Client types and implementations
|
|
47
25
|
diff --git a/node_modules/@strands-agents/sdk/dist/src/models/anthropic.js b/node_modules/@strands-agents/sdk/dist/src/models/anthropic.js
|
|
48
|
-
index
|
|
26
|
+
index d3b97dfe1f49f9c8251f4d74a2640b7684691f98..e747a7ac319ba38ce340aec08800dc751f10c4ee 100644
|
|
49
27
|
--- a/node_modules/@strands-agents/sdk/dist/src/models/anthropic.js
|
|
50
28
|
+++ b/node_modules/@strands-agents/sdk/dist/src/models/anthropic.js
|
|
51
|
-
@@ -
|
|
29
|
+
@@ -682,6 +682,11 @@ export class AnthropicModel extends Model {
|
|
52
30
|
};
|
|
53
31
|
}
|
|
54
32
|
case 'reasoningBlock':
|
|
@@ -61,7 +39,7 @@ index ffbbb3d5d8a29ac0e21ffd2409658e1f69850492..ff1f3cac332a260fef809d318c11062d
|
|
|
61
39
|
return {
|
|
62
40
|
type: 'thinking',
|
|
63
41
|
diff --git a/node_modules/@strands-agents/sdk/dist/src/models/bedrock.js b/node_modules/@strands-agents/sdk/dist/src/models/bedrock.js
|
|
64
|
-
index
|
|
42
|
+
index a0077cfe424d3d67a90207b52f114162d743d2b5..ca209b98dc687402b4e13b8eef700812b3b7c63a 100644
|
|
65
43
|
--- a/node_modules/@strands-agents/sdk/dist/src/models/bedrock.js
|
|
66
44
|
+++ b/node_modules/@strands-agents/sdk/dist/src/models/bedrock.js
|
|
67
45
|
@@ -944,6 +944,19 @@ export class BedrockModel extends Model {
|
|
@@ -114,10 +92,10 @@ index 17a473fe3bcdcc02e17cd95283c832d9021634c1..6e5cda23f672684b3926450322459279
|
|
|
114
92
|
/**
|
|
115
93
|
* Error patterns that indicate rate limiting.
|
|
116
94
|
diff --git a/node_modules/@strands-agents/sdk/dist/src/models/openai/model.js b/node_modules/@strands-agents/sdk/dist/src/models/openai/model.js
|
|
117
|
-
index
|
|
95
|
+
index 37291c025ed65317d80d5fa092621b7b678bafde..ba44c9120133ad75d1307b9684ffa82c0a0ef8cd 100644
|
|
118
96
|
--- a/node_modules/@strands-agents/sdk/dist/src/models/openai/model.js
|
|
119
97
|
+++ b/node_modules/@strands-agents/sdk/dist/src/models/openai/model.js
|
|
120
|
-
@@ -
|
|
98
|
+
@@ -203,7 +203,7 @@ export class OpenAIModel extends Model {
|
|
121
99
|
try {
|
|
122
100
|
const request = formatResponsesRequest(this._config, messages, options, this.stateful);
|
|
123
101
|
const stream = await this._client.responses.create(request, { signal: options?.cancelSignal });
|
|
@@ -127,14 +105,11 @@ index e7db2ccc3d5d8cff7b27dbb5b5f46cdaf9a4de1b..d9881fb1d81a3cbd9e092591d8757023
|
|
|
127
105
|
for (const sdkEvent of mapResponsesEventToSDK(event, state, this.stateful, options?.modelState)) {
|
|
128
106
|
yield sdkEvent;
|
|
129
107
|
diff --git a/node_modules/@strands-agents/sdk/dist/src/models/openai/responses-adapter.d.ts b/node_modules/@strands-agents/sdk/dist/src/models/openai/responses-adapter.d.ts
|
|
130
|
-
index
|
|
108
|
+
index a7b4edd12a5ac33277a5ad2c4bcea4c4d8c1ea7d..655e065df9823e8897759978a46cac8b2bee9d79 100644
|
|
131
109
|
--- a/node_modules/@strands-agents/sdk/dist/src/models/openai/responses-adapter.d.ts
|
|
132
110
|
+++ b/node_modules/@strands-agents/sdk/dist/src/models/openai/responses-adapter.d.ts
|
|
133
|
-
@@ -
|
|
134
|
-
|
|
135
|
-
totalTokens: number;
|
|
136
|
-
cacheReadInputTokens?: number;
|
|
137
|
-
+ cacheWriteInputTokens?: number;
|
|
111
|
+
@@ -55,13 +55,32 @@ export interface ResponsesStreamState {
|
|
112
|
+
cacheWriteInputTokens?: number;
|
|
138
113
|
} | null;
|
|
139
114
|
stopReason: StopReason;
|
|
140
115
|
+ /** darwin patch (SER-101): request model id that tags captured reasoning. */
|
|
@@ -168,7 +143,7 @@ index e17f00ac284c1e3357d55205c57b431061141b55..655e065df9823e8897759978a46cac8b
|
|
|
168
143
|
* Maps a single Responses API stream event to zero or more SDK events. Mutates
|
|
169
144
|
* `state` and, when `stateful` is `true`, writes `responseId` into `modelState`.
|
|
170
145
|
diff --git a/node_modules/@strands-agents/sdk/dist/src/models/openai/responses-adapter.js b/node_modules/@strands-agents/sdk/dist/src/models/openai/responses-adapter.js
|
|
171
|
-
index
|
|
146
|
+
index ddf156fe33b08dfb6a1dc265eb86f2fac31d9c53..c4cd19b5064de07722f88bb71874567061ed74ed 100644
|
|
172
147
|
--- a/node_modules/@strands-agents/sdk/dist/src/models/openai/responses-adapter.js
|
|
173
148
|
+++ b/node_modules/@strands-agents/sdk/dist/src/models/openai/responses-adapter.js
|
|
174
149
|
@@ -21,6 +21,72 @@ import { formatImageDataUrl, warnManagedParams as warnManagedParamsShared } from
|
|
@@ -308,7 +283,7 @@ index 9605eb256daa6aebf7dddea2f745d44bdf6f6970..76fb886e50ccbe1faa4bfb5208b82d64
|
|
|
308
283
|
};
|
|
309
284
|
}
|
|
310
285
|
/**
|
|
311
|
-
@@ -
|
|
286
|
+
@@ -329,13 +409,13 @@ function mapResponsesUsage(usage) {
|
|
312
287
|
totalTokens: usage.total_tokens,
|
|
313
288
|
};
|
|
314
289
|
const cached = usage.input_tokens_details?.cached_tokens;
|
|
@@ -316,14 +291,15 @@ index 9605eb256daa6aebf7dddea2f745d44bdf6f6970..76fb886e50ccbe1faa4bfb5208b82d64
|
|
|
316
291
|
+ if (typeof cached === 'number' && cached >= 0) {
|
|
317
292
|
mapped.cacheReadInputTokens = cached;
|
|
318
293
|
}
|
|
319
|
-
|
|
294
|
+
// GPT-5.6 reports cache writes here; the openai package's InputTokensDetails
|
|
295
|
+
// does not type the field yet, so read it through a narrow cast.
|
|
296
|
+
const cacheWrite = usage.input_tokens_details?.cache_write_tokens;
|
|
297
|
+
- if (typeof cacheWrite === 'number' && cacheWrite > 0) {
|
|
320
298
|
+ if (typeof cacheWrite === 'number' && cacheWrite >= 0) {
|
|
321
|
-
|
|
322
|
-
|
|
299
|
+
mapped.cacheWriteInputTokens = cacheWrite;
|
|
300
|
+
}
|
|
323
301
|
return mapped;
|
|
324
|
-
|
|
325
|
-
function createResponsesStreamError(message, code) {
|
|
326
|
-
@@ -359,22 +443,66 @@ export function mapResponsesEventToSDK(event, state, stateful, modelState) {
|
|
302
|
+
@@ -366,22 +446,66 @@ export function mapResponsesEventToSDK(event, state, stateful, modelState) {
|
|
327
303
|
case 'response.output_text.delta': {
|
|
328
304
|
events.push(...switchContent('text', state.dataType));
|
|
329
305
|
state.dataType = 'text';
|
|
@@ -390,7 +366,7 @@ index 9605eb256daa6aebf7dddea2f745d44bdf6f6970..76fb886e50ccbe1faa4bfb5208b82d64
|
|
|
390
366
|
case 'response.output_text.annotation.added': {
|
|
391
367
|
// The SDK types `event.annotation` as `unknown` and doesn't export a
|
|
392
368
|
// named annotation union, so we narrow structurally on the fields we use.
|
|
393
|
-
@@ -
|
|
369
|
+
@@ -395,6 +519,7 @@ export function mapResponsesEventToSDK(event, state, stateful, modelState) {
|
|
394
370
|
// a fresh TextBlock.
|
|
395
371
|
events.push(...switchContent('citations', state.dataType));
|
|
396
372
|
state.dataType = 'citations';
|
|
@@ -433,7 +409,7 @@ index b0223555c1f0410441546be860dbae824ac9857c..92ab47f4c8c1f5225c13dfd8a5e37324
|
|
|
433
409
|
//# sourceMappingURL=plugin.d.ts.map
|
|
434
410
|
|
|
435
411
|
diff --git a/node_modules/@strands-agents/sdk/dist/src/vended-plugins/context-offloader/plugin.js b/node_modules/@strands-agents/sdk/dist/src/vended-plugins/context-offloader/plugin.js
|
|
436
|
-
index
|
|
412
|
+
index f1f7304b55d39dafb79b4e0a6796d29b9e795842..3170931a27b37d683e2c4f86c20c135a88df8447 100644
|
|
437
413
|
--- a/node_modules/@strands-agents/sdk/dist/src/vended-plugins/context-offloader/plugin.js
|
|
438
414
|
+++ b/node_modules/@strands-agents/sdk/dist/src/vended-plugins/context-offloader/plugin.js
|
|
439
415
|
@@ -1,5 +1,5 @@
|
|
@@ -597,7 +573,7 @@ index 69b6549df8bf55b39e34aaf2940cac2a7fbf0714..440965bdc2879f7c2755ace3cda9ab70
|
|
|
597
573
|
const contextLines = input.context_lines ?? 5;
|
|
598
574
|
const lineRange = input.line_range ?? (!input.pattern ? { start: 1, end: Math.max(1, contextLines) } : undefined);
|
|
599
575
|
return searchContent(text, { pattern: input.pattern, line_range: lineRange, context_lines: contextLines }, maxChars);
|
|
600
|
-
@@ -
|
|
576
|
+
@@ -343,40 +436,135 @@ export class ContextOffloader {
|
|
601
577
|
.filter((r) => r.ref)
|
|
602
578
|
.map((r) => ` ${r.ref} (${r.description})`)
|
|
603
579
|
.join('\n');
|
|
@@ -614,7 +590,7 @@ index 69b6549df8bf55b39e34aaf2940cac2a7fbf0714..440965bdc2879f7c2755ace3cda9ab70
|
|
|
614
590
|
- guidance += 'If you need more detail, use your available tools to access specific data.';
|
|
615
591
|
- }
|
|
616
592
|
+ const guidance = offloadGuidance(this._includeRetrievalTool);
|
|
617
|
-
return (`[Offloaded: ${content.length} blocks, ~${tokenCount.toLocaleString()} tokens]\n` +
|
|
593
|
+
return (`[Offloaded: ${content.length} blocks, ~${tokenCount.toLocaleString('en-US')} tokens]\n` +
|
|
618
594
|
`${guidance}\n\n` +
|
|
619
595
|
`${preview}\n\n` +
|
|
620
596
|
`[Stored references:]\n${refLines}`);
|
|
@@ -760,7 +736,7 @@ index 69b6549df8bf55b39e34aaf2940cac2a7fbf0714..440965bdc2879f7c2755ace3cda9ab70
|
|
|
760
736
|
// Extract text preview from text/JSON blocks
|
|
761
737
|
const textParts = [];
|
|
762
738
|
for (const block of content) {
|
|
763
|
-
@@ -
|
|
739
|
+
@@ -386,22 +574,28 @@ export class ContextOffloader {
|
|
764
740
|
textParts.push(JSON.stringify(block.json, null, 2));
|
|
765
741
|
}
|
|
766
742
|
const fullText = textParts.join('\n');
|
|
@@ -801,7 +777,7 @@ index 69b6549df8bf55b39e34aaf2940cac2a7fbf0714..440965bdc2879f7c2755ace3cda9ab70
|
|
|
801
777
|
}
|
|
802
778
|
logger.debug(`tool_use_id=<${toolUseId}>, blocks=<${references.length}>, tokens=<${tokenCount}> | tool result offloaded`);
|
|
803
779
|
// Build replacement content: preview text + media placeholders
|
|
804
|
-
@@ -
|
|
780
|
+
@@ -426,11 +620,32 @@ export class ContextOffloader {
|
|
805
781
|
newContent.push(new TextBlock(`[${label}, ${size} bytes${ref ? ` | ref: ${ref}` : ''}]`));
|
|
806
782
|
}
|
|
807
783
|
}
|
|
@@ -4,7 +4,7 @@ export declare const BACKGROUND_EXECUTION_FLAG = "_background_execution";
|
|
|
4
4
|
/** The SDK's own management tool; parent-only, classified in `permission.ts`. */
|
|
5
5
|
export declare const MANAGE_BACKGROUND_TASK_TOOL_NAME = "strands_manage_background_task";
|
|
6
6
|
/** The synthetic tool-use name the SDK uses when it delivers a finished task. */
|
|
7
|
-
export declare const BACKGROUND_TASK_RESULT_TOOL_NAME = "
|
|
7
|
+
export declare const BACKGROUND_TASK_RESULT_TOOL_NAME = "strands_manage_background_task";
|
|
8
8
|
export interface BackgroundDelegationConfigInput {
|
|
9
9
|
/** The delegation tools the model may route to the background. */
|
|
10
10
|
readonly delegationTools: readonly string[];
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
* permission gate, plan-mode denial and the retry guard have already run —
|
|
13
13
|
* `routeToolCall` strips the flag and `submitToolCall` returns an ack tool result
|
|
14
14
|
* carrying a task id (`executor.js`, the `route === true` branch);
|
|
15
|
-
* - delivers a finished task as one synthetic `
|
|
15
|
+
* - delivers a finished task as one synthetic `strands_manage_background_task`
|
|
16
16
|
* tool-use/tool-result pair through `continuations.addInput`, from two hooks: at
|
|
17
17
|
* every `BeforeModelCallEvent` (`_deliverReady`, so a task that settled since the
|
|
18
18
|
* last call rides the next request) and at `AfterInvocationEvent` — where, with
|
|
@@ -55,7 +55,7 @@ export const BACKGROUND_EXECUTION_FLAG = '_background_execution';
|
|
|
55
55
|
/** The SDK's own management tool; parent-only, classified in `permission.ts`. */
|
|
56
56
|
export const MANAGE_BACKGROUND_TASK_TOOL_NAME = 'strands_manage_background_task';
|
|
57
57
|
/** The synthetic tool-use name the SDK uses when it delivers a finished task. */
|
|
58
|
-
export const BACKGROUND_TASK_RESULT_TOOL_NAME =
|
|
58
|
+
export const BACKGROUND_TASK_RESULT_TOOL_NAME = MANAGE_BACKGROUND_TASK_TOOL_NAME;
|
|
59
59
|
/** First line of the SDK's dispatch acknowledgement (`submitToolCall`). */
|
|
60
60
|
const ACK_FIRST_LINE = 'Background task dispatched.';
|
|
61
61
|
const ACK_TASK_ID = /^Task ID: (\S+)$/mu;
|
|
@@ -100,7 +100,7 @@ export function backgroundDelegationDescriptionClause(completionWakes = false) {
|
|
|
100
100
|
'need its result immediately (reads only): you get an acknowledgement at once and the ';
|
|
101
101
|
return completionWakes
|
|
102
102
|
? lead +
|
|
103
|
-
'final report arrives as a
|
|
103
|
+
'final report arrives as a strands_manage_background_task tool result in the next turn ' +
|
|
104
104
|
'that runs — you may end this turn; once the session is idle, one <task-notification> ' +
|
|
105
105
|
'turn starts with the report attached.'
|
|
106
106
|
: lead + 'final report is delivered before your next model call in this same turn.';
|
|
@@ -16,8 +16,8 @@
|
|
|
16
16
|
* Advisory only, on the context-pressure row's terms: the verdict is printed on
|
|
17
17
|
* existing reports (`/usage`, `/status`) and as one transcript notice before a
|
|
18
18
|
* `/model` or `/effort` switch on a warm cache. Nothing is compacted, no second
|
|
19
|
-
* threshold exists, no frame row, tick or channel is added
|
|
20
|
-
*
|
|
19
|
+
* threshold exists, no frame row, tick or channel is added. Historical verdicts
|
|
20
|
+
* are saved with session usage; cache warmth stays process-local, never in the trajectory.
|
|
21
21
|
*
|
|
22
22
|
* Invalidators, and one deliberate non-invalidator. A model switch, an effective
|
|
23
23
|
* effort change and a compaction each change the request prefix (a different model
|
|
@@ -132,7 +132,7 @@ export declare class CacheMissTracker {
|
|
|
132
132
|
* @param ttlMs the live TTL, read per call because `promptCacheTtl` is a model
|
|
133
133
|
* field and `/model` can change it mid-session.
|
|
134
134
|
*/
|
|
135
|
-
constructor(ttlMs: () => number, resumed: boolean);
|
|
135
|
+
constructor(ttlMs: () => number, resumed: boolean, restored?: CacheMissReport);
|
|
136
136
|
/** Records that the session performed one invalidating event since the last call. */
|
|
137
137
|
mark(event: CacheInvalidatingEvent): void;
|
|
138
138
|
/** Folds one completed call in; returns the verdict for that call, if any. */
|
|
@@ -16,8 +16,8 @@
|
|
|
16
16
|
* Advisory only, on the context-pressure row's terms: the verdict is printed on
|
|
17
17
|
* existing reports (`/usage`, `/status`) and as one transcript notice before a
|
|
18
18
|
* `/model` or `/effort` switch on a warm cache. Nothing is compacted, no second
|
|
19
|
-
* threshold exists, no frame row, tick or channel is added
|
|
20
|
-
*
|
|
19
|
+
* threshold exists, no frame row, tick or channel is added. Historical verdicts
|
|
20
|
+
* are saved with session usage; cache warmth stays process-local, never in the trajectory.
|
|
21
21
|
*
|
|
22
22
|
* Invalidators, and one deliberate non-invalidator. A model switch, an effective
|
|
23
23
|
* effort change and a compaction each change the request prefix (a different model
|
|
@@ -138,9 +138,12 @@ export class CacheMissTracker {
|
|
|
138
138
|
* @param ttlMs the live TTL, read per call because `promptCacheTtl` is a model
|
|
139
139
|
* field and `/model` can change it mid-session.
|
|
140
140
|
*/
|
|
141
|
-
constructor(ttlMs, resumed) {
|
|
141
|
+
constructor(ttlMs, resumed, restored) {
|
|
142
142
|
this.ttlMs = ttlMs;
|
|
143
143
|
this.firstCallAfterResume = resumed;
|
|
144
|
+
// Keep historical verdicts, not a stale cache-warmth claim across processes.
|
|
145
|
+
this.misses = restored?.misses ?? 0;
|
|
146
|
+
this.lastMiss = restored?.lastMiss;
|
|
144
147
|
}
|
|
145
148
|
/** Records that the session performed one invalidating event since the last call. */
|
|
146
149
|
mark(event) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-miss.js","sourceRoot":"","sources":["../../../src/agent/cache-miss.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cache-miss.js","sourceRoot":"","sources":["../../../src/agent/cache-miss.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// `DEFAULT_SUMMARIZATION_PROMPT` reaches the package root only through the pinned
|
|
2
|
-
// SDK patch (`patches/@strands-agents__sdk@1.
|
|
2
|
+
// SDK patch (`patches/@strands-agents__sdk@1.20.0.patch`, `dist/src/index.*`
|
|
3
3
|
// hunks): the SDK declares it in a module its `exports` map does not expose.
|
|
4
4
|
// Never copy the string here — a copy would drift from what the SDK sends when
|
|
5
5
|
// no focus is given.
|
package/dist/src/agent/cost.d.ts
CHANGED
|
@@ -20,7 +20,7 @@ import { type CostBucket, type CostShare, type ModelPriceLookup } from '../prici
|
|
|
20
20
|
import { type UsageTotals } from './usage.js';
|
|
21
21
|
export { COST_BASIS_LABEL, describePricingSource, describeSessionCost, estimateCost, formatModelList, formatUsd, formatUsdNumber, MAX_COST_MODEL_CHARS, sessionCost, sessionCostFields, type CostBucket, type CostBuckets, type CostEstimate, type CostShare, type MissingCostBucket, type MissingModelBucket, type ModelPriceLookup, type ModelRates, type SessionCost, type UnpricedModel, } from '../pricing/cost.js';
|
|
22
22
|
/**
|
|
23
|
-
* One model's share of
|
|
23
|
+
* One model's share of the session's meter: the counters it incurred, the config
|
|
24
24
|
* that projects them into buckets (provider/API decide the split), and what the
|
|
25
25
|
* price cache says about it. `runtime.modelShares` is a list of these.
|
|
26
26
|
*/
|
|
@@ -68,13 +68,17 @@ export declare function resolveReadTarget(argument: string, projectRoot: string,
|
|
|
68
68
|
* The first read target of this call that falls in the sensitive set, as the
|
|
69
69
|
* model wrote it, or undefined when the call reads nothing sensitive (SER-071).
|
|
70
70
|
*
|
|
71
|
-
* Targets are the `path` of `fileEditor view` and
|
|
72
|
-
*
|
|
73
|
-
*
|
|
74
|
-
*
|
|
75
|
-
*
|
|
76
|
-
*
|
|
77
|
-
*
|
|
71
|
+
* Targets are the `path` of `fileEditor view` and of `imageViewer` (SER-120) —
|
|
72
|
+
* both resolved with the non-bash spelling, so `~` and `..` match view and
|
|
73
|
+
* embedded quotes stay literal — every non-option argument of every
|
|
74
|
+
* {@link BASH_PATH_READERS} segment of a bash command — a pattern argument
|
|
75
|
+
* (`rg password ~/.gnupg`) is resolved like a path and simply misses — and a
|
|
76
|
+
* named pathspec of `git diff` / `git show` ({@link sensitiveGitPathspec},
|
|
77
|
+
* SER-119). For the {@link RECURSIVE_CONTENT_READERS} an argument that is an
|
|
78
|
+
* ancestor of a credential location also counts, returned as
|
|
79
|
+
* `<arg> (searches above <location>)`. That ancestor rule is not applied to
|
|
80
|
+
* git or to image paths. Any other tool or command reads nothing this
|
|
81
|
+
* function can see.
|
|
78
82
|
*/
|
|
79
83
|
export declare function sensitiveReadPath(toolName: string, input: unknown, projectRoot: string): string | undefined;
|
|
80
84
|
/** True when the command contains redirection or substitution. */
|
|
@@ -275,17 +275,62 @@ function sensitiveCwdTail(projectRoot, tail, bashWords) {
|
|
|
275
275
|
|| (bashWords && /[$*?[{]/.test(segment) && globMayMatch(segment, '.env'))
|
|
276
276
|
|| names.some((name) => bashWords ? globMayMatch(segment, name) : segment === name));
|
|
277
277
|
}
|
|
278
|
+
/**
|
|
279
|
+
* `git diff` and `git show` print the contents of a named pathspec (SER-119).
|
|
280
|
+
* `git log` is absent on purpose: `git log -p -- .env` stays a read-only
|
|
281
|
+
* command even when a patch would contain that file. `status` and `branch`
|
|
282
|
+
* do not print file contents either.
|
|
283
|
+
*/
|
|
284
|
+
const GIT_CONTENT_PATHSPEC_SUBCOMMANDS = new Set(['diff', 'show']);
|
|
285
|
+
/**
|
|
286
|
+
* The first named pathspec of a `git diff` or `git show` segment that the
|
|
287
|
+
* sensitive-read predicate matches, as the model wrote it, or undefined.
|
|
288
|
+
*
|
|
289
|
+
* The subcommand word is not a path. Option words (a leading `-`) are skipped.
|
|
290
|
+
* Every other argument is resolved as a bash word, then so is the text after
|
|
291
|
+
* its last colon, so `HEAD:.env` and `:./.env` hit without a git revision
|
|
292
|
+
* parser. The grep/rg ancestor rule is not applied — a pathless `git diff`
|
|
293
|
+
* does not search above a credential location — and nothing is read from the
|
|
294
|
+
* filesystem.
|
|
295
|
+
*/
|
|
296
|
+
function sensitiveGitPathspec(word, args, projectRoot) {
|
|
297
|
+
if (word !== 'git')
|
|
298
|
+
return undefined;
|
|
299
|
+
const [subcommand, ...rest] = args;
|
|
300
|
+
if (subcommand === undefined || !GIT_CONTENT_PATHSPEC_SUBCOMMANDS.has(subcommand))
|
|
301
|
+
return undefined;
|
|
302
|
+
for (const arg of rest) {
|
|
303
|
+
if (arg.startsWith('-'))
|
|
304
|
+
continue;
|
|
305
|
+
if (readsSensitiveGitArgument(arg, projectRoot))
|
|
306
|
+
return arg;
|
|
307
|
+
}
|
|
308
|
+
return undefined;
|
|
309
|
+
}
|
|
310
|
+
function readsSensitiveGitArgument(argument, projectRoot) {
|
|
311
|
+
const reads = (target) => isSensitiveReadPath(projectRoot, resolveReadTarget(target, projectRoot, true), true);
|
|
312
|
+
if (reads(argument))
|
|
313
|
+
return true;
|
|
314
|
+
const colon = argument.lastIndexOf(':');
|
|
315
|
+
if (colon === -1)
|
|
316
|
+
return false;
|
|
317
|
+
return reads(argument.slice(colon + 1));
|
|
318
|
+
}
|
|
278
319
|
/**
|
|
279
320
|
* The first read target of this call that falls in the sensitive set, as the
|
|
280
321
|
* model wrote it, or undefined when the call reads nothing sensitive (SER-071).
|
|
281
322
|
*
|
|
282
|
-
* Targets are the `path` of `fileEditor view` and
|
|
283
|
-
*
|
|
284
|
-
*
|
|
285
|
-
*
|
|
286
|
-
*
|
|
287
|
-
*
|
|
288
|
-
*
|
|
323
|
+
* Targets are the `path` of `fileEditor view` and of `imageViewer` (SER-120) —
|
|
324
|
+
* both resolved with the non-bash spelling, so `~` and `..` match view and
|
|
325
|
+
* embedded quotes stay literal — every non-option argument of every
|
|
326
|
+
* {@link BASH_PATH_READERS} segment of a bash command — a pattern argument
|
|
327
|
+
* (`rg password ~/.gnupg`) is resolved like a path and simply misses — and a
|
|
328
|
+
* named pathspec of `git diff` / `git show` ({@link sensitiveGitPathspec},
|
|
329
|
+
* SER-119). For the {@link RECURSIVE_CONTENT_READERS} an argument that is an
|
|
330
|
+
* ancestor of a credential location also counts, returned as
|
|
331
|
+
* `<arg> (searches above <location>)`. That ancestor rule is not applied to
|
|
332
|
+
* git or to image paths. Any other tool or command reads nothing this
|
|
333
|
+
* function can see.
|
|
289
334
|
*/
|
|
290
335
|
export function sensitiveReadPath(toolName, input, projectRoot) {
|
|
291
336
|
if (toolName === 'fileEditor') {
|
|
@@ -296,12 +341,24 @@ export function sensitiveReadPath(toolName, input, projectRoot) {
|
|
|
296
341
|
return undefined;
|
|
297
342
|
return isSensitiveReadPath(projectRoot, resolveReadTarget(filePath, projectRoot)) ? filePath : undefined;
|
|
298
343
|
}
|
|
344
|
+
// Same predicate and non-bash resolution as `fileEditor view`. Kind stays
|
|
345
|
+
// read, so plan prompts; the decoder is not consulted and does not refuse
|
|
346
|
+
// an approved read.
|
|
347
|
+
if (toolName === 'imageViewer') {
|
|
348
|
+
const filePath = readString(input, 'path');
|
|
349
|
+
if (filePath === undefined || filePath === '')
|
|
350
|
+
return undefined;
|
|
351
|
+
return isSensitiveReadPath(projectRoot, resolveReadTarget(filePath, projectRoot)) ? filePath : undefined;
|
|
352
|
+
}
|
|
299
353
|
if (toolName === 'bash') {
|
|
300
354
|
const command = readString(input, 'command');
|
|
301
355
|
if (command === undefined)
|
|
302
356
|
return undefined;
|
|
303
357
|
for (const segment of splitBashSegments(command)) {
|
|
304
358
|
const [word = '', ...args] = segment.split(/\s+/);
|
|
359
|
+
const pathspec = sensitiveGitPathspec(word, args, projectRoot);
|
|
360
|
+
if (pathspec !== undefined)
|
|
361
|
+
return pathspec;
|
|
305
362
|
if (!BASH_PATH_READERS.has(word))
|
|
306
363
|
continue;
|
|
307
364
|
const recursive = RECURSIVE_CONTENT_READERS.has(word);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permission-rules.js","sourceRoot":"","sources":["../../../src/agent/permission-rules.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AACH,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAgBpG;;;;GAIG;AACH,MAAM,oBAAoB,GAAG,YAAY,CAAC;AAE1C,kDAAkD;AAClD,MAAM,QAAQ,GAAG,gBAAgB,CAAC;AAElC;;;;;;GAMG;AACH,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;AAE7F;;;;;;GAMG;AACH,MAAM,yBAAyB,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;AAE1D;;;GAGG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,uBAAuB,CAAC,CAAC;AAEjH,iDAAiD;AACjD,MAAM,CAAC,MAAM,yBAAyB,GAAsB;IAC1D,QAAQ;IACR,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC;IAC5B,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC;CACpC,CAAC;AAEF,4CAA4C;AAC5C,MAAM,CAAC,MAAM,6BAA6B,GAAsB,CAAC,aAAa,CAAC,CAAC;AAEhF,+DAA+D;AAC/D,MAAM,CAAC,MAAM,8BAA8B,GAAG,qBAAqB,CAAC;AAEpE;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,oBAAoB,CAAC,QAAgB;IACnD,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,EAAE,CAAC,CAAC;IAC9E,OAAO,QAAQ,CAAC,MAAM,IAAI,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAE,EAAE,MAAM,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAE,EAAE,SAAS,CAAC,CAAC;AAC/H,CAAC;AAED;;;;;;GAMG;AACH,SAAS,YAAY,CAAC,OAAe,EAAE,IAAY;IACjD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;IAC5C,IAAI,IAAI,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAC/B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IACpC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IACvC,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACpD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAE,CAAC;QAC1B,IAAI,IAAI,KAAK,GAAG;YAAE,MAAM,IAAI,IAAI,CAAC;aAC5B,IAAI,IAAI,KAAK,GAAG;YAAE,MAAM,IAAI,GAAG,CAAC;aAChC,IAAI,IAAI,KAAK,GAAG;YAAE,MAAM,IAAI,KAAK,CAAC;aAClC,IAAI,IAAI,KAAK,GAAG;YAAE,MAAM,IAAI,GAAG,CAAC;aAChC,IAAI,IAAI,KAAK,GAAG;YAAE,MAAM,IAAI,GAAG,CAAC;aAChC,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;YACtB,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;YACzC,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC;gBAChB,SAAS;YACX,CAAC;YACD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YACzF,MAAM,IAAI,IAAI,IAAI,GAAG,CAAC;YACtB,KAAK,GAAG,GAAG,CAAC;QACd,CAAC;;YAAM,MAAM,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;IACD,IAAI,CAAC;QACH,OAAO,IAAI,MAAM,CAAC,OAAO,MAAM,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,mBAAmB,CAAC,WAAmB,EAAE,QAAgB,EAAE,SAAS,GAAG,KAAK;IAC1F,6EAA6E;IAC7E,oEAAoE;IACpE,IAAI,oBAAoB,CAAC,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAC;IAChD,QAAQ,GAAG,gBAAgB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IACjD,MAAM,KAAK,GAAG,aAAa,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IACjD,IAAI,KAAK,EAAE,IAAI,KAAK,KAAK,IAAI,gBAAgB,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC;QAAE,OAAO,IAAI,CAAC;IAC/F,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAC1B,IAAI,0BAA0B,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IAChH,IAAI,yBAAyB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IACrG,IAAI,6BAA6B,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IACxF,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IACxD,IAAI,oBAAoB,CAAC,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAC;IAChD,OAAO,qBAAqB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;AACtD,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,sBAAsB,CAAC,QAAgB,EAAE,SAAS,GAAG,KAAK;IACxE,QAAQ,GAAG,gBAAgB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IACjD,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAC1B,KAAK,MAAM,SAAS,IAAI,0BAA0B,EAAE,CAAC;QACnD,IAAI,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YAAE,OAAO,KAAK,SAAS,EAAE,CAAC;IAC9E,CAAC;IACD,KAAK,MAAM,IAAI,IAAI,yBAAyB,EAAE,CAAC;QAC7C,IAAI,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAAE,OAAO,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IAC9F,CAAC;IACD,MAAM,QAAQ,GAAG,6BAA6B,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;IACxF,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC;IAC5C,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,EAAE,CAAC,CAAC;IAC9E,MAAM,CAAC,IAAI,GAAG,EAAE,EAAE,GAAG,GAAG,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,GAAG,QAAQ,CAAC;IAClD,MAAM,YAAY,GAChB,QAAQ,CAAC,MAAM,IAAI,CAAC,IAAI,QAAQ,CAAC,MAAM,IAAI,CAAC,IAAI,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC;WACvE,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,GAAG,KAAK,SAAS,IAAI,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACnJ,OAAO,YAAY,CAAC,CAAC,CAAC,8BAA8B,CAAC,CAAC,CAAC,SAAS,CAAC;AACnE,CAAC;AAED;;;;GAIG;AACH,SAAS,eAAe,CAAC,OAAe;IACtC,OAAO,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,OAAO,KAAK,MAAM,IAAI,OAAO,KAAK,aAAa,IAAI,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC7G,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAAC,QAAgB,EAAE,WAAmB,EAAE,SAAS,GAAG,KAAK;IACxF,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAC;IAC7G,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAC1B,IAAI,QAAQ,GAAG,QAAQ,CAAC;IACxB,IAAI,QAAQ,KAAK,GAAG;QAAE,QAAQ,GAAG,IAAI,CAAC;SACjC,IAAI,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;SAC7E,IAAI,0BAA0B,CAAC,IAAI,CAAC,QAAQ,CAAC;QAAE,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC,CAAC;IAC3H,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,WAAW,IAAI,QAAQ,EAAE,CAAC;IACrF,OAAO,mBAAmB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;AAClD,CAAC;AAED,sFAAsF;AACtF,SAAS,aAAa,CAAC,MAAc,EAAE,SAAkB;IACvD,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,EAAE,CAAC,CAAC;IAC5E,MAAM,OAAO,GAAG,CAAC,IAAY,EAAE,IAAY,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC;IACrG,MAAM,GAAG,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,4BAA4B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1G,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAAE,OAAO,SAAS,CAAC;IACrF,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,MAAM,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACvE,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC7B,MAAM,IAAI,GAAG,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAClE,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IACzC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;AACnH,CAAC;AAED,4EAA4E;AAC5E,SAAS,mBAAmB,CAAC,QAAgB,EAAE,SAAkB;IAC/D,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,QAAQ,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACxD,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAE,CAAC;QACjC,IAAI,OAAO,KAAK,EAAE,IAAI,OAAO,KAAK,GAAG;YAAE,SAAS;QAChD,IAAI,OAAO,KAAK,IAAI;YAAE,MAAM,CAAC,GAAG,EAAE,CAAC;;YAC9B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1B,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QACzD,MAAM,KAAK,GAAG,aAAa,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;QAC/D,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACjD,wEAAwE;YACxE,2EAA2E;YAC3E,OAAO,GAAG,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC;QACzF,CAAC;IACH,CAAC;IACD,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;AAChC,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAc,EAAE,SAAkB;IAC1D,KAAK,IAAI,KAAK,GAAG,aAAa,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,IAAI,KAAK,MAAM,EAAE,KAAK,GAAG,aAAa,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,CAAC;QACpH,MAAM,GAAG,mBAAmB,CAAC,IAAI,KAAK,CAAC,IAAI,EAAE,EAAE,SAAS,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;GAMG;AACH,SAAS,gBAAgB,CAAC,WAAmB,EAAE,IAAY,EAAE,SAAkB;IAC7E,MAAM,KAAK,GAAG;QACZ,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC/E,GAAG,yBAAyB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACpE,GAAG,6BAA6B,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACnE,GAAG,oBAAoB,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACvE,GAAG,wBAAwB,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACrF,SAAS,EAAE,SAAS,EAAE,WAAW;KAClC,CAAC;IACF,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC;WAC/D,CAAC,SAAS,IAAI,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;WACvE,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC;AACzF,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,iBAAiB,CAAC,QAAgB,EAAE,KAAc,EAAE,WAAmB;IACrF,IAAI,QAAQ,KAAK,YAAY,EAAE,CAAC;QAC9B,IAAI,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC,KAAK,MAAM;YAAE,OAAO,SAAS,CAAC;QAC9D,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC3C,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,EAAE;YAAE,OAAO,SAAS,CAAC;QAChE,OAAO,mBAAmB,CAAC,WAAW,EAAE,iBAAiB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3G,CAAC;IAED,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;QACxB,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC7C,IAAI,OAAO,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QAC5C,KAAK,MAAM,OAAO,IAAI,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC;YACjD,MAAM,CAAC,IAAI,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAClD,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,SAAS;YAC3C,MAAM,SAAS,GAAG,yBAAyB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACtD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC;oBAAE,SAAS;gBAClC,MAAM,QAAQ,GAAG,iBAAiB,CAAC,GAAG,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;gBAC3D,IAAI,mBAAmB,CAAC,WAAW,EAAE,QAAQ,EAAE,IAAI,CAAC;oBAAE,OAAO,GAAG,CAAC;gBACjE,IAAI,SAAS,EAAE,CAAC;oBACd,MAAM,KAAK,GAAG,sBAAsB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;oBACrD,IAAI,KAAK,KAAK,SAAS;wBAAE,OAAO,GAAG,GAAG,oBAAoB,KAAK,GAAG,CAAC;gBACrE,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,QAAQ,CAAC,IAAY,EAAE,KAAa;IAC3C,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;AAC3C,CAAC;AAED,SAAS,QAAQ,CAAC,IAAY,EAAE,SAAiB;IAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAChD,OAAO,QAAQ,KAAK,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,QAAQ,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;AACvH,CAAC;AAED;;;;GAIG;AACH,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC;IACjC,KAAK;IACL,MAAM;IACN,KAAK;IACL,KAAK;IACL,MAAM;IACN,OAAO;IACP,QAAQ;IACR,IAAI;IACJ,IAAI;IACJ,KAAK;IACL,QAAQ;IACR,SAAS;IACT,MAAM;IACN,MAAM;IACN,IAAI;IACJ,SAAS;IACT,KAAK;IACL,QAAQ;CACT,CAAC,CAAC;AAEH;;;;GAIG;AACH,MAAM,eAAe,GAAG,EAAE,CAAC;AAE3B,kEAAkE;AAClE,MAAM,UAAU,sBAAsB,CAAC,OAAe;IACpD,OAAO,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC5C,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAC/C,OAAO,OAAO;SACX,KAAK,CAAC,gBAAgB,CAAC;SACvB,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;SAChC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,EAAE,CAAC,CAAC;AACzC,CAAC;AAED,+EAA+E;AAC/E,MAAM,UAAU,SAAS,CAAC,IAAY;IACpC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAChC,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;QACjB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAC7B,OAAO,QAAQ,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC;IACpD,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;IAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAC7C,IAAI,QAAQ,KAAK,EAAE,IAAI,OAAO,KAAK,EAAE;QAAE,OAAO,SAAS,CAAC;IACxD,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;AAC/B,CAAC;AAED,kFAAkF;AAClF,MAAM,UAAU,WAAW,CAAC,IAAY;IACtC,OAAO,SAAS,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC;AACvC,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAC5B,KAAwB,EACxB,MAAkB,EAClB,WAAmB;IAEnB,IAAI,YAAY,CAAC,MAAM,EAAE,WAAW,CAAC;QAAE,OAAO,SAAS,CAAC;IAExD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,MAAM,KAAK,SAAS;YAAE,SAAS;QACnC,IAAI,MAAM,CAAC,QAAQ,KAAK,MAAM,CAAC,QAAQ;YAAE,SAAS;QAClD,iDAAiD;QACjD,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC;QAC9C,IAAI,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC;YAAE,OAAO,IAAI,CAAC;IACtE,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,UAAU,kBAAkB,CAChC,KAAwB,EACxB,MAAkB,EAClB,WAAmB;IAEnB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,MAAM,KAAK,SAAS;YAAE,SAAS;QACnC,IAAI,MAAM,CAAC,QAAQ,KAAK,MAAM,CAAC,QAAQ;YAAE,SAAS;QAClD,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC;QAC9C,IAAI,cAAc,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC;YAAE,OAAO,IAAI,CAAC;IACvE,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAC/C,OAAO,OAAO;SACX,KAAK,CAAC,2BAA2B,CAAC;SAClC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;SAChC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,EAAE,CAAC,CAAC;AACzC,CAAC;AAED,SAAS,cAAc,CAAC,OAAe,EAAE,MAAkB,EAAE,WAAmB;IAC9E,IAAI,MAAM,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;QAC/B,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC;QAC1D,OAAO,iBAAiB,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IACxF,CAAC;IAED,IAAI,MAAM,CAAC,QAAQ,KAAK,YAAY,EAAE,CAAC;QACrC,MAAM,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAClD,IAAI,QAAQ,KAAK,SAAS;YAAE,OAAO,KAAK,CAAC;QACzC,OAAO,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,yBAAyB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IACzF,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,YAAY,CAAC,MAAkB,EAAE,WAAmB;IAClE,IAAI,MAAM,CAAC,QAAQ,KAAK,aAAa;QAAE,OAAO,IAAI,CAAC;IACnD,IAAI,iBAAiB,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IAC7F,IAAI,MAAM,CAAC,QAAQ,KAAK,YAAY;QAAE,OAAO,KAAK,CAAC;IAEnD,MAAM,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAClD,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAEzC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IACrD,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IACxD,OAAO,qBAAqB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;AACtD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,YAAY,CAAC,MAAkB,EAAE,WAAmB;IAClE,IAAI,YAAY,CAAC,MAAM,EAAE,WAAW,CAAC;QAAE,OAAO,EAAE,CAAC;IAEjD,MAAM,QAAQ,GAAG,kBAAkB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACzD,MAAM,SAAS,GAAmB;QAChC,IAAI,EAAE,MAAM,CAAC,QAAQ;QACrB,KAAK,EAAE,SAAS,CAAC,OAAO,MAAM,CAAC,QAAQ,EAAE,CAAC;KAC3C,CAAC;IACF,OAAO,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;AACtE,CAAC;AAED,SAAS,kBAAkB,CAAC,MAAkB,EAAE,WAAmB;IACjE,IAAI,MAAM,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;QAC/B,MAAM,OAAO,GAAG,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;QACvE,OAAO,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,OAAO,EAAE,EAAE,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;IACpG,CAAC;IAED,IAAI,MAAM,CAAC,QAAQ,KAAK,YAAY,EAAE,CAAC;QACrC,MAAM,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAClD,IAAI,QAAQ,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QAC7C,MAAM,OAAO,GAAG,gBAAgB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QACxD,OAAO,EAAE,IAAI,EAAE,cAAc,OAAO,EAAE,EAAE,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;IACtE,CAAC;IAED,8EAA8E;IAC9E,qBAAqB;IACrB,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,0EAA0E;AAC1E,SAAS,WAAW,CAAC,OAAe;IAClC,MAAM,KAAK,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC;IAChF,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,KAAK,CAAC;IAC9B,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAE1C,IAAI,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACrF,OAAO,GAAG,KAAK,IAAI,MAAM,IAAI,CAAC;IAChC,CAAC;IACD,OAAO,GAAG,KAAK,IAAI,CAAC;AACtB,CAAC;AAED,oEAAoE;AACpE,SAAS,gBAAgB,CAAC,QAAgB,EAAE,WAAmB;IAC7D,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IACrD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IACtD,MAAM,MAAM,GAAG,QAAQ,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAE3F,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IACrD,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACvF,OAAO,SAAS,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,SAAS,KAAK,CAAC;AACrD,CAAC;AAED,SAAS,aAAa,CAAC,OAAe,EAAE,MAAkB,EAAE,WAAmB;IAC7E,IAAI,MAAM,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;QAC/B,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC;QAC1D,sEAAsE;QACtE,+DAA+D;QAC/D,IAAI,sBAAsB,CAAC,OAAO,CAAC;YAAE,OAAO,KAAK,CAAC;QAClD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAC5C,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QACxC,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IACvE,CAAC;IAED,IAAI,MAAM,CAAC,QAAQ,KAAK,YAAY,EAAE,CAAC;QACrC,MAAM,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAClD,IAAI,QAAQ,KAAK,SAAS;YAAE,OAAO,KAAK,CAAC;QACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QACrD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,QAAQ,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC3F,OAAO,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IACrE,CAAC;IAED,0EAA0E;IAC1E,iCAAiC;IACjC,OAAO,KAAK,CAAC;AACf,CAAC;AAED,4EAA4E;AAC5E,SAAS,cAAc,CAAC,OAAe,EAAE,OAAe;IACtD,MAAM,UAAU,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IAC5C,8EAA8E;IAC9E,iEAAiE;IACjE,MAAM,SAAS,GAAG,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC5C,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;IAC9D,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACjE,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,kBAAkB,CAAC,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC;IACpE,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;AAC3D,CAAC;AAED,yEAAyE;AACzE,SAAS,WAAW,CAAC,OAAe,EAAE,MAAc;IAClD,IAAI,MAAM,GAAG,GAAG,CAAC;IACjB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACvD,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;QAC5B,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;YACjB,IAAI,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;gBAC/B,MAAM,IAAI,IAAI,CAAC;gBACf,KAAK,IAAI,CAAC,CAAC;YACb,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,OAAO,CAAC;YACpB,CAAC;QACH,CAAC;aAAM,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;YACxB,MAAM,IAAI,MAAM,CAAC;QACnB,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,YAAY,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IACD,OAAO,IAAI,MAAM,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC/C,CAAC;AAED,SAAS,eAAe,CAAC,KAAa;IACpC,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAC3C,CAAC;AAED,6EAA6E;AAC7E,SAAS,OAAO,CAAC,KAAa;IAC5B,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACzC,CAAC;AAED;;;;;GAKG;AACH,SAAS,yBAAyB,CAAC,QAAgB,EAAE,WAAmB;IACtE,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IACrD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IACtD,MAAM,MAAM,GAAG,QAAQ,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAC3F,OAAO,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;AACtC,CAAC;AAED,SAAS,YAAY,CAAC,KAAa;IACjC,OAAO,KAAK,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;AACtD,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC9B,OAAO,KAAK,CAAC,MAAM,IAAI,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,eAAe,GAAG,CAAC,CAAC,GAAG,CAAC;AAC7F,CAAC;AAED,SAAS,UAAU,CAAC,KAAc,EAAE,GAAW;IAC7C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAC1F,MAAM,KAAK,GAAI,KAAiC,CAAC,GAAG,CAAC,CAAC;IACtD,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AACvD,CAAC"}
|
|
1
|
+
{"version":3,"file":"permission-rules.js","sourceRoot":"","sources":["../../../src/agent/permission-rules.ts"],"names":[],"mappings":"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"}
|
|
@@ -825,7 +825,8 @@ export function assessRisk(request, projectRoot) {
|
|
|
825
825
|
// Before the read short-circuit (SER-071): a read into the sensitive set is
|
|
826
826
|
// `dangerous` whatever its kind, so `cat ~/.ssh/id_rsa` (execute) and
|
|
827
827
|
// `fileEditor view ~/.aws/credentials` (read) both reach the prompt. The kind
|
|
828
|
-
// itself is untouched, which is what lets plan mode prompt
|
|
828
|
+
// itself is untouched, which is what lets plan mode prompt a sensitive
|
|
829
|
+
// view or imageViewer call instead of denying it.
|
|
829
830
|
// `sensitive` is the path as the model wrote it, plus a bounded
|
|
830
831
|
// ` (searches above …)` note when a recursive `grep`/`rg` starts from an
|
|
831
832
|
// ancestor of a credential location.
|