@butlerw/vellum 0.1.0
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/LICENSE +21 -0
- package/README.md +411 -0
- package/__fixtures__/responses/code-generation.json +42 -0
- package/__fixtures__/responses/error-response.json +20 -0
- package/__fixtures__/responses/hello-world.json +32 -0
- package/dist/auth-6MCXESOH.js +26 -0
- package/dist/chunk-SECXJGWA.js +597 -0
- package/dist/index.js +34023 -0
- package/package.json +67 -0
- package/src/__tests__/commands.e2e.test.ts +728 -0
- package/src/__tests__/credentials.test.ts +713 -0
- package/src/__tests__/mode-e2e.test.ts +391 -0
- package/src/__tests__/tui-integration.test.tsx +1271 -0
- package/src/agents/__tests__/task-persistence.test.ts +235 -0
- package/src/agents/commands/delegate.ts +240 -0
- package/src/agents/commands/index.ts +10 -0
- package/src/agents/commands/resume.ts +335 -0
- package/src/agents/index.ts +29 -0
- package/src/agents/task-persistence.ts +272 -0
- package/src/agents/task-resumption.ts +242 -0
- package/src/app.tsx +4737 -0
- package/src/commands/__tests__/.gitkeep +1 -0
- package/src/commands/__tests__/agents.test.ts +606 -0
- package/src/commands/__tests__/auth.test.ts +626 -0
- package/src/commands/__tests__/autocomplete.test.ts +683 -0
- package/src/commands/__tests__/batch.test.ts +287 -0
- package/src/commands/__tests__/chain-pipe-parser.test.ts +654 -0
- package/src/commands/__tests__/completion.test.ts +238 -0
- package/src/commands/__tests__/core.test.ts +363 -0
- package/src/commands/__tests__/executor.test.ts +496 -0
- package/src/commands/__tests__/exit-codes.test.ts +220 -0
- package/src/commands/__tests__/init.test.ts +243 -0
- package/src/commands/__tests__/language.test.ts +353 -0
- package/src/commands/__tests__/mode-cli.test.ts +667 -0
- package/src/commands/__tests__/model.test.ts +277 -0
- package/src/commands/__tests__/parser.test.ts +493 -0
- package/src/commands/__tests__/performance.bench.ts +380 -0
- package/src/commands/__tests__/registry.test.ts +534 -0
- package/src/commands/__tests__/resume.test.ts +449 -0
- package/src/commands/__tests__/security.test.ts +845 -0
- package/src/commands/__tests__/stream-json.test.ts +372 -0
- package/src/commands/__tests__/user-commands.test.ts +597 -0
- package/src/commands/adapters.ts +267 -0
- package/src/commands/agent.ts +395 -0
- package/src/commands/agents/generate.ts +506 -0
- package/src/commands/agents/index.ts +272 -0
- package/src/commands/agents/show.ts +271 -0
- package/src/commands/agents/validate.ts +387 -0
- package/src/commands/auth.ts +883 -0
- package/src/commands/autocomplete.ts +480 -0
- package/src/commands/batch/command.ts +388 -0
- package/src/commands/batch/executor.ts +361 -0
- package/src/commands/batch/index.ts +12 -0
- package/src/commands/commit.ts +235 -0
- package/src/commands/completion/index.ts +371 -0
- package/src/commands/condense.ts +191 -0
- package/src/commands/config.ts +344 -0
- package/src/commands/context-provider.ts +173 -0
- package/src/commands/copy.ts +329 -0
- package/src/commands/core/clear.ts +38 -0
- package/src/commands/core/exit.ts +43 -0
- package/src/commands/core/help.ts +354 -0
- package/src/commands/core/index.ts +15 -0
- package/src/commands/cost.ts +179 -0
- package/src/commands/credentials.tsx +618 -0
- package/src/commands/custom-agents/__tests__/custom-agents.test.ts +709 -0
- package/src/commands/custom-agents/create.ts +377 -0
- package/src/commands/custom-agents/export.ts +135 -0
- package/src/commands/custom-agents/import.ts +199 -0
- package/src/commands/custom-agents/index.ts +372 -0
- package/src/commands/custom-agents/info.ts +318 -0
- package/src/commands/custom-agents/list.ts +267 -0
- package/src/commands/custom-agents/validate.ts +388 -0
- package/src/commands/diff-mode.ts +241 -0
- package/src/commands/env.ts +53 -0
- package/src/commands/executor.ts +579 -0
- package/src/commands/exit-codes.ts +202 -0
- package/src/commands/index.ts +701 -0
- package/src/commands/init/index.ts +15 -0
- package/src/commands/init/prompts.ts +366 -0
- package/src/commands/init/templates/commands-readme.md +80 -0
- package/src/commands/init/templates/example-command.md +79 -0
- package/src/commands/init/templates/example-skill.md +168 -0
- package/src/commands/init/templates/example-workflow.md +101 -0
- package/src/commands/init/templates/prompts-readme.md +52 -0
- package/src/commands/init/templates/rules-readme.md +63 -0
- package/src/commands/init/templates/skills-readme.md +83 -0
- package/src/commands/init/templates/workflows-readme.md +94 -0
- package/src/commands/init.ts +391 -0
- package/src/commands/install.ts +90 -0
- package/src/commands/language.ts +191 -0
- package/src/commands/loaders/.gitkeep +1 -0
- package/src/commands/lsp.ts +199 -0
- package/src/commands/markdown-commands.ts +253 -0
- package/src/commands/mcp.ts +588 -0
- package/src/commands/memory/export.ts +341 -0
- package/src/commands/memory/index.ts +148 -0
- package/src/commands/memory/list.ts +261 -0
- package/src/commands/memory/search.ts +346 -0
- package/src/commands/memory/utils.ts +15 -0
- package/src/commands/metrics.ts +75 -0
- package/src/commands/migrate/index.ts +16 -0
- package/src/commands/migrate/prompts.ts +477 -0
- package/src/commands/mode.ts +331 -0
- package/src/commands/model.ts +298 -0
- package/src/commands/onboard.ts +205 -0
- package/src/commands/open.ts +169 -0
- package/src/commands/output/stream-json.ts +373 -0
- package/src/commands/parser/chain-parser.ts +370 -0
- package/src/commands/parser/index.ts +29 -0
- package/src/commands/parser/pipe-parser.ts +480 -0
- package/src/commands/parser.ts +588 -0
- package/src/commands/persistence.ts +355 -0
- package/src/commands/progress.ts +18 -0
- package/src/commands/prompt/index.ts +17 -0
- package/src/commands/prompt/validate.ts +621 -0
- package/src/commands/prompt-priority.ts +401 -0
- package/src/commands/registry.ts +374 -0
- package/src/commands/sandbox/index.ts +131 -0
- package/src/commands/security/index.ts +21 -0
- package/src/commands/security/input-sanitizer.ts +168 -0
- package/src/commands/security/permission-checker.ts +456 -0
- package/src/commands/security/sensitive-data.ts +350 -0
- package/src/commands/session/delete.ts +38 -0
- package/src/commands/session/export.ts +39 -0
- package/src/commands/session/index.ts +26 -0
- package/src/commands/session/list.ts +26 -0
- package/src/commands/session/resume.ts +562 -0
- package/src/commands/session/search.ts +434 -0
- package/src/commands/session/show.ts +26 -0
- package/src/commands/settings.ts +368 -0
- package/src/commands/setup.ts +23 -0
- package/src/commands/shell/index.ts +16 -0
- package/src/commands/shell/setup.ts +422 -0
- package/src/commands/shell-init.ts +50 -0
- package/src/commands/shell-integration/index.ts +194 -0
- package/src/commands/skill.ts +1220 -0
- package/src/commands/spec.ts +558 -0
- package/src/commands/status.ts +246 -0
- package/src/commands/theme.ts +211 -0
- package/src/commands/think.ts +551 -0
- package/src/commands/trust.ts +211 -0
- package/src/commands/tutorial.ts +522 -0
- package/src/commands/types.ts +512 -0
- package/src/commands/update.ts +274 -0
- package/src/commands/usage.ts +213 -0
- package/src/commands/user-commands.ts +630 -0
- package/src/commands/utils.ts +142 -0
- package/src/commands/vim.ts +152 -0
- package/src/commands/workflow.ts +257 -0
- package/src/components/header.tsx +25 -0
- package/src/components/input.tsx +25 -0
- package/src/components/message-list.tsx +32 -0
- package/src/components/status-bar.tsx +23 -0
- package/src/index.tsx +614 -0
- package/src/onboarding/__tests__/tutorial.test.ts +740 -0
- package/src/onboarding/index.ts +69 -0
- package/src/onboarding/tips/index.ts +9 -0
- package/src/onboarding/tips/tip-engine.ts +459 -0
- package/src/onboarding/tutorial/index.ts +88 -0
- package/src/onboarding/tutorial/lessons/basics.ts +151 -0
- package/src/onboarding/tutorial/lessons/index.ts +151 -0
- package/src/onboarding/tutorial/lessons/modes.ts +230 -0
- package/src/onboarding/tutorial/lessons/tools.ts +172 -0
- package/src/onboarding/tutorial/progress-tracker.ts +350 -0
- package/src/onboarding/tutorial/storage.ts +249 -0
- package/src/onboarding/tutorial/tutorial-system.ts +462 -0
- package/src/onboarding/tutorial/types.ts +310 -0
- package/src/orchestrator-singleton.ts +129 -0
- package/src/shutdown.ts +33 -0
- package/src/test/e2e/assertions.ts +267 -0
- package/src/test/e2e/fixtures.ts +204 -0
- package/src/test/e2e/harness.ts +575 -0
- package/src/test/e2e/index.ts +57 -0
- package/src/test/e2e/types.ts +228 -0
- package/src/test/fixtures/__tests__/fake-response-loader.test.ts +314 -0
- package/src/test/fixtures/fake-response-loader.ts +314 -0
- package/src/test/fixtures/index.ts +20 -0
- package/src/tui/__tests__/mcp-panel.test.tsx +82 -0
- package/src/tui/__tests__/mcp-wiring.test.tsx +78 -0
- package/src/tui/__tests__/mode-components.test.tsx +395 -0
- package/src/tui/__tests__/permission-ask-flow.test.tsx +138 -0
- package/src/tui/__tests__/sidebar-panel-data.test.tsx +148 -0
- package/src/tui/__tests__/tools-panel-hotkeys.test.tsx +41 -0
- package/src/tui/adapters/agent-adapter.ts +1008 -0
- package/src/tui/adapters/index.ts +48 -0
- package/src/tui/adapters/message-adapter.ts +315 -0
- package/src/tui/adapters/persistence-bridge.ts +331 -0
- package/src/tui/adapters/session-adapter.ts +419 -0
- package/src/tui/buffered-stdout.ts +223 -0
- package/src/tui/components/AgentProgress.tsx +424 -0
- package/src/tui/components/Banner/AsciiArt.ts +160 -0
- package/src/tui/components/Banner/Banner.tsx +355 -0
- package/src/tui/components/Banner/ShimmerContext.tsx +131 -0
- package/src/tui/components/Banner/ShimmerText.tsx +193 -0
- package/src/tui/components/Banner/TypeWriterGradient.tsx +321 -0
- package/src/tui/components/Banner/index.ts +61 -0
- package/src/tui/components/Banner/useShimmer.ts +241 -0
- package/src/tui/components/ChatView.tsx +11 -0
- package/src/tui/components/Checkpoint/CheckpointDiffView.tsx +371 -0
- package/src/tui/components/Checkpoint/SnapshotCheckpointPanel.tsx +440 -0
- package/src/tui/components/Checkpoint/index.ts +19 -0
- package/src/tui/components/CostDisplay.tsx +226 -0
- package/src/tui/components/InitErrorBanner.tsx +122 -0
- package/src/tui/components/Input/Autocomplete.tsx +603 -0
- package/src/tui/components/Input/EnhancedCommandInput.tsx +471 -0
- package/src/tui/components/Input/HighlightedText.tsx +236 -0
- package/src/tui/components/Input/MentionAutocomplete.tsx +375 -0
- package/src/tui/components/Input/TextInput.tsx +1002 -0
- package/src/tui/components/Input/__tests__/Autocomplete.test.tsx +374 -0
- package/src/tui/components/Input/__tests__/TextInput.test.tsx +241 -0
- package/src/tui/components/Input/__tests__/highlight.test.ts +219 -0
- package/src/tui/components/Input/__tests__/slash-command-utils.test.ts +104 -0
- package/src/tui/components/Input/highlight.ts +362 -0
- package/src/tui/components/Input/index.ts +36 -0
- package/src/tui/components/Input/slash-command-utils.ts +135 -0
- package/src/tui/components/Layout.tsx +432 -0
- package/src/tui/components/McpPanel.tsx +137 -0
- package/src/tui/components/MemoryPanel.tsx +448 -0
- package/src/tui/components/Messages/CodeBlock.tsx +527 -0
- package/src/tui/components/Messages/DiffView.tsx +679 -0
- package/src/tui/components/Messages/ImageReference.tsx +89 -0
- package/src/tui/components/Messages/MarkdownBlock.tsx +228 -0
- package/src/tui/components/Messages/MarkdownRenderer.tsx +498 -0
- package/src/tui/components/Messages/MessageBubble.tsx +270 -0
- package/src/tui/components/Messages/MessageList.tsx +1719 -0
- package/src/tui/components/Messages/StreamingText.tsx +216 -0
- package/src/tui/components/Messages/ThinkingBlock.tsx +408 -0
- package/src/tui/components/Messages/ToolResultPreview.tsx +243 -0
- package/src/tui/components/Messages/__tests__/CodeBlock.test.tsx +296 -0
- package/src/tui/components/Messages/__tests__/DiffView.test.tsx +239 -0
- package/src/tui/components/Messages/__tests__/MarkdownRenderer.test.tsx +303 -0
- package/src/tui/components/Messages/__tests__/MessageBubble.test.tsx +268 -0
- package/src/tui/components/Messages/__tests__/MessageList.test.tsx +324 -0
- package/src/tui/components/Messages/__tests__/StreamingText.test.tsx +215 -0
- package/src/tui/components/Messages/index.ts +25 -0
- package/src/tui/components/ModeIndicator.tsx +177 -0
- package/src/tui/components/ModeSelector.tsx +216 -0
- package/src/tui/components/ModelSelector.tsx +339 -0
- package/src/tui/components/OnboardingWizard.tsx +670 -0
- package/src/tui/components/PhaseProgressIndicator.tsx +270 -0
- package/src/tui/components/RateLimitIndicator.tsx +82 -0
- package/src/tui/components/ScreenReaderLayout.tsx +295 -0
- package/src/tui/components/SettingsPanel.tsx +643 -0
- package/src/tui/components/Sidebar/SystemStatusPanel.tsx +284 -0
- package/src/tui/components/Sidebar/index.ts +9 -0
- package/src/tui/components/Status/ModelStatusBar.tsx +270 -0
- package/src/tui/components/Status/index.ts +12 -0
- package/src/tui/components/StatusBar/AgentModeIndicator.tsx +257 -0
- package/src/tui/components/StatusBar/ContextProgress.tsx +167 -0
- package/src/tui/components/StatusBar/FileChangesIndicator.tsx +62 -0
- package/src/tui/components/StatusBar/GitIndicator.tsx +89 -0
- package/src/tui/components/StatusBar/HeaderBar.tsx +126 -0
- package/src/tui/components/StatusBar/ModelIndicator.tsx +157 -0
- package/src/tui/components/StatusBar/PersistenceStatusIndicator.tsx +210 -0
- package/src/tui/components/StatusBar/ResilienceIndicator.tsx +106 -0
- package/src/tui/components/StatusBar/SandboxIndicator.tsx +167 -0
- package/src/tui/components/StatusBar/StatusBar.tsx +368 -0
- package/src/tui/components/StatusBar/ThinkingModeIndicator.tsx +170 -0
- package/src/tui/components/StatusBar/TokenBreakdown.tsx +246 -0
- package/src/tui/components/StatusBar/TokenCounter.tsx +135 -0
- package/src/tui/components/StatusBar/TrustModeIndicator.tsx +130 -0
- package/src/tui/components/StatusBar/WorkspaceIndicator.tsx +86 -0
- package/src/tui/components/StatusBar/__tests__/AgentModeIndicator.test.tsx +193 -0
- package/src/tui/components/StatusBar/__tests__/StatusBar.test.tsx +729 -0
- package/src/tui/components/StatusBar/index.ts +60 -0
- package/src/tui/components/TipBanner.tsx +115 -0
- package/src/tui/components/TodoItem.tsx +208 -0
- package/src/tui/components/TodoPanel.tsx +455 -0
- package/src/tui/components/Tools/ApprovalQueue.tsx +407 -0
- package/src/tui/components/Tools/OptionSelector.tsx +160 -0
- package/src/tui/components/Tools/PermissionDialog.tsx +286 -0
- package/src/tui/components/Tools/ToolParams.tsx +483 -0
- package/src/tui/components/Tools/ToolsPanel.tsx +178 -0
- package/src/tui/components/Tools/__tests__/PermissionDialog.test.tsx +510 -0
- package/src/tui/components/Tools/__tests__/ToolParams.test.tsx +432 -0
- package/src/tui/components/Tools/index.ts +21 -0
- package/src/tui/components/TrustPrompt.tsx +279 -0
- package/src/tui/components/UpdateBanner.tsx +166 -0
- package/src/tui/components/VimModeIndicator.tsx +112 -0
- package/src/tui/components/backtrack/BacktrackControls.tsx +402 -0
- package/src/tui/components/backtrack/index.ts +13 -0
- package/src/tui/components/common/AutoApprovalStatus.tsx +251 -0
- package/src/tui/components/common/CostWarning.tsx +294 -0
- package/src/tui/components/common/DynamicShortcutHints.tsx +209 -0
- package/src/tui/components/common/EnhancedLoadingIndicator.tsx +305 -0
- package/src/tui/components/common/ErrorBoundary.tsx +140 -0
- package/src/tui/components/common/GradientText.tsx +224 -0
- package/src/tui/components/common/HotkeyHelpModal.tsx +193 -0
- package/src/tui/components/common/HotkeyHints.tsx +70 -0
- package/src/tui/components/common/MaxSizedBox.tsx +354 -0
- package/src/tui/components/common/NewMessagesBadge.tsx +65 -0
- package/src/tui/components/common/ProtectedFileLegend.tsx +89 -0
- package/src/tui/components/common/ScrollIndicator.tsx +160 -0
- package/src/tui/components/common/Spinner.tsx +342 -0
- package/src/tui/components/common/StreamingIndicator.tsx +316 -0
- package/src/tui/components/common/VirtualizedList/VirtualizedList.tsx +428 -0
- package/src/tui/components/common/VirtualizedList/hooks/index.ts +19 -0
- package/src/tui/components/common/VirtualizedList/hooks/useBatchedScroll.ts +64 -0
- package/src/tui/components/common/VirtualizedList/hooks/useScrollAnchor.ts +290 -0
- package/src/tui/components/common/VirtualizedList/hooks/useVirtualization.ts +340 -0
- package/src/tui/components/common/VirtualizedList/index.ts +30 -0
- package/src/tui/components/common/VirtualizedList/types.ts +107 -0
- package/src/tui/components/common/__tests__/NewMessagesBadge.test.tsx +74 -0
- package/src/tui/components/common/__tests__/ScrollIndicator.test.tsx +193 -0
- package/src/tui/components/common/index.ts +110 -0
- package/src/tui/components/index.ts +79 -0
- package/src/tui/components/session/CheckpointPanel.tsx +323 -0
- package/src/tui/components/session/RollbackDialog.tsx +169 -0
- package/src/tui/components/session/SessionItem.tsx +136 -0
- package/src/tui/components/session/SessionListPanel.tsx +252 -0
- package/src/tui/components/session/SessionPicker.tsx +449 -0
- package/src/tui/components/session/SessionPreview.tsx +240 -0
- package/src/tui/components/session/__tests__/session.test.tsx +408 -0
- package/src/tui/components/session/index.ts +28 -0
- package/src/tui/components/session/types.ts +116 -0
- package/src/tui/components/theme/__tests__/tokens.test.ts +471 -0
- package/src/tui/components/theme/index.ts +227 -0
- package/src/tui/components/theme/tokens.ts +484 -0
- package/src/tui/config/defaults.ts +134 -0
- package/src/tui/config/index.ts +17 -0
- package/src/tui/context/AnimationContext.tsx +284 -0
- package/src/tui/context/AppContext.tsx +349 -0
- package/src/tui/context/BracketedPasteContext.tsx +372 -0
- package/src/tui/context/LspContext.tsx +192 -0
- package/src/tui/context/McpContext.tsx +325 -0
- package/src/tui/context/MessagesContext.tsx +870 -0
- package/src/tui/context/OverflowContext.tsx +213 -0
- package/src/tui/context/RateLimitContext.tsx +108 -0
- package/src/tui/context/ResilienceContext.tsx +275 -0
- package/src/tui/context/RootProvider.tsx +136 -0
- package/src/tui/context/ScrollContext.tsx +331 -0
- package/src/tui/context/ToolsContext.tsx +702 -0
- package/src/tui/context/__tests__/BracketedPasteContext.test.tsx +416 -0
- package/src/tui/context/index.ts +140 -0
- package/src/tui/enterprise-integration.ts +282 -0
- package/src/tui/hooks/__tests__/useBacktrack.test.tsx +138 -0
- package/src/tui/hooks/__tests__/useBracketedPaste.test.tsx +222 -0
- package/src/tui/hooks/__tests__/useCopyMode.test.tsx +336 -0
- package/src/tui/hooks/__tests__/useHotkeys.ctrl-input.test.tsx +96 -0
- package/src/tui/hooks/__tests__/useHotkeys.test.tsx +454 -0
- package/src/tui/hooks/__tests__/useInputHistory.test.tsx +660 -0
- package/src/tui/hooks/__tests__/useLineBuffer.test.ts +295 -0
- package/src/tui/hooks/__tests__/useModeController.test.ts +137 -0
- package/src/tui/hooks/__tests__/useModeShortcuts.test.tsx +142 -0
- package/src/tui/hooks/__tests__/useScrollController.test.ts +464 -0
- package/src/tui/hooks/__tests__/useVim.test.tsx +531 -0
- package/src/tui/hooks/index.ts +252 -0
- package/src/tui/hooks/useAgentLoop.ts +712 -0
- package/src/tui/hooks/useAlternateBuffer.ts +398 -0
- package/src/tui/hooks/useAnimatedScrollbar.ts +241 -0
- package/src/tui/hooks/useBacktrack.ts +443 -0
- package/src/tui/hooks/useBracketedPaste.ts +104 -0
- package/src/tui/hooks/useCollapsible.ts +240 -0
- package/src/tui/hooks/useCopyMode.ts +382 -0
- package/src/tui/hooks/useCostSummary.ts +75 -0
- package/src/tui/hooks/useDesktopNotification.ts +414 -0
- package/src/tui/hooks/useDiffMode.ts +44 -0
- package/src/tui/hooks/useFileChangeStats.ts +110 -0
- package/src/tui/hooks/useFileSuggestions.ts +284 -0
- package/src/tui/hooks/useFlickerDetector.ts +250 -0
- package/src/tui/hooks/useGitStatus.ts +200 -0
- package/src/tui/hooks/useHotkeys.ts +579 -0
- package/src/tui/hooks/useImagePaste.ts +114 -0
- package/src/tui/hooks/useInputHighlight.ts +145 -0
- package/src/tui/hooks/useInputHistory.ts +246 -0
- package/src/tui/hooks/useKeyboardScroll.ts +209 -0
- package/src/tui/hooks/useLineBuffer.ts +356 -0
- package/src/tui/hooks/useMentionAutocomplete.ts +235 -0
- package/src/tui/hooks/useModeController.ts +167 -0
- package/src/tui/hooks/useModeShortcuts.ts +196 -0
- package/src/tui/hooks/usePermissionHandler.ts +146 -0
- package/src/tui/hooks/usePersistence.ts +480 -0
- package/src/tui/hooks/usePersistenceShortcuts.ts +225 -0
- package/src/tui/hooks/usePlaceholderRotation.ts +143 -0
- package/src/tui/hooks/useProviderStatus.ts +270 -0
- package/src/tui/hooks/useRateLimitStatus.ts +90 -0
- package/src/tui/hooks/useScreenReader.ts +315 -0
- package/src/tui/hooks/useScrollController.ts +450 -0
- package/src/tui/hooks/useScrollEventBatcher.ts +185 -0
- package/src/tui/hooks/useSidebarPanelData.ts +115 -0
- package/src/tui/hooks/useSmoothScroll.ts +202 -0
- package/src/tui/hooks/useSnapshots.ts +300 -0
- package/src/tui/hooks/useStateAndRef.ts +50 -0
- package/src/tui/hooks/useTerminalSize.ts +206 -0
- package/src/tui/hooks/useToolApprovalController.ts +91 -0
- package/src/tui/hooks/useVim.ts +334 -0
- package/src/tui/hooks/useWorkspace.ts +56 -0
- package/src/tui/i18n/__tests__/init.test.ts +278 -0
- package/src/tui/i18n/__tests__/language-config.test.ts +199 -0
- package/src/tui/i18n/__tests__/locale-detection.test.ts +250 -0
- package/src/tui/i18n/__tests__/settings-integration.test.ts +262 -0
- package/src/tui/i18n/index.ts +72 -0
- package/src/tui/i18n/init.ts +131 -0
- package/src/tui/i18n/language-config.ts +106 -0
- package/src/tui/i18n/locale-detection.ts +173 -0
- package/src/tui/i18n/settings-integration.ts +557 -0
- package/src/tui/i18n/tui-namespace.ts +538 -0
- package/src/tui/i18n/types.ts +312 -0
- package/src/tui/index.ts +43 -0
- package/src/tui/lsp-integration.ts +409 -0
- package/src/tui/metrics-integration.ts +366 -0
- package/src/tui/plugins.ts +383 -0
- package/src/tui/resilience.ts +342 -0
- package/src/tui/sandbox-integration.ts +317 -0
- package/src/tui/services/clipboard.ts +348 -0
- package/src/tui/services/fuzzy-search.ts +441 -0
- package/src/tui/services/index.ts +72 -0
- package/src/tui/services/markdown-renderer.ts +565 -0
- package/src/tui/services/open-external.ts +247 -0
- package/src/tui/services/syntax-highlighter.ts +483 -0
- package/src/tui/slash-commands.ts +12 -0
- package/src/tui/theme/index.ts +15 -0
- package/src/tui/theme/provider.tsx +206 -0
- package/src/tui/tip-integration.ts +300 -0
- package/src/tui/types/__tests__/ink-extended.test.ts +121 -0
- package/src/tui/types/ink-extended.ts +87 -0
- package/src/tui/utils/__tests__/bracketedPaste.test.ts +231 -0
- package/src/tui/utils/__tests__/heightEstimator.test.ts +157 -0
- package/src/tui/utils/__tests__/text-width.test.ts +158 -0
- package/src/tui/utils/__tests__/textSanitizer.test.ts +266 -0
- package/src/tui/utils/__tests__/ui-sizing.test.ts +169 -0
- package/src/tui/utils/bracketedPaste.ts +107 -0
- package/src/tui/utils/cursor-manager.ts +131 -0
- package/src/tui/utils/detectTerminal.ts +596 -0
- package/src/tui/utils/findLastSafeSplitPoint.ts +92 -0
- package/src/tui/utils/heightEstimator.ts +198 -0
- package/src/tui/utils/index.ts +91 -0
- package/src/tui/utils/isNarrowWidth.ts +52 -0
- package/src/tui/utils/stdoutGuard.ts +90 -0
- package/src/tui/utils/synchronized-update.ts +70 -0
- package/src/tui/utils/text-width.ts +225 -0
- package/src/tui/utils/textSanitizer.ts +225 -0
- package/src/tui/utils/textUtils.ts +114 -0
- package/src/tui/utils/ui-sizing.ts +192 -0
- package/src/tui-blessed/app.ts +160 -0
- package/src/tui-blessed/index.ts +2 -0
- package/src/tui-blessed/neo-blessed.d.ts +6 -0
- package/src/tui-blessed/test.ts +21 -0
- package/src/tui-blessed/types.ts +14 -0
- package/src/utils/icons.ts +130 -0
- package/src/utils/index.ts +33 -0
- package/src/utils/resume-hint.ts +86 -0
- package/src/version.ts +1 -0
- package/tsconfig.json +8 -0
- package/vitest.config.ts +35 -0
|
@@ -0,0 +1,462 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tutorial System
|
|
3
|
+
*
|
|
4
|
+
* Main controller for the interactive tutorial experience.
|
|
5
|
+
* Manages lesson progression, step completion, and user guidance.
|
|
6
|
+
*
|
|
7
|
+
* @module cli/onboarding/tutorial/tutorial-system
|
|
8
|
+
*/
|
|
9
|
+
|
|
10
|
+
import {
|
|
11
|
+
ALL_LESSONS,
|
|
12
|
+
checkPrerequisites,
|
|
13
|
+
getLessonById,
|
|
14
|
+
getNextLesson,
|
|
15
|
+
getRecommendedOrder,
|
|
16
|
+
} from "./lessons/index.js";
|
|
17
|
+
import {
|
|
18
|
+
createProgressTracker,
|
|
19
|
+
type ProgressStats,
|
|
20
|
+
type ProgressTracker,
|
|
21
|
+
} from "./progress-tracker.js";
|
|
22
|
+
import type {
|
|
23
|
+
Lesson,
|
|
24
|
+
LessonProgress,
|
|
25
|
+
TutorialEvents,
|
|
26
|
+
TutorialProgress,
|
|
27
|
+
TutorialStep,
|
|
28
|
+
TutorialStorage,
|
|
29
|
+
} from "./types.js";
|
|
30
|
+
|
|
31
|
+
// =============================================================================
|
|
32
|
+
// Tutorial State
|
|
33
|
+
// =============================================================================
|
|
34
|
+
|
|
35
|
+
/**
|
|
36
|
+
* Current tutorial state
|
|
37
|
+
*/
|
|
38
|
+
export interface TutorialState {
|
|
39
|
+
/** Currently active lesson */
|
|
40
|
+
currentLesson: Lesson | null;
|
|
41
|
+
/** Current step in the lesson */
|
|
42
|
+
currentStep: TutorialStep | null;
|
|
43
|
+
/** Current step index (0-based) */
|
|
44
|
+
currentStepIndex: number;
|
|
45
|
+
/** Whether tutorial is in progress */
|
|
46
|
+
isActive: boolean;
|
|
47
|
+
/** Overall progress */
|
|
48
|
+
progress: TutorialProgress;
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
// =============================================================================
|
|
52
|
+
// Tutorial System Class
|
|
53
|
+
// =============================================================================
|
|
54
|
+
|
|
55
|
+
/**
|
|
56
|
+
* Main tutorial system controller
|
|
57
|
+
*/
|
|
58
|
+
export class TutorialSystem {
|
|
59
|
+
public readonly storage: TutorialStorage;
|
|
60
|
+
private progressTracker: ProgressTracker;
|
|
61
|
+
private events: TutorialEvents;
|
|
62
|
+
private lessons: readonly Lesson[];
|
|
63
|
+
|
|
64
|
+
// Current state
|
|
65
|
+
private currentLesson: Lesson | null = null;
|
|
66
|
+
private currentStepIndex: number = 0;
|
|
67
|
+
private isActive: boolean = false;
|
|
68
|
+
private stepStartTime: number = 0;
|
|
69
|
+
|
|
70
|
+
constructor(storage: TutorialStorage, events: TutorialEvents = {}) {
|
|
71
|
+
this.storage = storage;
|
|
72
|
+
this.events = events;
|
|
73
|
+
this.lessons = ALL_LESSONS;
|
|
74
|
+
this.progressTracker = createProgressTracker(storage, this.lessons);
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
// ===========================================================================
|
|
78
|
+
// Initialization
|
|
79
|
+
// ===========================================================================
|
|
80
|
+
|
|
81
|
+
/**
|
|
82
|
+
* Initialize the tutorial system
|
|
83
|
+
*/
|
|
84
|
+
async initialize(): Promise<void> {
|
|
85
|
+
await this.progressTracker.loadProgress();
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
// ===========================================================================
|
|
89
|
+
// Lesson Management
|
|
90
|
+
// ===========================================================================
|
|
91
|
+
|
|
92
|
+
/**
|
|
93
|
+
* Start a specific lesson
|
|
94
|
+
*/
|
|
95
|
+
async start(lessonId: string): Promise<void> {
|
|
96
|
+
const lesson = getLessonById(lessonId);
|
|
97
|
+
if (!lesson) {
|
|
98
|
+
throw new Error(`Lesson not found: ${lessonId}`);
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
// Check prerequisites
|
|
102
|
+
const completedLessons = await this.progressTracker.getCompletedLessonIds();
|
|
103
|
+
if (!checkPrerequisites(lessonId, completedLessons)) {
|
|
104
|
+
const unmet = lesson.prerequisites.filter((p: string) => !completedLessons.includes(p));
|
|
105
|
+
throw new Error(`Prerequisites not met: ${unmet.join(", ")}`);
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
// Start the lesson
|
|
109
|
+
await this.progressTracker.startLesson(lessonId);
|
|
110
|
+
|
|
111
|
+
this.currentLesson = lesson;
|
|
112
|
+
this.currentStepIndex = 0;
|
|
113
|
+
this.isActive = true;
|
|
114
|
+
this.stepStartTime = Date.now();
|
|
115
|
+
|
|
116
|
+
// Fire event
|
|
117
|
+
this.events.onLessonStart?.(lesson);
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
/**
|
|
121
|
+
* Resume an in-progress lesson
|
|
122
|
+
*/
|
|
123
|
+
async resume(lessonId: string): Promise<void> {
|
|
124
|
+
const lesson = getLessonById(lessonId);
|
|
125
|
+
if (!lesson) {
|
|
126
|
+
throw new Error(`Lesson not found: ${lessonId}`);
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
const lessonProgress = await this.progressTracker.getLessonProgress(lessonId);
|
|
130
|
+
if (!lessonProgress?.started) {
|
|
131
|
+
// Not started yet, just start it
|
|
132
|
+
return this.start(lessonId);
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
this.currentLesson = lesson;
|
|
136
|
+
this.currentStepIndex = lessonProgress.currentStepIndex;
|
|
137
|
+
this.isActive = true;
|
|
138
|
+
this.stepStartTime = Date.now();
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
/**
|
|
142
|
+
* Stop the current lesson
|
|
143
|
+
*/
|
|
144
|
+
stop(): void {
|
|
145
|
+
this.currentLesson = null;
|
|
146
|
+
this.currentStepIndex = 0;
|
|
147
|
+
this.isActive = false;
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
/**
|
|
151
|
+
* Start the next recommended lesson
|
|
152
|
+
*/
|
|
153
|
+
async startNext(): Promise<boolean> {
|
|
154
|
+
const completedLessons = await this.progressTracker.getCompletedLessonIds();
|
|
155
|
+
const nextLesson = getNextLesson(completedLessons);
|
|
156
|
+
|
|
157
|
+
if (nextLesson) {
|
|
158
|
+
await this.start(nextLesson.id);
|
|
159
|
+
return true;
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
return false;
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
// ===========================================================================
|
|
166
|
+
// Step Management
|
|
167
|
+
// ===========================================================================
|
|
168
|
+
|
|
169
|
+
/**
|
|
170
|
+
* Get the current step
|
|
171
|
+
*/
|
|
172
|
+
currentStep(): TutorialStep | null {
|
|
173
|
+
if (!this.currentLesson || !this.isActive) {
|
|
174
|
+
return null;
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
return this.currentLesson.steps[this.currentStepIndex] ?? null;
|
|
178
|
+
}
|
|
179
|
+
|
|
180
|
+
/**
|
|
181
|
+
* Get the next step (without advancing)
|
|
182
|
+
*/
|
|
183
|
+
nextStep(): TutorialStep | null {
|
|
184
|
+
if (!this.currentLesson || !this.isActive) {
|
|
185
|
+
return null;
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
const nextIndex = this.currentStepIndex + 1;
|
|
189
|
+
return this.currentLesson.steps[nextIndex] ?? null;
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
/**
|
|
193
|
+
* Get the previous step (without going back)
|
|
194
|
+
*/
|
|
195
|
+
previousStep(): TutorialStep | null {
|
|
196
|
+
if (!this.currentLesson || !this.isActive || this.currentStepIndex === 0) {
|
|
197
|
+
return null;
|
|
198
|
+
}
|
|
199
|
+
|
|
200
|
+
return this.currentLesson.steps[this.currentStepIndex - 1] ?? null;
|
|
201
|
+
}
|
|
202
|
+
|
|
203
|
+
/**
|
|
204
|
+
* Complete the current step and advance
|
|
205
|
+
*/
|
|
206
|
+
async completeStep(stepId: string): Promise<TutorialStep | null> {
|
|
207
|
+
if (!this.currentLesson || !this.isActive) {
|
|
208
|
+
return null;
|
|
209
|
+
}
|
|
210
|
+
|
|
211
|
+
const step = this.currentStep();
|
|
212
|
+
if (!step || step.id !== stepId) {
|
|
213
|
+
throw new Error(`Step mismatch: expected ${step?.id}, got ${stepId}`);
|
|
214
|
+
}
|
|
215
|
+
|
|
216
|
+
// Calculate time spent
|
|
217
|
+
const timeSpent = Math.round((Date.now() - this.stepStartTime) / 1000);
|
|
218
|
+
|
|
219
|
+
// Mark step complete
|
|
220
|
+
await this.progressTracker.completeStep(this.currentLesson.id, stepId, timeSpent);
|
|
221
|
+
|
|
222
|
+
// Fire event
|
|
223
|
+
this.events.onStepComplete?.(step, this.currentLesson);
|
|
224
|
+
|
|
225
|
+
// Advance to next step
|
|
226
|
+
this.currentStepIndex++;
|
|
227
|
+
this.stepStartTime = Date.now();
|
|
228
|
+
|
|
229
|
+
// Check if lesson is complete
|
|
230
|
+
if (this.currentStepIndex >= this.currentLesson.steps.length) {
|
|
231
|
+
await this.completeLessonInternal();
|
|
232
|
+
return null;
|
|
233
|
+
}
|
|
234
|
+
|
|
235
|
+
return this.currentStep();
|
|
236
|
+
}
|
|
237
|
+
|
|
238
|
+
/**
|
|
239
|
+
* Skip the current step
|
|
240
|
+
*/
|
|
241
|
+
async skipStep(): Promise<TutorialStep | null> {
|
|
242
|
+
if (!this.currentLesson || !this.isActive) {
|
|
243
|
+
return null;
|
|
244
|
+
}
|
|
245
|
+
|
|
246
|
+
// Advance without marking complete
|
|
247
|
+
this.currentStepIndex++;
|
|
248
|
+
this.stepStartTime = Date.now();
|
|
249
|
+
|
|
250
|
+
// Check if lesson is complete
|
|
251
|
+
if (this.currentStepIndex >= this.currentLesson.steps.length) {
|
|
252
|
+
await this.completeLessonInternal();
|
|
253
|
+
return null;
|
|
254
|
+
}
|
|
255
|
+
|
|
256
|
+
return this.currentStep();
|
|
257
|
+
}
|
|
258
|
+
|
|
259
|
+
/**
|
|
260
|
+
* Go back to previous step
|
|
261
|
+
*/
|
|
262
|
+
goBack(): TutorialStep | null {
|
|
263
|
+
if (!this.currentLesson || !this.isActive || this.currentStepIndex === 0) {
|
|
264
|
+
return null;
|
|
265
|
+
}
|
|
266
|
+
|
|
267
|
+
this.currentStepIndex--;
|
|
268
|
+
this.stepStartTime = Date.now();
|
|
269
|
+
|
|
270
|
+
return this.currentStep();
|
|
271
|
+
}
|
|
272
|
+
|
|
273
|
+
/**
|
|
274
|
+
* Jump to a specific step
|
|
275
|
+
*/
|
|
276
|
+
jumpToStep(stepIndex: number): TutorialStep | null {
|
|
277
|
+
if (!this.currentLesson || !this.isActive) {
|
|
278
|
+
return null;
|
|
279
|
+
}
|
|
280
|
+
|
|
281
|
+
if (stepIndex < 0 || stepIndex >= this.currentLesson.steps.length) {
|
|
282
|
+
throw new Error(`Invalid step index: ${stepIndex}`);
|
|
283
|
+
}
|
|
284
|
+
|
|
285
|
+
this.currentStepIndex = stepIndex;
|
|
286
|
+
this.stepStartTime = Date.now();
|
|
287
|
+
|
|
288
|
+
return this.currentStep();
|
|
289
|
+
}
|
|
290
|
+
|
|
291
|
+
// ===========================================================================
|
|
292
|
+
// Progress
|
|
293
|
+
// ===========================================================================
|
|
294
|
+
|
|
295
|
+
/**
|
|
296
|
+
* Get overall progress
|
|
297
|
+
*/
|
|
298
|
+
async getProgress(): Promise<TutorialProgress> {
|
|
299
|
+
return this.progressTracker.getProgress();
|
|
300
|
+
}
|
|
301
|
+
|
|
302
|
+
/**
|
|
303
|
+
* Get progress statistics
|
|
304
|
+
*/
|
|
305
|
+
async getStats(): Promise<ProgressStats> {
|
|
306
|
+
return this.progressTracker.getStats();
|
|
307
|
+
}
|
|
308
|
+
|
|
309
|
+
/**
|
|
310
|
+
* Get current lesson progress
|
|
311
|
+
*/
|
|
312
|
+
async getCurrentLessonProgress(): Promise<LessonProgress | undefined> {
|
|
313
|
+
if (!this.currentLesson) {
|
|
314
|
+
return undefined;
|
|
315
|
+
}
|
|
316
|
+
return this.progressTracker.getLessonProgress(this.currentLesson.id);
|
|
317
|
+
}
|
|
318
|
+
|
|
319
|
+
/**
|
|
320
|
+
* Check if all tutorials are complete
|
|
321
|
+
*/
|
|
322
|
+
async isComplete(): Promise<boolean> {
|
|
323
|
+
return this.progressTracker.isAllComplete();
|
|
324
|
+
}
|
|
325
|
+
|
|
326
|
+
// ===========================================================================
|
|
327
|
+
// Lesson Listing
|
|
328
|
+
// ===========================================================================
|
|
329
|
+
|
|
330
|
+
/**
|
|
331
|
+
* List all available lessons
|
|
332
|
+
*/
|
|
333
|
+
listLessons(): Lesson[] {
|
|
334
|
+
return [...this.lessons];
|
|
335
|
+
}
|
|
336
|
+
|
|
337
|
+
/**
|
|
338
|
+
* Get lessons in recommended order
|
|
339
|
+
*/
|
|
340
|
+
getRecommendedLessons(): Lesson[] {
|
|
341
|
+
return getRecommendedOrder();
|
|
342
|
+
}
|
|
343
|
+
|
|
344
|
+
/**
|
|
345
|
+
* Get available lessons (prerequisites met)
|
|
346
|
+
*/
|
|
347
|
+
async getAvailableLessons(): Promise<Lesson[]> {
|
|
348
|
+
const completedLessons = await this.progressTracker.getCompletedLessonIds();
|
|
349
|
+
return this.lessons.filter(
|
|
350
|
+
(lesson) =>
|
|
351
|
+
!completedLessons.includes(lesson.id) && checkPrerequisites(lesson.id, completedLessons)
|
|
352
|
+
);
|
|
353
|
+
}
|
|
354
|
+
|
|
355
|
+
/**
|
|
356
|
+
* Get completed lessons
|
|
357
|
+
*/
|
|
358
|
+
async getCompletedLessons(): Promise<Lesson[]> {
|
|
359
|
+
const completedIds = await this.progressTracker.getCompletedLessonIds();
|
|
360
|
+
return this.lessons.filter((lesson) => completedIds.includes(lesson.id));
|
|
361
|
+
}
|
|
362
|
+
|
|
363
|
+
// ===========================================================================
|
|
364
|
+
// State
|
|
365
|
+
// ===========================================================================
|
|
366
|
+
|
|
367
|
+
/**
|
|
368
|
+
* Get current tutorial state
|
|
369
|
+
*/
|
|
370
|
+
async getState(): Promise<TutorialState> {
|
|
371
|
+
const progress = await this.progressTracker.getProgress();
|
|
372
|
+
|
|
373
|
+
return {
|
|
374
|
+
currentLesson: this.currentLesson,
|
|
375
|
+
currentStep: this.currentStep(),
|
|
376
|
+
currentStepIndex: this.currentStepIndex,
|
|
377
|
+
isActive: this.isActive,
|
|
378
|
+
progress,
|
|
379
|
+
};
|
|
380
|
+
}
|
|
381
|
+
|
|
382
|
+
/**
|
|
383
|
+
* Check if a lesson is in progress
|
|
384
|
+
*/
|
|
385
|
+
isLessonActive(): boolean {
|
|
386
|
+
return this.isActive && this.currentLesson !== null;
|
|
387
|
+
}
|
|
388
|
+
|
|
389
|
+
/**
|
|
390
|
+
* Get current lesson
|
|
391
|
+
*/
|
|
392
|
+
getCurrentLesson(): Lesson | null {
|
|
393
|
+
return this.currentLesson;
|
|
394
|
+
}
|
|
395
|
+
|
|
396
|
+
// ===========================================================================
|
|
397
|
+
// Reset
|
|
398
|
+
// ===========================================================================
|
|
399
|
+
|
|
400
|
+
/**
|
|
401
|
+
* Reset all progress
|
|
402
|
+
*/
|
|
403
|
+
async resetAll(): Promise<void> {
|
|
404
|
+
await this.progressTracker.resetAll();
|
|
405
|
+
this.stop();
|
|
406
|
+
}
|
|
407
|
+
|
|
408
|
+
/**
|
|
409
|
+
* Reset a single lesson
|
|
410
|
+
*/
|
|
411
|
+
async resetLesson(lessonId: string): Promise<void> {
|
|
412
|
+
await this.progressTracker.resetLesson(lessonId);
|
|
413
|
+
|
|
414
|
+
if (this.currentLesson?.id === lessonId) {
|
|
415
|
+
this.stop();
|
|
416
|
+
}
|
|
417
|
+
}
|
|
418
|
+
|
|
419
|
+
// ===========================================================================
|
|
420
|
+
// Private Methods
|
|
421
|
+
// ===========================================================================
|
|
422
|
+
|
|
423
|
+
/**
|
|
424
|
+
* Internal method to complete current lesson
|
|
425
|
+
*/
|
|
426
|
+
private async completeLessonInternal(): Promise<void> {
|
|
427
|
+
if (!this.currentLesson) return;
|
|
428
|
+
|
|
429
|
+
const lesson = this.currentLesson;
|
|
430
|
+
await this.progressTracker.completeLesson(lesson.id);
|
|
431
|
+
|
|
432
|
+
// Get updated progress
|
|
433
|
+
const lessonProgress = await this.progressTracker.getLessonProgress(lesson.id);
|
|
434
|
+
|
|
435
|
+
// Fire events - lessonProgress will be defined since we just completed the lesson
|
|
436
|
+
if (lessonProgress) {
|
|
437
|
+
this.events.onLessonComplete?.(lesson, lessonProgress);
|
|
438
|
+
}
|
|
439
|
+
|
|
440
|
+
// Check if all tutorials complete
|
|
441
|
+
if (await this.isComplete()) {
|
|
442
|
+
const progress = await this.getProgress();
|
|
443
|
+
this.events.onTutorialComplete?.(progress);
|
|
444
|
+
}
|
|
445
|
+
|
|
446
|
+
this.stop();
|
|
447
|
+
}
|
|
448
|
+
}
|
|
449
|
+
|
|
450
|
+
// =============================================================================
|
|
451
|
+
// Factory
|
|
452
|
+
// =============================================================================
|
|
453
|
+
|
|
454
|
+
/**
|
|
455
|
+
* Create a tutorial system instance
|
|
456
|
+
*/
|
|
457
|
+
export function createTutorialSystem(
|
|
458
|
+
storage: TutorialStorage,
|
|
459
|
+
events: TutorialEvents = {}
|
|
460
|
+
): TutorialSystem {
|
|
461
|
+
return new TutorialSystem(storage, events);
|
|
462
|
+
}
|