@shareai-lab/kode 1.1.14 → 1.1.16-dev.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cli.js +77 -82
- package/dist/entrypoints/cli.js +59 -38
- package/dist/entrypoints/cli.js.map +3 -3
- package/dist/index.js +5 -26
- package/dist/package.json +4 -1
- package/package.json +11 -104
- package/dist/test/testAdapters.js +0 -88
- package/dist/test/testAdapters.js.map +0 -1
- package/src/ProjectOnboarding.tsx +0 -198
- package/src/Tool.ts +0 -83
- package/src/commands/agents.tsx +0 -3416
- package/src/commands/approvedTools.ts +0 -53
- package/src/commands/bug.tsx +0 -20
- package/src/commands/clear.ts +0 -43
- package/src/commands/compact.ts +0 -120
- package/src/commands/config.tsx +0 -19
- package/src/commands/cost.ts +0 -18
- package/src/commands/ctx_viz.ts +0 -209
- package/src/commands/doctor.ts +0 -24
- package/src/commands/help.tsx +0 -19
- package/src/commands/init.ts +0 -37
- package/src/commands/listen.ts +0 -42
- package/src/commands/login.tsx +0 -51
- package/src/commands/logout.tsx +0 -40
- package/src/commands/mcp.ts +0 -41
- package/src/commands/model.tsx +0 -40
- package/src/commands/modelstatus.tsx +0 -20
- package/src/commands/onboarding.tsx +0 -34
- package/src/commands/pr_comments.ts +0 -59
- package/src/commands/refreshCommands.ts +0 -54
- package/src/commands/release-notes.ts +0 -34
- package/src/commands/resume.tsx +0 -31
- package/src/commands/review.ts +0 -49
- package/src/commands/terminalSetup.ts +0 -221
- package/src/commands.ts +0 -139
- package/src/components/ApproveApiKey.tsx +0 -93
- package/src/components/AsciiLogo.tsx +0 -13
- package/src/components/AutoUpdater.tsx +0 -148
- package/src/components/Bug.tsx +0 -367
- package/src/components/Config.tsx +0 -293
- package/src/components/ConsoleOAuthFlow.tsx +0 -327
- package/src/components/Cost.tsx +0 -23
- package/src/components/CostThresholdDialog.tsx +0 -46
- package/src/components/CustomSelect/option-map.ts +0 -42
- package/src/components/CustomSelect/select-option.tsx +0 -78
- package/src/components/CustomSelect/select.tsx +0 -152
- package/src/components/CustomSelect/theme.ts +0 -45
- package/src/components/CustomSelect/use-select-state.ts +0 -414
- package/src/components/CustomSelect/use-select.ts +0 -35
- package/src/components/FallbackToolUseRejectedMessage.tsx +0 -15
- package/src/components/FileEditToolUpdatedMessage.tsx +0 -66
- package/src/components/Help.tsx +0 -215
- package/src/components/HighlightedCode.tsx +0 -33
- package/src/components/InvalidConfigDialog.tsx +0 -113
- package/src/components/Link.tsx +0 -32
- package/src/components/LogSelector.tsx +0 -86
- package/src/components/Logo.tsx +0 -170
- package/src/components/MCPServerApprovalDialog.tsx +0 -100
- package/src/components/MCPServerDialogCopy.tsx +0 -25
- package/src/components/MCPServerMultiselectDialog.tsx +0 -109
- package/src/components/Message.tsx +0 -221
- package/src/components/MessageResponse.tsx +0 -15
- package/src/components/MessageSelector.tsx +0 -211
- package/src/components/ModeIndicator.tsx +0 -88
- package/src/components/ModelConfig.tsx +0 -301
- package/src/components/ModelListManager.tsx +0 -227
- package/src/components/ModelSelector.tsx +0 -3387
- package/src/components/ModelStatusDisplay.tsx +0 -230
- package/src/components/Onboarding.tsx +0 -274
- package/src/components/PressEnterToContinue.tsx +0 -11
- package/src/components/PromptInput.tsx +0 -760
- package/src/components/SentryErrorBoundary.ts +0 -39
- package/src/components/Spinner.tsx +0 -129
- package/src/components/StickerRequestForm.tsx +0 -16
- package/src/components/StructuredDiff.tsx +0 -191
- package/src/components/TextInput.tsx +0 -259
- package/src/components/TodoItem.tsx +0 -47
- package/src/components/TokenWarning.tsx +0 -31
- package/src/components/ToolUseLoader.tsx +0 -40
- package/src/components/TrustDialog.tsx +0 -106
- package/src/components/binary-feedback/BinaryFeedback.tsx +0 -63
- package/src/components/binary-feedback/BinaryFeedbackOption.tsx +0 -111
- package/src/components/binary-feedback/BinaryFeedbackView.tsx +0 -172
- package/src/components/binary-feedback/utils.ts +0 -220
- package/src/components/messages/AssistantBashOutputMessage.tsx +0 -22
- package/src/components/messages/AssistantLocalCommandOutputMessage.tsx +0 -49
- package/src/components/messages/AssistantRedactedThinkingMessage.tsx +0 -19
- package/src/components/messages/AssistantTextMessage.tsx +0 -144
- package/src/components/messages/AssistantThinkingMessage.tsx +0 -40
- package/src/components/messages/AssistantToolUseMessage.tsx +0 -132
- package/src/components/messages/TaskProgressMessage.tsx +0 -32
- package/src/components/messages/TaskToolMessage.tsx +0 -58
- package/src/components/messages/UserBashInputMessage.tsx +0 -28
- package/src/components/messages/UserCommandMessage.tsx +0 -30
- package/src/components/messages/UserKodingInputMessage.tsx +0 -28
- package/src/components/messages/UserPromptMessage.tsx +0 -35
- package/src/components/messages/UserTextMessage.tsx +0 -39
- package/src/components/messages/UserToolResultMessage/UserToolCanceledMessage.tsx +0 -12
- package/src/components/messages/UserToolResultMessage/UserToolErrorMessage.tsx +0 -36
- package/src/components/messages/UserToolResultMessage/UserToolRejectMessage.tsx +0 -31
- package/src/components/messages/UserToolResultMessage/UserToolResultMessage.tsx +0 -57
- package/src/components/messages/UserToolResultMessage/UserToolSuccessMessage.tsx +0 -35
- package/src/components/messages/UserToolResultMessage/utils.tsx +0 -56
- package/src/components/permissions/BashPermissionRequest/BashPermissionRequest.tsx +0 -121
- package/src/components/permissions/FallbackPermissionRequest.tsx +0 -153
- package/src/components/permissions/FileEditPermissionRequest/FileEditPermissionRequest.tsx +0 -182
- package/src/components/permissions/FileEditPermissionRequest/FileEditToolDiff.tsx +0 -77
- package/src/components/permissions/FileWritePermissionRequest/FileWritePermissionRequest.tsx +0 -164
- package/src/components/permissions/FileWritePermissionRequest/FileWriteToolDiff.tsx +0 -83
- package/src/components/permissions/FilesystemPermissionRequest/FilesystemPermissionRequest.tsx +0 -240
- package/src/components/permissions/PermissionRequest.tsx +0 -101
- package/src/components/permissions/PermissionRequestTitle.tsx +0 -69
- package/src/components/permissions/hooks.ts +0 -44
- package/src/components/permissions/toolUseOptions.ts +0 -59
- package/src/components/permissions/utils.ts +0 -23
- package/src/constants/betas.ts +0 -5
- package/src/constants/claude-asterisk-ascii-art.tsx +0 -238
- package/src/constants/figures.ts +0 -4
- package/src/constants/keys.ts +0 -3
- package/src/constants/macros.ts +0 -11
- package/src/constants/modelCapabilities.ts +0 -179
- package/src/constants/models.ts +0 -1025
- package/src/constants/oauth.ts +0 -18
- package/src/constants/product.ts +0 -17
- package/src/constants/prompts.ts +0 -168
- package/src/constants/releaseNotes.ts +0 -7
- package/src/context/PermissionContext.tsx +0 -149
- package/src/context.ts +0 -278
- package/src/cost-tracker.ts +0 -84
- package/src/entrypoints/cli.tsx +0 -1561
- package/src/entrypoints/mcp.ts +0 -175
- package/src/history.ts +0 -25
- package/src/hooks/useApiKeyVerification.ts +0 -59
- package/src/hooks/useArrowKeyHistory.ts +0 -55
- package/src/hooks/useCanUseTool.ts +0 -138
- package/src/hooks/useCancelRequest.ts +0 -39
- package/src/hooks/useDoublePress.ts +0 -41
- package/src/hooks/useExitOnCtrlCD.ts +0 -31
- package/src/hooks/useInterval.ts +0 -25
- package/src/hooks/useLogMessages.ts +0 -16
- package/src/hooks/useLogStartupTime.ts +0 -12
- package/src/hooks/useNotifyAfterTimeout.ts +0 -65
- package/src/hooks/usePermissionRequestLogging.ts +0 -44
- package/src/hooks/useTerminalSize.ts +0 -49
- package/src/hooks/useTextInput.ts +0 -317
- package/src/hooks/useUnifiedCompletion.ts +0 -1405
- package/src/index.ts +0 -34
- package/src/messages.ts +0 -38
- package/src/permissions.ts +0 -268
- package/src/query.ts +0 -720
- package/src/screens/ConfigureNpmPrefix.tsx +0 -197
- package/src/screens/Doctor.tsx +0 -219
- package/src/screens/LogList.tsx +0 -68
- package/src/screens/REPL.tsx +0 -813
- package/src/screens/ResumeConversation.tsx +0 -68
- package/src/services/adapters/base.ts +0 -38
- package/src/services/adapters/chatCompletions.ts +0 -90
- package/src/services/adapters/responsesAPI.ts +0 -170
- package/src/services/browserMocks.ts +0 -66
- package/src/services/claude.ts +0 -2197
- package/src/services/customCommands.ts +0 -704
- package/src/services/fileFreshness.ts +0 -377
- package/src/services/gpt5ConnectionTest.ts +0 -340
- package/src/services/mcpClient.ts +0 -564
- package/src/services/mcpServerApproval.tsx +0 -50
- package/src/services/mentionProcessor.ts +0 -273
- package/src/services/modelAdapterFactory.ts +0 -69
- package/src/services/notifier.ts +0 -40
- package/src/services/oauth.ts +0 -357
- package/src/services/openai.ts +0 -1359
- package/src/services/responseStateManager.ts +0 -90
- package/src/services/sentry.ts +0 -3
- package/src/services/statsig.ts +0 -172
- package/src/services/statsigStorage.ts +0 -86
- package/src/services/systemReminder.ts +0 -507
- package/src/services/vcr.ts +0 -161
- package/src/test/testAdapters.ts +0 -96
- package/src/tools/ArchitectTool/ArchitectTool.tsx +0 -135
- package/src/tools/ArchitectTool/prompt.ts +0 -15
- package/src/tools/AskExpertModelTool/AskExpertModelTool.tsx +0 -576
- package/src/tools/BashTool/BashTool.tsx +0 -243
- package/src/tools/BashTool/BashToolResultMessage.tsx +0 -38
- package/src/tools/BashTool/OutputLine.tsx +0 -49
- package/src/tools/BashTool/prompt.ts +0 -174
- package/src/tools/BashTool/utils.ts +0 -56
- package/src/tools/FileEditTool/FileEditTool.tsx +0 -319
- package/src/tools/FileEditTool/prompt.ts +0 -51
- package/src/tools/FileEditTool/utils.ts +0 -58
- package/src/tools/FileReadTool/FileReadTool.tsx +0 -404
- package/src/tools/FileReadTool/prompt.ts +0 -7
- package/src/tools/FileWriteTool/FileWriteTool.tsx +0 -301
- package/src/tools/FileWriteTool/prompt.ts +0 -10
- package/src/tools/GlobTool/GlobTool.tsx +0 -119
- package/src/tools/GlobTool/prompt.ts +0 -8
- package/src/tools/GrepTool/GrepTool.tsx +0 -147
- package/src/tools/GrepTool/prompt.ts +0 -11
- package/src/tools/MCPTool/MCPTool.tsx +0 -107
- package/src/tools/MCPTool/prompt.ts +0 -3
- package/src/tools/MemoryReadTool/MemoryReadTool.tsx +0 -127
- package/src/tools/MemoryReadTool/prompt.ts +0 -3
- package/src/tools/MemoryWriteTool/MemoryWriteTool.tsx +0 -89
- package/src/tools/MemoryWriteTool/prompt.ts +0 -3
- package/src/tools/MultiEditTool/MultiEditTool.tsx +0 -388
- package/src/tools/MultiEditTool/prompt.ts +0 -45
- package/src/tools/NotebookEditTool/NotebookEditTool.tsx +0 -298
- package/src/tools/NotebookEditTool/prompt.ts +0 -3
- package/src/tools/NotebookReadTool/NotebookReadTool.tsx +0 -258
- package/src/tools/NotebookReadTool/prompt.ts +0 -3
- package/src/tools/StickerRequestTool/StickerRequestTool.tsx +0 -107
- package/src/tools/StickerRequestTool/prompt.ts +0 -19
- package/src/tools/TaskTool/TaskTool.tsx +0 -438
- package/src/tools/TaskTool/constants.ts +0 -1
- package/src/tools/TaskTool/prompt.ts +0 -92
- package/src/tools/ThinkTool/ThinkTool.tsx +0 -54
- package/src/tools/ThinkTool/prompt.ts +0 -12
- package/src/tools/TodoWriteTool/TodoWriteTool.tsx +0 -313
- package/src/tools/TodoWriteTool/prompt.ts +0 -63
- package/src/tools/URLFetcherTool/URLFetcherTool.tsx +0 -178
- package/src/tools/URLFetcherTool/cache.ts +0 -55
- package/src/tools/URLFetcherTool/htmlToMarkdown.ts +0 -55
- package/src/tools/URLFetcherTool/prompt.ts +0 -17
- package/src/tools/WebSearchTool/WebSearchTool.tsx +0 -103
- package/src/tools/WebSearchTool/prompt.ts +0 -13
- package/src/tools/WebSearchTool/searchProviders.ts +0 -66
- package/src/tools/lsTool/lsTool.tsx +0 -272
- package/src/tools/lsTool/prompt.ts +0 -2
- package/src/tools.ts +0 -67
- package/src/types/PermissionMode.ts +0 -120
- package/src/types/RequestContext.ts +0 -72
- package/src/types/common.d.ts +0 -2
- package/src/types/conversation.ts +0 -51
- package/src/types/logs.ts +0 -58
- package/src/types/modelCapabilities.ts +0 -64
- package/src/types/notebook.ts +0 -87
- package/src/utils/Cursor.ts +0 -436
- package/src/utils/PersistentShell.ts +0 -552
- package/src/utils/advancedFuzzyMatcher.ts +0 -290
- package/src/utils/agentLoader.ts +0 -278
- package/src/utils/agentStorage.ts +0 -97
- package/src/utils/array.ts +0 -3
- package/src/utils/ask.tsx +0 -99
- package/src/utils/auth.ts +0 -13
- package/src/utils/autoCompactCore.ts +0 -223
- package/src/utils/autoUpdater.ts +0 -458
- package/src/utils/betas.ts +0 -20
- package/src/utils/browser.ts +0 -14
- package/src/utils/cleanup.ts +0 -72
- package/src/utils/commands.ts +0 -261
- package/src/utils/commonUnixCommands.ts +0 -161
- package/src/utils/config.ts +0 -945
- package/src/utils/conversationRecovery.ts +0 -55
- package/src/utils/debugLogger.ts +0 -1235
- package/src/utils/diff.ts +0 -42
- package/src/utils/env.ts +0 -57
- package/src/utils/errors.ts +0 -21
- package/src/utils/exampleCommands.ts +0 -109
- package/src/utils/execFileNoThrow.ts +0 -51
- package/src/utils/expertChatStorage.ts +0 -136
- package/src/utils/file.ts +0 -405
- package/src/utils/fileRecoveryCore.ts +0 -71
- package/src/utils/format.tsx +0 -44
- package/src/utils/fuzzyMatcher.ts +0 -328
- package/src/utils/generators.ts +0 -62
- package/src/utils/git.ts +0 -92
- package/src/utils/globalLogger.ts +0 -77
- package/src/utils/http.ts +0 -10
- package/src/utils/imagePaste.ts +0 -38
- package/src/utils/json.ts +0 -13
- package/src/utils/log.ts +0 -382
- package/src/utils/markdown.ts +0 -213
- package/src/utils/messageContextManager.ts +0 -294
- package/src/utils/messages.tsx +0 -945
- package/src/utils/model.ts +0 -914
- package/src/utils/permissions/filesystem.ts +0 -127
- package/src/utils/responseState.ts +0 -23
- package/src/utils/ripgrep.ts +0 -167
- package/src/utils/secureFile.ts +0 -564
- package/src/utils/sessionState.ts +0 -49
- package/src/utils/state.ts +0 -25
- package/src/utils/style.ts +0 -29
- package/src/utils/terminal.ts +0 -50
- package/src/utils/theme.ts +0 -127
- package/src/utils/thinking.ts +0 -144
- package/src/utils/todoStorage.ts +0 -431
- package/src/utils/tokens.ts +0 -43
- package/src/utils/toolExecutionController.ts +0 -163
- package/src/utils/unaryLogging.ts +0 -26
- package/src/utils/user.ts +0 -37
- package/src/utils/validate.ts +0 -165
|
@@ -1,153 +0,0 @@
|
|
|
1
|
-
import { Box, Text } from 'ink'
|
|
2
|
-
import React, { useMemo } from 'react'
|
|
3
|
-
import { Select } from '../CustomSelect/select'
|
|
4
|
-
import { getTheme } from '../../utils/theme'
|
|
5
|
-
import {
|
|
6
|
-
PermissionRequestTitle,
|
|
7
|
-
textColorForRiskScore,
|
|
8
|
-
} from './PermissionRequestTitle.js'
|
|
9
|
-
import { logUnaryEvent } from '../../utils/unaryLogging'
|
|
10
|
-
import { env } from '../../utils/env'
|
|
11
|
-
import { getCwd } from '../../utils/state'
|
|
12
|
-
import { savePermission } from '../../permissions'
|
|
13
|
-
import {
|
|
14
|
-
type ToolUseConfirm,
|
|
15
|
-
toolUseConfirmGetPrefix,
|
|
16
|
-
} from './PermissionRequest.js'
|
|
17
|
-
import chalk from 'chalk'
|
|
18
|
-
import {
|
|
19
|
-
UnaryEvent,
|
|
20
|
-
usePermissionRequestLogging,
|
|
21
|
-
} from '../../hooks/usePermissionRequestLogging.js'
|
|
22
|
-
|
|
23
|
-
type Props = {
|
|
24
|
-
toolUseConfirm: ToolUseConfirm
|
|
25
|
-
onDone(): void
|
|
26
|
-
verbose: boolean
|
|
27
|
-
}
|
|
28
|
-
|
|
29
|
-
export function FallbackPermissionRequest({
|
|
30
|
-
toolUseConfirm,
|
|
31
|
-
onDone,
|
|
32
|
-
verbose,
|
|
33
|
-
}: Props): React.ReactNode {
|
|
34
|
-
const theme = getTheme()
|
|
35
|
-
|
|
36
|
-
// TODO: Avoid these special cases
|
|
37
|
-
const originalUserFacingName = toolUseConfirm.tool.userFacingName()
|
|
38
|
-
const userFacingName = originalUserFacingName.endsWith(' (MCP)')
|
|
39
|
-
? originalUserFacingName.slice(0, -6)
|
|
40
|
-
: originalUserFacingName
|
|
41
|
-
|
|
42
|
-
const unaryEvent = useMemo<UnaryEvent>(
|
|
43
|
-
() => ({
|
|
44
|
-
completion_type: 'tool_use_single',
|
|
45
|
-
language_name: 'none',
|
|
46
|
-
}),
|
|
47
|
-
[],
|
|
48
|
-
)
|
|
49
|
-
|
|
50
|
-
usePermissionRequestLogging(toolUseConfirm, unaryEvent)
|
|
51
|
-
|
|
52
|
-
return (
|
|
53
|
-
<Box
|
|
54
|
-
flexDirection="column"
|
|
55
|
-
borderStyle="round"
|
|
56
|
-
borderColor={textColorForRiskScore(toolUseConfirm.riskScore)}
|
|
57
|
-
marginTop={1}
|
|
58
|
-
paddingLeft={1}
|
|
59
|
-
paddingRight={1}
|
|
60
|
-
paddingBottom={1}
|
|
61
|
-
>
|
|
62
|
-
<PermissionRequestTitle
|
|
63
|
-
title="Tool use"
|
|
64
|
-
riskScore={toolUseConfirm.riskScore}
|
|
65
|
-
/>
|
|
66
|
-
<Box flexDirection="column" paddingX={2} paddingY={1}>
|
|
67
|
-
<Text>
|
|
68
|
-
{userFacingName}(
|
|
69
|
-
{toolUseConfirm.tool.renderToolUseMessage(
|
|
70
|
-
toolUseConfirm.input as never,
|
|
71
|
-
{ verbose },
|
|
72
|
-
)}
|
|
73
|
-
)
|
|
74
|
-
{originalUserFacingName.endsWith(' (MCP)') ? (
|
|
75
|
-
<Text color={theme.secondaryText}> (MCP)</Text>
|
|
76
|
-
) : (
|
|
77
|
-
''
|
|
78
|
-
)}
|
|
79
|
-
</Text>
|
|
80
|
-
<Text color={theme.secondaryText}>{toolUseConfirm.description}</Text>
|
|
81
|
-
</Box>
|
|
82
|
-
|
|
83
|
-
<Box flexDirection="column">
|
|
84
|
-
<Text>Do you want to proceed?</Text>
|
|
85
|
-
<Select
|
|
86
|
-
options={[
|
|
87
|
-
{
|
|
88
|
-
label: 'Yes',
|
|
89
|
-
value: 'yes',
|
|
90
|
-
},
|
|
91
|
-
{
|
|
92
|
-
label: `Yes, and don't ask again for ${chalk.bold(userFacingName)} commands in ${chalk.bold(getCwd())}`,
|
|
93
|
-
value: 'yes-dont-ask-again',
|
|
94
|
-
},
|
|
95
|
-
{
|
|
96
|
-
label: `No, and provide instructions (${chalk.bold.hex(getTheme().warning)('esc')})`,
|
|
97
|
-
value: 'no',
|
|
98
|
-
},
|
|
99
|
-
]}
|
|
100
|
-
onChange={newValue => {
|
|
101
|
-
switch (newValue) {
|
|
102
|
-
case 'yes':
|
|
103
|
-
logUnaryEvent({
|
|
104
|
-
completion_type: 'tool_use_single',
|
|
105
|
-
event: 'accept',
|
|
106
|
-
metadata: {
|
|
107
|
-
language_name: 'none',
|
|
108
|
-
message_id: toolUseConfirm.assistantMessage.message.id,
|
|
109
|
-
platform: env.platform,
|
|
110
|
-
},
|
|
111
|
-
})
|
|
112
|
-
toolUseConfirm.onAllow('temporary')
|
|
113
|
-
onDone()
|
|
114
|
-
break
|
|
115
|
-
case 'yes-dont-ask-again':
|
|
116
|
-
logUnaryEvent({
|
|
117
|
-
completion_type: 'tool_use_single',
|
|
118
|
-
event: 'accept',
|
|
119
|
-
metadata: {
|
|
120
|
-
language_name: 'none',
|
|
121
|
-
message_id: toolUseConfirm.assistantMessage.message.id,
|
|
122
|
-
platform: env.platform,
|
|
123
|
-
},
|
|
124
|
-
})
|
|
125
|
-
savePermission(
|
|
126
|
-
toolUseConfirm.tool,
|
|
127
|
-
toolUseConfirm.input,
|
|
128
|
-
toolUseConfirmGetPrefix(toolUseConfirm),
|
|
129
|
-
).then(() => {
|
|
130
|
-
toolUseConfirm.onAllow('permanent')
|
|
131
|
-
onDone()
|
|
132
|
-
})
|
|
133
|
-
break
|
|
134
|
-
case 'no':
|
|
135
|
-
logUnaryEvent({
|
|
136
|
-
completion_type: 'tool_use_single',
|
|
137
|
-
event: 'reject',
|
|
138
|
-
metadata: {
|
|
139
|
-
language_name: 'none',
|
|
140
|
-
message_id: toolUseConfirm.assistantMessage.message.id,
|
|
141
|
-
platform: env.platform,
|
|
142
|
-
},
|
|
143
|
-
})
|
|
144
|
-
toolUseConfirm.onReject()
|
|
145
|
-
onDone()
|
|
146
|
-
break
|
|
147
|
-
}
|
|
148
|
-
}}
|
|
149
|
-
/>
|
|
150
|
-
</Box>
|
|
151
|
-
</Box>
|
|
152
|
-
)
|
|
153
|
-
}
|
|
@@ -1,182 +0,0 @@
|
|
|
1
|
-
import { Select } from '../../CustomSelect/select'
|
|
2
|
-
import chalk from 'chalk'
|
|
3
|
-
import { Box, Text } from 'ink'
|
|
4
|
-
import { basename, extname } from 'path'
|
|
5
|
-
import React, { useMemo } from 'react'
|
|
6
|
-
import {
|
|
7
|
-
UnaryEvent,
|
|
8
|
-
usePermissionRequestLogging,
|
|
9
|
-
} from '../../../hooks/usePermissionRequestLogging.js'
|
|
10
|
-
import { savePermission } from '../../../permissions'
|
|
11
|
-
import { env } from '../../../utils/env'
|
|
12
|
-
import { getTheme } from '../../../utils/theme'
|
|
13
|
-
import { logUnaryEvent } from '../../../utils/unaryLogging'
|
|
14
|
-
import {
|
|
15
|
-
type ToolUseConfirm,
|
|
16
|
-
toolUseConfirmGetPrefix,
|
|
17
|
-
} from '../PermissionRequest.js'
|
|
18
|
-
import {
|
|
19
|
-
PermissionRequestTitle,
|
|
20
|
-
textColorForRiskScore,
|
|
21
|
-
} from '../PermissionRequestTitle.js'
|
|
22
|
-
import { FileEditToolDiff } from './FileEditToolDiff'
|
|
23
|
-
import { useTerminalSize } from '../../../hooks/useTerminalSize'
|
|
24
|
-
import { pathInOriginalCwd } from '../../../utils/permissions/filesystem'
|
|
25
|
-
|
|
26
|
-
function getOptions(path: string) {
|
|
27
|
-
// Only show don't ask again option for edits in original working directory
|
|
28
|
-
const showDontAskAgainOptions = pathInOriginalCwd(path)
|
|
29
|
-
? [
|
|
30
|
-
{
|
|
31
|
-
label: "Yes, and don't ask again this session",
|
|
32
|
-
value: 'yes-dont-ask-again',
|
|
33
|
-
},
|
|
34
|
-
]
|
|
35
|
-
: []
|
|
36
|
-
|
|
37
|
-
return [
|
|
38
|
-
{
|
|
39
|
-
label: 'Yes',
|
|
40
|
-
value: 'yes',
|
|
41
|
-
},
|
|
42
|
-
...showDontAskAgainOptions,
|
|
43
|
-
{
|
|
44
|
-
label: `No, and provide instructions (${chalk.bold.hex(getTheme().warning)('esc')})`,
|
|
45
|
-
value: 'no',
|
|
46
|
-
},
|
|
47
|
-
]
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
type Props = {
|
|
51
|
-
toolUseConfirm: ToolUseConfirm
|
|
52
|
-
onDone(): void
|
|
53
|
-
verbose: boolean
|
|
54
|
-
}
|
|
55
|
-
|
|
56
|
-
export function FileEditPermissionRequest({
|
|
57
|
-
toolUseConfirm,
|
|
58
|
-
onDone,
|
|
59
|
-
verbose,
|
|
60
|
-
}: Props): React.ReactNode {
|
|
61
|
-
const { columns } = useTerminalSize()
|
|
62
|
-
const { file_path, new_string, old_string } = toolUseConfirm.input as {
|
|
63
|
-
file_path: string
|
|
64
|
-
new_string: string
|
|
65
|
-
old_string: string
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
const unaryEvent = useMemo<UnaryEvent>(
|
|
69
|
-
() => ({
|
|
70
|
-
completion_type: 'str_replace_single',
|
|
71
|
-
language_name: extractLanguageName(file_path),
|
|
72
|
-
}),
|
|
73
|
-
[file_path],
|
|
74
|
-
)
|
|
75
|
-
|
|
76
|
-
usePermissionRequestLogging(toolUseConfirm, unaryEvent)
|
|
77
|
-
|
|
78
|
-
return (
|
|
79
|
-
<Box
|
|
80
|
-
flexDirection="column"
|
|
81
|
-
borderStyle="round"
|
|
82
|
-
borderColor={textColorForRiskScore(toolUseConfirm.riskScore)}
|
|
83
|
-
marginTop={1}
|
|
84
|
-
paddingLeft={1}
|
|
85
|
-
paddingRight={1}
|
|
86
|
-
paddingBottom={1}
|
|
87
|
-
>
|
|
88
|
-
<PermissionRequestTitle
|
|
89
|
-
title="Edit file"
|
|
90
|
-
riskScore={toolUseConfirm.riskScore}
|
|
91
|
-
/>
|
|
92
|
-
<FileEditToolDiff
|
|
93
|
-
file_path={file_path}
|
|
94
|
-
new_string={new_string}
|
|
95
|
-
old_string={old_string}
|
|
96
|
-
verbose={verbose}
|
|
97
|
-
width={columns - 12}
|
|
98
|
-
/>
|
|
99
|
-
<Box flexDirection="column">
|
|
100
|
-
<Text>
|
|
101
|
-
Do you want to make this edit to{' '}
|
|
102
|
-
<Text bold>{basename(file_path)}</Text>?
|
|
103
|
-
</Text>
|
|
104
|
-
<Select
|
|
105
|
-
options={getOptions(file_path)}
|
|
106
|
-
onChange={newValue => {
|
|
107
|
-
switch (newValue) {
|
|
108
|
-
case 'yes':
|
|
109
|
-
extractLanguageName(file_path).then(language => {
|
|
110
|
-
logUnaryEvent({
|
|
111
|
-
completion_type: 'str_replace_single',
|
|
112
|
-
event: 'accept',
|
|
113
|
-
metadata: {
|
|
114
|
-
language_name: language,
|
|
115
|
-
message_id: toolUseConfirm.assistantMessage.message.id,
|
|
116
|
-
platform: env.platform,
|
|
117
|
-
},
|
|
118
|
-
})
|
|
119
|
-
})
|
|
120
|
-
// Note: We call onDone before onAllow to hide the
|
|
121
|
-
// permission request before we render the next message
|
|
122
|
-
onDone()
|
|
123
|
-
toolUseConfirm.onAllow('temporary')
|
|
124
|
-
break
|
|
125
|
-
case 'yes-dont-ask-again':
|
|
126
|
-
extractLanguageName(file_path).then(language => {
|
|
127
|
-
logUnaryEvent({
|
|
128
|
-
completion_type: 'str_replace_single',
|
|
129
|
-
event: 'accept',
|
|
130
|
-
metadata: {
|
|
131
|
-
language_name: language,
|
|
132
|
-
message_id: toolUseConfirm.assistantMessage.message.id,
|
|
133
|
-
platform: env.platform,
|
|
134
|
-
},
|
|
135
|
-
})
|
|
136
|
-
})
|
|
137
|
-
savePermission(
|
|
138
|
-
toolUseConfirm.tool,
|
|
139
|
-
toolUseConfirm.input,
|
|
140
|
-
toolUseConfirmGetPrefix(toolUseConfirm),
|
|
141
|
-
).then(() => {
|
|
142
|
-
// Note: We call onDone before onAllow to hide the
|
|
143
|
-
// permission request before we render the next message
|
|
144
|
-
onDone()
|
|
145
|
-
toolUseConfirm.onAllow('permanent')
|
|
146
|
-
})
|
|
147
|
-
break
|
|
148
|
-
case 'no':
|
|
149
|
-
extractLanguageName(file_path).then(language => {
|
|
150
|
-
logUnaryEvent({
|
|
151
|
-
completion_type: 'str_replace_single',
|
|
152
|
-
event: 'reject',
|
|
153
|
-
metadata: {
|
|
154
|
-
language_name: language,
|
|
155
|
-
message_id: toolUseConfirm.assistantMessage.message.id,
|
|
156
|
-
platform: env.platform,
|
|
157
|
-
},
|
|
158
|
-
})
|
|
159
|
-
})
|
|
160
|
-
// Note: We call onDone before onAllow to hide the
|
|
161
|
-
// permission request before we render the next message
|
|
162
|
-
onDone()
|
|
163
|
-
toolUseConfirm.onReject()
|
|
164
|
-
break
|
|
165
|
-
}
|
|
166
|
-
}}
|
|
167
|
-
/>
|
|
168
|
-
</Box>
|
|
169
|
-
</Box>
|
|
170
|
-
)
|
|
171
|
-
}
|
|
172
|
-
|
|
173
|
-
async function extractLanguageName(file_path: string): Promise<string> {
|
|
174
|
-
const ext = extname(file_path)
|
|
175
|
-
if (!ext) {
|
|
176
|
-
return 'unknown'
|
|
177
|
-
}
|
|
178
|
-
const Highlight = (await import('highlight.js')) as unknown as {
|
|
179
|
-
default: { getLanguage(ext: string): { name: string | undefined } }
|
|
180
|
-
}
|
|
181
|
-
return Highlight.default.getLanguage(ext.slice(1))?.name ?? 'unknown'
|
|
182
|
-
}
|
|
@@ -1,77 +0,0 @@
|
|
|
1
|
-
import * as React from 'react'
|
|
2
|
-
import { existsSync, readFileSync } from 'fs'
|
|
3
|
-
import { useMemo } from 'react'
|
|
4
|
-
import { StructuredDiff } from '../../StructuredDiff'
|
|
5
|
-
import { Box, Text } from 'ink'
|
|
6
|
-
import { getTheme } from '../../../utils/theme'
|
|
7
|
-
import { intersperse } from '../../../utils/array'
|
|
8
|
-
import { getCwd } from '../../../utils/state'
|
|
9
|
-
import { relative } from 'path'
|
|
10
|
-
import { getPatch } from '../../../utils/diff'
|
|
11
|
-
|
|
12
|
-
type Props = {
|
|
13
|
-
file_path: string
|
|
14
|
-
new_string: string
|
|
15
|
-
old_string: string
|
|
16
|
-
verbose: boolean
|
|
17
|
-
useBorder?: boolean
|
|
18
|
-
width: number
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
export function FileEditToolDiff({
|
|
22
|
-
file_path,
|
|
23
|
-
new_string,
|
|
24
|
-
old_string,
|
|
25
|
-
verbose,
|
|
26
|
-
useBorder = true,
|
|
27
|
-
width,
|
|
28
|
-
}: Props): React.ReactNode {
|
|
29
|
-
const file = useMemo(
|
|
30
|
-
() => (existsSync(file_path) ? readFileSync(file_path, 'utf8') : ''),
|
|
31
|
-
[file_path],
|
|
32
|
-
)
|
|
33
|
-
const patch = useMemo(
|
|
34
|
-
() =>
|
|
35
|
-
getPatch({
|
|
36
|
-
filePath: file_path,
|
|
37
|
-
fileContents: file,
|
|
38
|
-
oldStr: old_string,
|
|
39
|
-
newStr: new_string,
|
|
40
|
-
}),
|
|
41
|
-
[file_path, file, old_string, new_string],
|
|
42
|
-
)
|
|
43
|
-
|
|
44
|
-
return (
|
|
45
|
-
<Box flexDirection="column">
|
|
46
|
-
<Box
|
|
47
|
-
borderColor={getTheme().secondaryBorder}
|
|
48
|
-
borderStyle={useBorder ? 'round' : undefined}
|
|
49
|
-
flexDirection="column"
|
|
50
|
-
paddingX={1}
|
|
51
|
-
>
|
|
52
|
-
<Box paddingBottom={1}>
|
|
53
|
-
<Text bold>
|
|
54
|
-
{verbose ? file_path : relative(getCwd(), file_path)}
|
|
55
|
-
</Text>
|
|
56
|
-
</Box>
|
|
57
|
-
{intersperse(
|
|
58
|
-
patch.map(_ => (
|
|
59
|
-
<StructuredDiff
|
|
60
|
-
key={_.newStart}
|
|
61
|
-
patch={_}
|
|
62
|
-
dim={false}
|
|
63
|
-
width={width}
|
|
64
|
-
/>
|
|
65
|
-
)),
|
|
66
|
-
i => (
|
|
67
|
-
<React.Fragment key={`ellipsis-${i}`}>
|
|
68
|
-
<Text color={getTheme().secondaryText}>
|
|
69
|
-
...
|
|
70
|
-
</Text>
|
|
71
|
-
</React.Fragment>
|
|
72
|
-
),
|
|
73
|
-
)}
|
|
74
|
-
</Box>
|
|
75
|
-
</Box>
|
|
76
|
-
)
|
|
77
|
-
}
|
package/src/components/permissions/FileWritePermissionRequest/FileWritePermissionRequest.tsx
DELETED
|
@@ -1,164 +0,0 @@
|
|
|
1
|
-
import { Box, Text } from 'ink'
|
|
2
|
-
import React, { useMemo } from 'react'
|
|
3
|
-
import { Select } from '../../CustomSelect/select'
|
|
4
|
-
import { basename, extname } from 'path'
|
|
5
|
-
import { getTheme } from '../../../utils/theme'
|
|
6
|
-
import {
|
|
7
|
-
PermissionRequestTitle,
|
|
8
|
-
textColorForRiskScore,
|
|
9
|
-
} from '../PermissionRequestTitle.js'
|
|
10
|
-
import { logUnaryEvent } from '../../../utils/unaryLogging'
|
|
11
|
-
import { env } from '../../../utils/env'
|
|
12
|
-
import { savePermission } from '../../../permissions'
|
|
13
|
-
import {
|
|
14
|
-
type ToolUseConfirm,
|
|
15
|
-
toolUseConfirmGetPrefix,
|
|
16
|
-
} from '../PermissionRequest.js'
|
|
17
|
-
import { existsSync } from 'fs'
|
|
18
|
-
import chalk from 'chalk'
|
|
19
|
-
import {
|
|
20
|
-
UnaryEvent,
|
|
21
|
-
usePermissionRequestLogging,
|
|
22
|
-
} from '../../../hooks/usePermissionRequestLogging.js'
|
|
23
|
-
import { FileWriteToolDiff } from './FileWriteToolDiff'
|
|
24
|
-
import { useTerminalSize } from '../../../hooks/useTerminalSize'
|
|
25
|
-
|
|
26
|
-
type Props = {
|
|
27
|
-
toolUseConfirm: ToolUseConfirm
|
|
28
|
-
onDone(): void
|
|
29
|
-
verbose: boolean
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
export function FileWritePermissionRequest({
|
|
33
|
-
toolUseConfirm,
|
|
34
|
-
onDone,
|
|
35
|
-
verbose,
|
|
36
|
-
}: Props): React.ReactNode {
|
|
37
|
-
const { file_path, content } = toolUseConfirm.input as {
|
|
38
|
-
file_path: string
|
|
39
|
-
content: string
|
|
40
|
-
}
|
|
41
|
-
const fileExists = useMemo(() => existsSync(file_path), [file_path])
|
|
42
|
-
const unaryEvent = useMemo<UnaryEvent>(
|
|
43
|
-
() => ({
|
|
44
|
-
completion_type: 'write_file_single',
|
|
45
|
-
language_name: extractLanguageName(file_path),
|
|
46
|
-
}),
|
|
47
|
-
[file_path],
|
|
48
|
-
)
|
|
49
|
-
const { columns } = useTerminalSize()
|
|
50
|
-
usePermissionRequestLogging(toolUseConfirm, unaryEvent)
|
|
51
|
-
|
|
52
|
-
return (
|
|
53
|
-
<Box
|
|
54
|
-
flexDirection="column"
|
|
55
|
-
borderStyle="round"
|
|
56
|
-
borderColor={textColorForRiskScore(toolUseConfirm.riskScore)}
|
|
57
|
-
marginTop={1}
|
|
58
|
-
paddingLeft={1}
|
|
59
|
-
paddingRight={1}
|
|
60
|
-
paddingBottom={1}
|
|
61
|
-
>
|
|
62
|
-
<PermissionRequestTitle
|
|
63
|
-
title={`${fileExists ? 'Edit' : 'Create'} file`}
|
|
64
|
-
riskScore={toolUseConfirm.riskScore}
|
|
65
|
-
/>
|
|
66
|
-
<Box flexDirection="column">
|
|
67
|
-
<FileWriteToolDiff
|
|
68
|
-
file_path={file_path}
|
|
69
|
-
content={content}
|
|
70
|
-
verbose={verbose}
|
|
71
|
-
width={columns - 12}
|
|
72
|
-
/>
|
|
73
|
-
</Box>
|
|
74
|
-
<Box flexDirection="column">
|
|
75
|
-
<Text>
|
|
76
|
-
Do you want to {fileExists ? 'make this edit to' : 'create'}{' '}
|
|
77
|
-
<Text bold>{basename(file_path)}</Text>?
|
|
78
|
-
</Text>
|
|
79
|
-
<Select
|
|
80
|
-
options={[
|
|
81
|
-
{
|
|
82
|
-
label: 'Yes',
|
|
83
|
-
value: 'yes',
|
|
84
|
-
},
|
|
85
|
-
{
|
|
86
|
-
label: "Yes, and don't ask again this session",
|
|
87
|
-
value: 'yes-dont-ask-again',
|
|
88
|
-
},
|
|
89
|
-
{
|
|
90
|
-
label: `No, and provide instructions (${chalk.bold.hex(getTheme().warning)('esc')})`,
|
|
91
|
-
value: 'no',
|
|
92
|
-
},
|
|
93
|
-
]}
|
|
94
|
-
onChange={newValue => {
|
|
95
|
-
switch (newValue) {
|
|
96
|
-
case 'yes':
|
|
97
|
-
extractLanguageName(file_path).then(language => {
|
|
98
|
-
logUnaryEvent({
|
|
99
|
-
completion_type: 'write_file_single',
|
|
100
|
-
event: 'accept',
|
|
101
|
-
metadata: {
|
|
102
|
-
language_name: language,
|
|
103
|
-
message_id: toolUseConfirm.assistantMessage.message.id,
|
|
104
|
-
platform: env.platform,
|
|
105
|
-
},
|
|
106
|
-
})
|
|
107
|
-
})
|
|
108
|
-
toolUseConfirm.onAllow('temporary')
|
|
109
|
-
onDone()
|
|
110
|
-
break
|
|
111
|
-
case 'yes-dont-ask-again':
|
|
112
|
-
extractLanguageName(file_path).then(language => {
|
|
113
|
-
logUnaryEvent({
|
|
114
|
-
completion_type: 'write_file_single',
|
|
115
|
-
event: 'accept',
|
|
116
|
-
metadata: {
|
|
117
|
-
language_name: language,
|
|
118
|
-
message_id: toolUseConfirm.assistantMessage.message.id,
|
|
119
|
-
platform: env.platform,
|
|
120
|
-
},
|
|
121
|
-
})
|
|
122
|
-
})
|
|
123
|
-
savePermission(
|
|
124
|
-
toolUseConfirm.tool,
|
|
125
|
-
toolUseConfirm.input,
|
|
126
|
-
toolUseConfirmGetPrefix(toolUseConfirm),
|
|
127
|
-
).then(() => {
|
|
128
|
-
toolUseConfirm.onAllow('permanent')
|
|
129
|
-
onDone()
|
|
130
|
-
})
|
|
131
|
-
break
|
|
132
|
-
case 'no':
|
|
133
|
-
extractLanguageName(file_path).then(language => {
|
|
134
|
-
logUnaryEvent({
|
|
135
|
-
completion_type: 'write_file_single',
|
|
136
|
-
event: 'reject',
|
|
137
|
-
metadata: {
|
|
138
|
-
language_name: language,
|
|
139
|
-
message_id: toolUseConfirm.assistantMessage.message.id,
|
|
140
|
-
platform: env.platform,
|
|
141
|
-
},
|
|
142
|
-
})
|
|
143
|
-
})
|
|
144
|
-
toolUseConfirm.onReject()
|
|
145
|
-
onDone()
|
|
146
|
-
break
|
|
147
|
-
}
|
|
148
|
-
}}
|
|
149
|
-
/>
|
|
150
|
-
</Box>
|
|
151
|
-
</Box>
|
|
152
|
-
)
|
|
153
|
-
}
|
|
154
|
-
|
|
155
|
-
async function extractLanguageName(file_path: string): Promise<string> {
|
|
156
|
-
const ext = extname(file_path)
|
|
157
|
-
if (!ext) {
|
|
158
|
-
return 'unknown'
|
|
159
|
-
}
|
|
160
|
-
const Highlight = (await import('highlight.js')) as unknown as {
|
|
161
|
-
default: { getLanguage(ext: string): { name: string | undefined } }
|
|
162
|
-
}
|
|
163
|
-
return Highlight.default.getLanguage(ext.slice(1))?.name ?? 'unknown'
|
|
164
|
-
}
|
|
@@ -1,83 +0,0 @@
|
|
|
1
|
-
import * as React from 'react'
|
|
2
|
-
import { existsSync, readFileSync } from 'fs'
|
|
3
|
-
import { useMemo } from 'react'
|
|
4
|
-
import { StructuredDiff } from '../../StructuredDiff'
|
|
5
|
-
import { Box, Text } from 'ink'
|
|
6
|
-
import { getTheme } from '../../../utils/theme'
|
|
7
|
-
import { intersperse } from '../../../utils/array'
|
|
8
|
-
import { getCwd } from '../../../utils/state'
|
|
9
|
-
import { extname, relative } from 'path'
|
|
10
|
-
import { detectFileEncoding } from '../../../utils/file'
|
|
11
|
-
import { HighlightedCode } from '../../HighlightedCode'
|
|
12
|
-
import { getPatch } from '../../../utils/diff'
|
|
13
|
-
|
|
14
|
-
type Props = {
|
|
15
|
-
file_path: string
|
|
16
|
-
content: string
|
|
17
|
-
verbose: boolean
|
|
18
|
-
width: number
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
export function FileWriteToolDiff({
|
|
22
|
-
file_path,
|
|
23
|
-
content,
|
|
24
|
-
verbose,
|
|
25
|
-
width,
|
|
26
|
-
}: Props): React.ReactNode {
|
|
27
|
-
const fileExists = useMemo(() => existsSync(file_path), [file_path])
|
|
28
|
-
const oldContent = useMemo(() => {
|
|
29
|
-
if (!fileExists) {
|
|
30
|
-
return ''
|
|
31
|
-
}
|
|
32
|
-
const enc = detectFileEncoding(file_path)
|
|
33
|
-
return readFileSync(file_path, enc)
|
|
34
|
-
}, [file_path, fileExists])
|
|
35
|
-
const hunks = useMemo(() => {
|
|
36
|
-
if (!fileExists) {
|
|
37
|
-
return null
|
|
38
|
-
}
|
|
39
|
-
return getPatch({
|
|
40
|
-
filePath: file_path,
|
|
41
|
-
fileContents: oldContent,
|
|
42
|
-
oldStr: oldContent,
|
|
43
|
-
newStr: content,
|
|
44
|
-
})
|
|
45
|
-
}, [fileExists, file_path, oldContent, content])
|
|
46
|
-
|
|
47
|
-
return (
|
|
48
|
-
<Box
|
|
49
|
-
borderColor={getTheme().secondaryBorder}
|
|
50
|
-
borderStyle="round"
|
|
51
|
-
flexDirection="column"
|
|
52
|
-
paddingX={1}
|
|
53
|
-
>
|
|
54
|
-
<Box paddingBottom={1}>
|
|
55
|
-
<Text bold>{verbose ? file_path : relative(getCwd(), file_path)}</Text>
|
|
56
|
-
</Box>
|
|
57
|
-
{hunks ? (
|
|
58
|
-
intersperse(
|
|
59
|
-
hunks.map(_ => (
|
|
60
|
-
<StructuredDiff
|
|
61
|
-
key={_.newStart}
|
|
62
|
-
patch={_}
|
|
63
|
-
dim={false}
|
|
64
|
-
width={width}
|
|
65
|
-
/>
|
|
66
|
-
)),
|
|
67
|
-
i => (
|
|
68
|
-
<React.Fragment key={`ellipsis-${i}`}>
|
|
69
|
-
<Text color={getTheme().secondaryText}>
|
|
70
|
-
...
|
|
71
|
-
</Text>
|
|
72
|
-
</React.Fragment>
|
|
73
|
-
),
|
|
74
|
-
)
|
|
75
|
-
) : (
|
|
76
|
-
<HighlightedCode
|
|
77
|
-
code={content || '(No content)'}
|
|
78
|
-
language={extname(file_path).slice(1)}
|
|
79
|
-
/>
|
|
80
|
-
)}
|
|
81
|
-
</Box>
|
|
82
|
-
)
|
|
83
|
-
}
|