Merge branch 'main' of github.com:Kilo-Org/kilocode

This commit is contained in:
Alex Gold
2026-03-15 08:28:07 -04:00
8 changed files with 36 additions and 49 deletions
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:08273729805339b0158064fda21528b752558f4122be7aabfb5e4667a74910d8
size 16459
oid sha256:b3656d23c630a2d7f412d2fc3eee231f45cbe47e6d1e4e7ca44ae4cca3c3160b
size 15323
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:21dcfb222007a720472dfd5c143658329e05d9d7b4fe2a69ba38196b1caa2a61
size 18037
oid sha256:c95ebadbd707aab03b0b14858cd9e25c4e7b06e8976abf76e377b9eaa5bd2144
size 16900
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:57dc13142e9f81c81e2e761857b3c07570d0a41f33b97e18a215412a48293470
size 17632
oid sha256:168eacdc6523223587bad5f72f3828e03211733b4dc1fa39f152409089e03ff3
size 16468
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f069da1581318f3effea2b7b16270dd26bb47e678a4bce8b0fcb7af706e641ec
size 18613
oid sha256:bb5a77e875e168813dcd0d23ea4743b67e7f39b4fe154e19e0ef426e5679f030
size 17436
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6b4b92b238e4cce51c60887ce1a96546446690e2c484306d87e2aa9743843166
size 20446
oid sha256:1ccccd5ac104eaf39b4954e905c15e5c0f5fc7df5c71898569f490ee09608dc6
size 19291
@@ -101,7 +101,7 @@ export const PermissionDock: Component<{
header={
<div data-slot="permission-row" data-variant="header">
<span data-slot="permission-icon">
<Icon name="warning" size="normal" />
<Icon name="warning" size="small" />
</span>
<div data-slot="permission-header-title">
{language.t("notification.permission.title")}
@@ -119,13 +119,10 @@ export const PermissionDock: Component<{
onClick={togglePatternsExpanded}
aria-expanded={patternsExpanded()}
>
<div data-slot="permission-patterns-header-main">
<Icon name="check-all" size="small" />
<span data-slot="permission-patterns-header-title">{language.t("ui.permission.permissionRules")}</span>
</div>
<span data-slot="permission-patterns-header-chevron" data-open={patternsExpanded() ? "" : undefined}>
<Icon name="chevron-down" size="small" />
</span>
<span data-slot="permission-patterns-header-title">{language.t("ui.permission.permissionRules")}</span>
</button>
<div data-slot="permission-patterns-collapse" data-open={patternsExpanded() ? "" : undefined}>
@@ -134,8 +131,6 @@ export const PermissionDock: Component<{
<For each={patterns()}>
{(pattern, index) => (
<div data-slot="permission-pattern-row" data-decision={decision(index())}>
<span data-slot="permission-pattern-type">{props.request.toolName}</span>
<code data-slot="permission-pattern">{pattern}</code>
<div data-slot="permission-pattern-actions">
<Tooltip value={approveTooltip(index())} placement="top">
<button
@@ -162,6 +157,8 @@ export const PermissionDock: Component<{
</button>
</Tooltip>
</div>
<span data-slot="permission-pattern-type">{props.request.toolName}</span>
<code data-slot="permission-pattern">{pattern}</code>
</div>
)}
</For>
@@ -172,34 +169,24 @@ export const PermissionDock: Component<{
</Show>
}
>
<Show when={command()}>
{(cmd) => (
<div data-slot="permission-row">
<span data-slot="permission-spacer" aria-hidden="true" />
<code data-slot="permission-command">{cmd()}</code>
</div>
)}
</Show>
<Show when={command()}>{(cmd) => <code data-slot="permission-command">{cmd()}</code>}</Show>
<Show when={!command() && toolDescription()}>
<div data-slot="permission-row">
<span data-slot="permission-spacer" aria-hidden="true" />
<div data-slot="permission-hint">{toolDescription()}</div>
</div>
<div data-slot="permission-hint">{toolDescription()}</div>
</Show>
<p data-slot="permission-session-hint">{language.t("ui.permission.sessionHint")}</p>
<div data-slot="permission-actions">
<Button
variant="ghost"
variant="primary"
size="small"
onClick={() => {
const { approved, denied } = collectPatterns()
props.onDecide("reject", approved, denied)
props.onDecide("once", approved, denied)
}}
disabled={props.responding}
>
{language.t("ui.permission.deny")}
{language.t("ui.permission.allowOnce")}
</Button>
<Button
variant="secondary"
@@ -213,15 +200,15 @@ export const PermissionDock: Component<{
{language.t("ui.permission.allowAlways")}
</Button>
<Button
variant="primary"
variant="ghost"
size="small"
onClick={() => {
const { approved, denied } = collectPatterns()
props.onDecide("once", approved, denied)
props.onDecide("reject", approved, denied)
}}
disabled={props.responding}
>
{language.t("ui.permission.allowOnce")}
{language.t("ui.permission.deny")}
</Button>
</div>
</DockPrompt>
@@ -1184,6 +1184,10 @@
margin-top: 0;
}
[data-slot="permission-row"] {
grid-template-columns: 16px 1fr;
}
[data-slot="permission-body"] {
padding: 10px 16px 0;
gap: 8px;
@@ -1207,6 +1211,7 @@
font-family: var(--vscode-editor-font-family, monospace);
color: var(--text-weak, var(--vscode-descriptionForeground));
word-break: break-word;
margin-bottom: 4px;
}
[data-slot="permission-hint"] {
@@ -1215,7 +1220,6 @@
[data-slot="permission-patterns"] {
margin: 0;
padding: 0 16px;
max-height: 160px;
overflow-y: auto;
gap: 2px;
@@ -1237,8 +1241,8 @@
all: unset;
display: flex;
align-items: center;
justify-content: space-between;
gap: 8px;
justify-content: flex-start;
gap: 6px;
padding: 6px 8px;
border-radius: 4px;
cursor: pointer;
@@ -1250,13 +1254,6 @@
}
}
[data-slot="permission-patterns-header-main"] {
display: inline-flex;
align-items: center;
gap: 6px;
min-width: 0;
}
[data-slot="permission-patterns-header-title"] {
font-size: 12px;
font-weight: 500;
@@ -1298,7 +1295,7 @@
display: flex;
align-items: center;
gap: 6px;
padding: 3px 0;
padding: 3px 0 3px 8px;
min-width: 0;
&[data-decision="approved"] [data-slot="permission-pattern"] {
@@ -1334,6 +1331,9 @@
align-items: center;
gap: 2px;
flex-shrink: 0;
/* Pull 3px left to align the 16px icon inside the 22px toggle button
with the chevron icon in the "Permission rules" header above. */
margin-left: -3px;
}
[data-slot="permission-pattern-toggle"] {
@@ -1382,14 +1382,15 @@
color: var(--text-weak, var(--vscode-descriptionForeground));
margin: 0;
padding: 4px 0 0;
text-align: center;
text-align: left;
}
[data-slot="permission-actions"] {
display: flex;
align-items: center;
flex-wrap: wrap;
gap: 8px;
justify-content: center;
justify-content: flex-start;
padding: 4px 0 8px;
}
-1
View File
@@ -64,7 +64,6 @@ const icons = {
"circle-check": `<path d="M12.4987 7.91732L8.7487 12.5007L7.08203 10.834M17.9154 10.0007C17.9154 14.3729 14.371 17.9173 9.9987 17.9173C5.62644 17.9173 2.08203 14.3729 2.08203 10.0007C2.08203 5.6284 5.62644 2.08398 9.9987 2.08398C14.371 2.08398 17.9154 5.6284 17.9154 10.0007Z" stroke="currentColor" stroke-linecap="square"/>`,
copy: `<path d="M6.2513 6.24935V2.91602H17.0846V13.7493H13.7513M13.7513 6.24935V17.0827H2.91797V6.24935H13.7513Z" stroke="currentColor" stroke-linecap="round"/>`,
check: `<path d="M5 11.9657L8.37838 14.7529L15 5.83398" stroke="currentColor" stroke-linecap="square"/>`,
"check-all": `<path d="M2.5 10.833L5.833 13.75L12.5 5.833M8.333 13.75L9.167 14.583L15.833 6.667M16.667 5.833L17.5 5" stroke="currentColor" stroke-linecap="square"/>`,
photo: `<path d="M16.6665 16.6666L11.6665 11.6666L9.99984 13.3333L6.6665 9.99996L3.08317 13.5833M2.9165 2.91663H17.0832V17.0833H2.9165V2.91663ZM13.3332 7.49996C13.3332 8.30537 12.6803 8.95829 11.8748 8.95829C11.0694 8.95829 10.4165 8.30537 10.4165 7.49996C10.4165 6.69454 11.0694 6.04163 11.8748 6.04163C12.6803 6.04163 13.3332 6.69454 13.3332 7.49996Z" stroke="currentColor" stroke-linecap="square"/>`,
share: `<path d="M10.0013 12.0846L10.0013 3.33464M13.7513 6.66797L10.0013 2.91797L6.2513 6.66797M17.0846 10.418V17.0846H2.91797V10.418" stroke="currentColor" stroke-linecap="square"/>`,
download: `<path d="M13.9583 10.6257L10 14.584L6.04167 10.6257M10 2.08398V13.959M16.25 17.9173H3.75" stroke="currentColor" stroke-linecap="square"/>`,