ummaya 0.2.4 → 0.2.5
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 +15 -2
- package/bin/ummaya +10 -1
- package/npm-shrinkwrap.json +253 -2
- package/package.json +5 -1
- package/prompts/manifest.yaml +1 -1
- package/prompts/system_v1.md +1 -0
- package/pyproject.toml +26 -2
- package/specs/2803-document-production-hardening/contracts/document-tools.schema.json +1043 -0
- package/src/ummaya/_canonical/__init__.py +2 -0
- package/src/ummaya/engine/engine.py +29 -132
- package/src/ummaya/evidence/__init__.py +21 -2
- package/src/ummaya/evidence/dataset_contract.py +193 -0
- package/src/ummaya/evidence/document_authoring_cases.py +33 -0
- package/src/ummaya/evidence/document_harness.py +313 -0
- package/src/ummaya/evidence/document_viewer_ux.py +391 -0
- package/src/ummaya/evidence/gates.py +70 -0
- package/src/ummaya/evidence/json_types.py +20 -0
- package/src/ummaya/evidence/models.py +88 -1
- package/src/ummaya/evidence/output_payload.py +89 -0
- package/src/ummaya/evidence/payload_documents.py +233 -0
- package/src/ummaya/evidence/route_contracts.py +224 -0
- package/src/ummaya/evidence/route_helpers.py +150 -0
- package/src/ummaya/evidence/runner.py +81 -212
- package/src/ummaya/evidence/source_provenance.py +246 -0
- package/src/ummaya/evidence/source_provenance_redaction.py +176 -0
- package/src/ummaya/evidence/tool_layer.py +39 -0
- package/src/ummaya/evidence/tool_layer_models.py +151 -0
- package/src/ummaya/ipc/adapter_manifest_emitter.py +26 -10
- package/src/ummaya/ipc/document_intent_normalization.py +185 -0
- package/src/ummaya/ipc/frame_schema.py +5 -5
- package/src/ummaya/ipc/route_diagnostics.py +73 -0
- package/src/ummaya/ipc/stdio.py +1109 -477
- package/src/ummaya/llm/client.py +102 -3
- package/src/ummaya/llm/config.py +8 -3
- package/src/ummaya/primitives/__init__.py +6 -2
- package/src/ummaya/primitives/delegation.py +1 -1
- package/src/ummaya/primitives/document.py +28 -0
- package/src/ummaya/settings.py +0 -3
- package/src/ummaya/tools/discovery_bridge.py +17 -1
- package/src/ummaya/tools/documents/__init__.py +297 -0
- package/src/ummaya/tools/documents/adapter_registry.py +487 -0
- package/src/ummaya/tools/documents/archive_container_probe.py +167 -0
- package/src/ummaya/tools/documents/artifact_store.py +454 -0
- package/src/ummaya/tools/documents/authoring.py +283 -0
- package/src/ummaya/tools/documents/baselines.py +114 -0
- package/src/ummaya/tools/documents/capability.py +331 -0
- package/src/ummaya/tools/documents/contracts.py +112 -0
- package/src/ummaya/tools/documents/conversion.py +521 -0
- package/src/ummaya/tools/documents/diff.py +275 -0
- package/src/ummaya/tools/documents/engines.py +163 -0
- package/src/ummaya/tools/documents/evaluation.py +291 -0
- package/src/ummaya/tools/documents/explicit_values.py +108 -0
- package/src/ummaya/tools/documents/fixtures.py +174 -0
- package/src/ummaya/tools/documents/format_completion_audit.py +471 -0
- package/src/ummaya/tools/documents/formats/__init__.py +2 -0
- package/src/ummaya/tools/documents/formats/archive.py +528 -0
- package/src/ummaya/tools/documents/formats/base.py +41 -0
- package/src/ummaya/tools/documents/formats/code_file.py +211 -0
- package/src/ummaya/tools/documents/formats/data_file.py +272 -0
- package/src/ummaya/tools/documents/formats/hwp.py +284 -0
- package/src/ummaya/tools/documents/formats/hwpx.py +1837 -0
- package/src/ummaya/tools/documents/formats/odf.py +435 -0
- package/src/ummaya/tools/documents/formats/ooxml.py +1030 -0
- package/src/ummaya/tools/documents/formats/passive.py +766 -0
- package/src/ummaya/tools/documents/formats/pdf.py +702 -0
- package/src/ummaya/tools/documents/formats/text_web.py +268 -0
- package/src/ummaya/tools/documents/hwp_conversion_probe.py +178 -0
- package/src/ummaya/tools/documents/hwp_direct_candidate.py +141 -0
- package/src/ummaya/tools/documents/inspection.py +289 -0
- package/src/ummaya/tools/documents/intake.py +1079 -0
- package/src/ummaya/tools/documents/legacy_office_promotion_probe.py +366 -0
- package/src/ummaya/tools/documents/models.py +1598 -0
- package/src/ummaya/tools/documents/odf_promotion_probe.py +167 -0
- package/src/ummaya/tools/documents/orchestrator.py +96 -0
- package/src/ummaya/tools/documents/passive_capability_probe.py +251 -0
- package/src/ummaya/tools/documents/patch.py +170 -0
- package/src/ummaya/tools/documents/pdfa_conformance.py +284 -0
- package/src/ummaya/tools/documents/pdfa_promotion_probe.py +198 -0
- package/src/ummaya/tools/documents/permissions.py +110 -0
- package/src/ummaya/tools/documents/planner.py +616 -0
- package/src/ummaya/tools/documents/registry.py +2733 -0
- package/src/ummaya/tools/documents/render.py +978 -0
- package/src/ummaya/tools/documents/render_comparison.py +113 -0
- package/src/ummaya/tools/documents/render_comparison_models.py +74 -0
- package/src/ummaya/tools/documents/render_comparison_regions.py +73 -0
- package/src/ummaya/tools/documents/render_comparison_style.py +161 -0
- package/src/ummaya/tools/documents/reread.py +157 -0
- package/src/ummaya/tools/documents/runtime_authoring.py +244 -0
- package/src/ummaya/tools/documents/runtime_authoring_bundle.py +76 -0
- package/src/ummaya/tools/documents/scorecard.py +184 -0
- package/src/ummaya/tools/documents/socratic_planner.py +193 -0
- package/src/ummaya/tools/documents/style.py +48 -0
- package/src/ummaya/tools/documents/tool_defs.py +523 -0
- package/src/ummaya/tools/documents/validate.py +347 -0
- package/src/ummaya/tools/executor.py +29 -0
- package/src/ummaya/tools/live_proxy.py +0 -3
- package/src/ummaya/tools/models.py +5 -1
- package/src/ummaya/tools/register_all.py +8 -0
- package/src/ummaya/tools/registry.py +10 -1
- package/src/ummaya/tools/routing/__init__.py +59 -0
- package/src/ummaya/tools/routing/builder.py +105 -0
- package/src/ummaya/tools/routing/cards.py +29 -0
- package/src/ummaya/tools/routing/decision_service.py +534 -0
- package/src/ummaya/tools/routing/decision_types.py +74 -0
- package/src/ummaya/tools/routing/feasibility.py +122 -0
- package/src/ummaya/tools/routing/intent.py +17 -0
- package/src/ummaya/tools/routing/intent_extractor.py +207 -0
- package/src/ummaya/tools/routing/intent_patterns.py +160 -0
- package/src/ummaya/tools/routing/intent_public_data.py +150 -0
- package/src/ummaya/tools/routing/intent_types.py +48 -0
- package/src/ummaya/tools/routing/lint.py +78 -0
- package/src/ummaya/tools/routing/metadata.py +174 -0
- package/src/ummaya/tools/routing/projection.py +340 -0
- package/src/ummaya/tools/routing/retrieval_policy.py +629 -0
- package/src/ummaya/tools/routing/schema.py +81 -0
- package/src/ummaya/tools/routing/types.py +96 -0
- package/src/ummaya/tools/routing_index.py +2 -2
- package/src/ummaya/tools/search.py +34 -746
- package/tests/fixtures/documents/public_forms/baselines.yaml +113 -0
- package/tui/package.json +1 -1
- package/tui/src/.cc-byte-identical-whitelist.yaml +266 -0
- package/tui/src/QueryEngine.ts +12 -8
- package/tui/src/bridge/inboundAttachments.ts +3 -3
- package/tui/src/cli/handlers/auth.ts +3 -12
- package/tui/src/cli/print.ts +7 -7
- package/tui/src/commands/insights.ts +1 -1
- package/tui/src/commands/install-github-app/types.ts +8 -30
- package/tui/src/commands/plugin/types.ts +6 -28
- package/tui/src/commands/plugin/unifiedTypes.ts +4 -26
- package/tui/src/commands/rename/generateSessionName.ts +1 -1
- package/tui/src/components/Feedback.tsx +1 -1
- package/tui/src/components/LogoV2/EmergencyTip.tsx +11 -2
- package/tui/src/components/LogoV2/WelcomeV2.tsx +1 -3
- package/tui/src/components/ScrollKeybindingHandler.tsx +6 -6
- package/tui/src/components/Spinner/types.ts +6 -28
- package/tui/src/components/agents/generateAgent.ts +1 -1
- package/tui/src/components/agents/new-agent-creation/types.ts +4 -26
- package/tui/src/components/config/EnvSecretIsolatedEditor.tsx +1 -1
- package/tui/src/components/mcp/types.ts +16 -38
- package/tui/src/components/messages/AssistantToolUseMessage.tsx +3 -2
- package/tui/src/components/messages/UserCrossSessionMessage.ts +16 -4
- package/tui/src/components/messages/UserForkBoilerplateMessage.ts +16 -4
- package/tui/src/components/messages/UserGitHubWebhookMessage.ts +16 -4
- package/tui/src/components/messages/UserToolResultMessage/utils.tsx +3 -2
- package/tui/src/components/permissions/MonitorPermissionRequest/MonitorPermissionRequest.ts +9 -4
- package/tui/src/components/permissions/ReviewArtifactPermissionRequest/ReviewArtifactPermissionRequest.ts +9 -4
- package/tui/src/components/primitive/DocumentSocraticReviewBlock.tsx +129 -0
- package/tui/src/components/primitive/DocumentToolResultCard.tsx +224 -0
- package/tui/src/components/primitive/documentSocraticReview.ts +215 -0
- package/tui/src/components/primitive/index.tsx +43 -1
- package/tui/src/components/primitive/types.ts +137 -0
- package/tui/src/components/ui/option.ts +4 -26
- package/tui/src/constants/common.ts +0 -2
- package/tui/src/constants/prompts.ts +4 -3
- package/tui/src/constants/querySource.ts +4 -26
- package/tui/src/entrypoints/sdk/controlTypes.ts +26 -48
- package/tui/src/entrypoints/sdk/coreTypes.generated.ts +3 -25
- package/tui/src/entrypoints/sdk/runtimeTypes.ts +38 -60
- package/tui/src/entrypoints/sdk/sdkUtilityTypes.ts +4 -26
- package/tui/src/entrypoints/sdk/settingsTypes.generated.ts +3 -25
- package/tui/src/entrypoints/sdk/toolTypes.ts +3 -25
- package/tui/src/hooks/toolPermission/handlers/interactiveHandler.ts +10 -0
- package/tui/src/hooks/useApiKeyVerification.ts +1 -1
- package/tui/src/hooks/useVirtualScroll.ts +1 -1
- package/tui/src/ink/ink.tsx +33 -14
- package/tui/src/ink/reconciler.ts +2 -3
- package/tui/src/ink/render-to-screen.ts +30 -10
- package/tui/src/ipc/bridge.ts +62 -15
- package/tui/src/ipc/bridgeSingleton.ts +5 -1
- package/tui/src/ipc/codec.ts +3 -3
- package/tui/src/ipc/frames.generated.ts +12 -12
- package/tui/src/ipc/llmClient.ts +151 -27
- package/tui/src/ipc/schema/frame.schema.json +1 -1
- package/tui/src/keybindings/defaultBindings.ts +4 -0
- package/tui/src/main.tsx +29 -11
- package/tui/src/native-ts/file-index/index.ts +33 -3
- package/tui/src/observability/surface.ts +2 -2
- package/tui/src/probes/toolRegistryProbe.tsx +3 -1
- package/tui/src/projectOnboardingState.ts +7 -6
- package/tui/src/query/chatMessageTypes.ts +18 -0
- package/tui/src/query/chatMessagesBuilder.ts +1 -1
- package/tui/src/query/deps.ts +1 -1
- package/tui/src/query/messageGuards.ts +106 -0
- package/tui/src/query/publicDataTerminalRepair.ts +384 -0
- package/tui/src/query/run.ts +1075 -0
- package/tui/src/query/supportBoundary.ts +168 -0
- package/tui/src/query/toolResultErrors.ts +103 -0
- package/tui/src/query/toolRunner.ts +687 -0
- package/tui/src/query/unavailableToolRepair.ts +118 -0
- package/tui/src/query.ts +9 -2186
- package/tui/src/screens/REPL.tsx +40 -29
- package/tui/src/services/api/adapterManifest.ts +4 -0
- package/tui/src/services/api/backendChat/events.ts +117 -0
- package/tui/src/services/api/backendChat/finalMessage.ts +40 -0
- package/tui/src/services/api/backendChat/frame.ts +9 -0
- package/tui/src/services/api/backendChat/streaming.ts +430 -0
- package/tui/src/services/api/backendChat/types.ts +62 -0
- package/tui/src/services/api/backendChat.ts +1 -0
- package/tui/src/services/api/client.ts +65 -2
- package/tui/src/services/api/errorUtils.ts +5 -5
- package/tui/src/services/api/errors.ts +1 -1
- package/tui/src/services/api/logging.ts +1 -1
- package/tui/src/services/api/ummaya/evidence.ts +194 -0
- package/tui/src/services/api/ummaya/messages.ts +255 -0
- package/tui/src/services/api/ummaya/nonStreaming.ts +66 -0
- package/tui/src/services/api/ummaya/provider.ts +200 -0
- package/tui/src/services/api/ummaya/reasoning.ts +24 -0
- package/tui/src/services/api/ummaya/request.ts +200 -0
- package/tui/src/services/api/ummaya/selectionContext.ts +240 -0
- package/tui/src/services/api/ummaya/streaming.ts +365 -0
- package/tui/src/services/api/ummaya/streamingPayload.ts +129 -0
- package/tui/src/services/api/ummaya/streamingReader.ts +40 -0
- package/tui/src/services/api/ummaya/toolSelection.ts +217 -0
- package/tui/src/services/api/ummaya/types.ts +110 -0
- package/tui/src/services/api/ummaya/usage.ts +30 -0
- package/tui/src/services/api/ummaya.ts +26 -418
- package/tui/src/services/api/withRetry.ts +1 -1
- package/tui/src/services/awaySummary.ts +2 -2
- package/tui/src/services/claudeAiLimits.ts +1 -1
- package/tui/src/services/compact/autoCompact.ts +1 -1
- package/tui/src/services/compact/compact.ts +1 -1
- package/tui/src/services/lsp/types.ts +8 -30
- package/tui/src/services/tips/types.ts +6 -28
- package/tui/src/services/tokenEstimation.ts +1 -1
- package/tui/src/services/toolRegistry/bootGuard.ts +5 -5
- package/tui/src/services/toolUseSummary/toolUseSummaryGenerator.ts +1 -1
- package/tui/src/services/tools/toolExecution.ts +94 -1
- package/tui/src/store/pendingPermissionSlot.ts +1 -1
- package/tui/src/store/session-store.ts +10 -36
- package/tui/src/stubs/any-stub.ts +15 -10
- package/tui/src/stubs/color-diff-napi.ts +37 -23
- package/tui/src/stubs/globals.d.ts +3 -3
- package/tui/src/stubs/macro-preload.ts +23 -12
- package/tui/src/tools/AdapterTool/AdapterTool.ts +1207 -714
- package/tui/src/tools/AdapterTool/routeDiagnostics.ts +75 -0
- package/tui/src/tools/AgentTool/AgentTool.tsx +84 -1371
- package/tui/src/tools/AgentTool/agentToolHandoff.ts +114 -0
- package/tui/src/tools/AgentTool/agentToolPartialResult.ts +16 -0
- package/tui/src/tools/AgentTool/agentToolProgress.ts +32 -0
- package/tui/src/tools/AgentTool/agentToolResolver.ts +161 -0
- package/tui/src/tools/AgentTool/agentToolResult.ts +163 -0
- package/tui/src/tools/AgentTool/agentToolUtils.ts +14 -686
- package/tui/src/tools/AgentTool/asyncAgentLifecycle.ts +208 -0
- package/tui/src/tools/AgentTool/asyncLifecycle.ts +153 -0
- package/tui/src/tools/AgentTool/backgroundedCompletion.ts +126 -0
- package/tui/src/tools/AgentTool/backgroundedLifecycle.ts +174 -0
- package/tui/src/tools/AgentTool/foregroundBackground.ts +83 -0
- package/tui/src/tools/AgentTool/foregroundDrain.tsx +133 -0
- package/tui/src/tools/AgentTool/foregroundFinalize.ts +98 -0
- package/tui/src/tools/AgentTool/foregroundLifecycle.tsx +237 -0
- package/tui/src/tools/AgentTool/foregroundProgress.tsx +169 -0
- package/tui/src/tools/AgentTool/foregroundTask.ts +89 -0
- package/tui/src/tools/AgentTool/forkSubagent.ts +1 -12
- package/tui/src/tools/AgentTool/forkSubagentGate.ts +34 -0
- package/tui/src/tools/AgentTool/launchRouting.ts +203 -0
- package/tui/src/tools/AgentTool/lifecycle.ts +244 -0
- package/tui/src/tools/AgentTool/mcpRouting.ts +73 -0
- package/tui/src/tools/AgentTool/orchestrationSupport.ts +70 -0
- package/tui/src/tools/AgentTool/permissions.ts +39 -0
- package/tui/src/tools/AgentTool/promptSetup.ts +181 -0
- package/tui/src/tools/AgentTool/remoteRouting.ts +62 -0
- package/tui/src/tools/AgentTool/resultMapping.ts +116 -0
- package/tui/src/tools/AgentTool/resumeAgent.ts +39 -107
- package/tui/src/tools/AgentTool/resumeAgentHelpers.ts +140 -0
- package/tui/src/tools/AgentTool/runAgent.ts +1 -1
- package/tui/src/tools/AgentTool/runtimeConfig.ts +57 -0
- package/tui/src/tools/AgentTool/schemas.ts +196 -0
- package/tui/src/tools/AgentTool/sourceVerificationPropagation.ts +263 -0
- package/tui/src/tools/AgentTool/worktreeLifecycle.ts +105 -0
- package/tui/src/tools/AskUserQuestionTool/AskUserQuestionTool.tsx +174 -202
- package/tui/src/tools/BashTool/BashTool.tsx +71 -1072
- package/tui/src/tools/BashTool/bashCommandHelpers.ts +12 -12
- package/tui/src/tools/BashTool/bashPermissions/astPreflight.ts +173 -0
- package/tui/src/tools/BashTool/bashPermissions/classifierChecks.ts +199 -0
- package/tui/src/tools/BashTool/bashPermissions/compoundGuards.ts +53 -0
- package/tui/src/tools/BashTool/bashPermissions/constants.ts +99 -0
- package/tui/src/tools/BashTool/bashPermissions/index.ts +38 -0
- package/tui/src/tools/BashTool/bashPermissions/legacyMisparsing.ts +62 -0
- package/tui/src/tools/BashTool/bashPermissions/main.ts +135 -0
- package/tui/src/tools/BashTool/bashPermissions/normalizedCommands.ts +33 -0
- package/tui/src/tools/BashTool/bashPermissions/operatorFlow.ts +98 -0
- package/tui/src/tools/BashTool/bashPermissions/permissionChecks.ts +200 -0
- package/tui/src/tools/BashTool/bashPermissions/prefixSuggestions.ts +88 -0
- package/tui/src/tools/BashTool/bashPermissions/promptClassifierRules.ts +125 -0
- package/tui/src/tools/BashTool/bashPermissions/ruleDelegates.ts +19 -0
- package/tui/src/tools/BashTool/bashPermissions/ruleMatching.ts +145 -0
- package/tui/src/tools/BashTool/bashPermissions/sandboxAutoAllow.ts +75 -0
- package/tui/src/tools/BashTool/bashPermissions/subcommandFlow.ts +205 -0
- package/tui/src/tools/BashTool/bashPermissions/subcommandGuards.ts +73 -0
- package/tui/src/tools/BashTool/bashPermissions/subcommandResultHelpers.ts +116 -0
- package/tui/src/tools/BashTool/bashPermissions/types.ts +26 -0
- package/tui/src/tools/BashTool/bashPermissions/wrapperStripping.ts +139 -0
- package/tui/src/tools/BashTool/bashPermissions.ts +26 -2621
- package/tui/src/tools/BashTool/call.ts +202 -0
- package/tui/src/tools/BashTool/callLoader.ts +35 -0
- package/tui/src/tools/BashTool/commandClassification.ts +151 -0
- package/tui/src/tools/BashTool/commandClassificationLoader.ts +40 -0
- package/tui/src/tools/BashTool/cwdReset.ts +33 -0
- package/tui/src/tools/BashTool/lineTruncation.ts +11 -0
- package/tui/src/tools/BashTool/modeValidation.ts +13 -1
- package/tui/src/tools/BashTool/outputPersistence.ts +42 -0
- package/tui/src/tools/BashTool/permissionClassification.ts +66 -0
- package/tui/src/tools/BashTool/permissionLoader.ts +44 -0
- package/tui/src/tools/BashTool/resultLoader.ts +29 -0
- package/tui/src/tools/BashTool/resultMapping.ts +83 -0
- package/tui/src/tools/BashTool/sandboxPolicy.ts +79 -0
- package/tui/src/tools/BashTool/schemas.ts +65 -0
- package/tui/src/tools/BashTool/sedEditExecution.ts +59 -0
- package/tui/src/tools/BashTool/shellExecution.tsx +245 -0
- package/tui/src/tools/BashTool/shellOutputUtils.ts +85 -0
- package/tui/src/tools/BashTool/shellPermissionGauntlet.ts +97 -0
- package/tui/src/tools/BashTool/uiLoader.ts +37 -0
- package/tui/src/tools/BriefTool/upload.ts +1 -1
- package/tui/src/tools/CalculatorTool/parser.ts +2 -2
- package/tui/src/tools/DocumentPrimitive/DocumentPrimitive.ts +262 -0
- package/tui/src/tools/DocumentPrimitive/dispatchNormalization.ts +270 -0
- package/tui/src/tools/DocumentPrimitive/documentDestinationPath.ts +18 -0
- package/tui/src/tools/DocumentPrimitive/documentMutationGuard.ts +22 -0
- package/tui/src/tools/DocumentPrimitive/documentPatchNormalization.ts +248 -0
- package/tui/src/tools/DocumentPrimitive/documentSourceVerification.ts +245 -0
- package/tui/src/tools/DocumentPrimitive/documentSourceVerificationFields.ts +103 -0
- package/tui/src/tools/DocumentPrimitive/modelVisibleOutput.ts +40 -0
- package/tui/src/tools/DocumentPrimitive/prompt.ts +35 -0
- package/tui/src/tools/FileEditTool/FileEditTool.ts +9 -507
- package/tui/src/tools/FileEditTool/call.ts +228 -0
- package/tui/src/tools/FileEditTool/validateInput.ts +196 -0
- package/tui/src/tools/FileReadTool/imageProcessor.ts +13 -0
- package/tui/src/tools/FileWriteTool/FileWriteTool.ts +7 -300
- package/tui/src/tools/FileWriteTool/call.ts +223 -0
- package/tui/src/tools/FileWriteTool/validateInput.ts +80 -0
- package/tui/src/tools/ListMcpResourcesTool/ListMcpResourcesTool.ts +19 -3
- package/tui/src/tools/LookupPrimitive/LookupPrimitive.ts +25 -32
- package/tui/src/tools/LookupPrimitive/prompt.ts +0 -2
- package/tui/src/tools/MCPTool/trustPolicy.ts +118 -0
- package/tui/src/tools/McpAuthTool/McpAuthTool.ts +21 -3
- package/tui/src/tools/NotebookEditTool/NotebookEditTool.ts +7 -326
- package/tui/src/tools/NotebookEditTool/call.ts +254 -0
- package/tui/src/tools/NotebookEditTool/notebookModel.ts +51 -0
- package/tui/src/tools/NotebookEditTool/validateInput.ts +142 -0
- package/tui/src/tools/PowerShellTool/PowerShellTool.tsx +46 -937
- package/tui/src/tools/PowerShellTool/acceptEditsCommandValidation.ts +162 -0
- package/tui/src/tools/PowerShellTool/call.ts +179 -0
- package/tui/src/tools/PowerShellTool/callLoader.ts +37 -0
- package/tui/src/tools/PowerShellTool/commandClassification.ts +86 -0
- package/tui/src/tools/PowerShellTool/modeValidation.ts +25 -332
- package/tui/src/tools/PowerShellTool/outputPersistence.ts +42 -0
- package/tui/src/tools/PowerShellTool/permissionClassification.ts +28 -0
- package/tui/src/tools/PowerShellTool/resultLoader.ts +31 -0
- package/tui/src/tools/PowerShellTool/resultMapping.ts +75 -0
- package/tui/src/tools/PowerShellTool/schemas.ts +40 -0
- package/tui/src/tools/PowerShellTool/shellExecution.tsx +258 -0
- package/tui/src/tools/PowerShellTool/symlinkModeValidation.ts +44 -0
- package/tui/src/tools/PowerShellTool/uiLoader.ts +37 -0
- package/tui/src/tools/PowerShellTool/validation.ts +39 -0
- package/tui/src/tools/ReadMcpResourceTool/ReadMcpResourceTool.ts +19 -3
- package/tui/src/tools/ResolveLocationPrimitive/ResolveLocationPrimitive.ts +1 -11
- package/tui/src/tools/ResolveLocationPrimitive/prompt.ts +2 -6
- package/tui/src/tools/SkillTool/SkillTool.ts +2 -2
- package/tui/src/tools/SubmitPrimitive/SubmitPrimitive.ts +27 -10
- package/tui/src/tools/TaskCreateTool/TaskCreateTool.ts +16 -2
- package/tui/src/tools/TaskGetTool/TaskGetTool.ts +23 -3
- package/tui/src/tools/TaskListTool/TaskListTool.ts +22 -4
- package/tui/src/tools/TaskOutputTool/TaskOutputTool.tsx +46 -547
- package/tui/src/tools/TaskOutputTool/lookup.ts +216 -0
- package/tui/src/tools/TaskOutputTool/render.tsx +257 -0
- package/tui/src/tools/TaskOutputTool/schemas.ts +55 -0
- package/tui/src/tools/TaskOutputTool/serialization.ts +36 -0
- package/tui/src/tools/TaskStopTool/TaskStopTool.ts +10 -0
- package/tui/src/tools/TaskUpdateTool/TaskUpdateTool.ts +14 -364
- package/tui/src/tools/TaskUpdateTool/completion.ts +62 -0
- package/tui/src/tools/TaskUpdateTool/schemas.ts +62 -0
- package/tui/src/tools/TaskUpdateTool/serialization.ts +46 -0
- package/tui/src/tools/TaskUpdateTool/statusUpdate.ts +247 -0
- package/tui/src/tools/TodoWriteTool/TodoWriteTool.ts +21 -2
- package/tui/src/tools/ToolSearchTool/ToolSearchTool.ts +21 -302
- package/tui/src/tools/ToolSearchTool/ccSupportTools.ts +223 -0
- package/tui/src/tools/ToolSearchTool/descriptionCache.ts +50 -0
- package/tui/src/tools/ToolSearchTool/keywordSearch.ts +216 -0
- package/tui/src/tools/ToolSearchTool/prompt.ts +10 -4
- package/tui/src/tools/ToolSearchTool/resultMapping.ts +30 -0
- package/tui/src/tools/ToolSearchTool/schemas.ts +30 -0
- package/tui/src/tools/ToolSearchTool/searchPool.ts +47 -0
- package/tui/src/tools/ToolSearchTool/supportIntentHints.ts +140 -0
- package/tui/src/tools/TranslateTool/TranslateTool.ts +1 -1
- package/tui/src/tools/VerifyPrimitive/VerifyPrimitive.ts +2 -1
- package/tui/src/tools/WebFetchTool/WebFetchTool.ts +43 -138
- package/tui/src/tools/WebFetchTool/call.ts +227 -0
- package/tui/src/tools/WebFetchTool/resolvedAddressSafety.ts +78 -0
- package/tui/src/tools/WebFetchTool/sourceVerification.ts +204 -0
- package/tui/src/tools/WebFetchTool/types.ts +23 -0
- package/tui/src/tools/WebFetchTool/urlSafety.ts +181 -0
- package/tui/src/tools/WebFetchTool/utils.ts +1 -1
- package/tui/src/tools/WebSearchTool/UI.tsx +0 -1
- package/tui/src/tools/WebSearchTool/WebSearchTool.ts +9 -313
- package/tui/src/tools/WebSearchTool/call.ts +33 -0
- package/tui/src/tools/WebSearchTool/responseMapping.ts +190 -0
- package/tui/src/tools/WebSearchTool/resultBlock.ts +47 -0
- package/tui/src/tools/WebSearchTool/schemas.ts +47 -0
- package/tui/src/tools/WebSearchTool/toolSchema.ts +12 -0
- package/tui/src/tools/WorkspaceToolAdapter/WorkspaceToolAdapter.ts +79 -0
- package/tui/src/tools/WorkspaceToolAdapter/allowedRootPolicy.ts +85 -0
- package/tui/src/tools/WorkspaceToolAdapter/documentFormatGuards.ts +73 -0
- package/tui/src/tools/WorkspaceToolAdapter/inputNormalization.ts +105 -0
- package/tui/src/tools/WorkspaceToolAdapter/mcpExposurePolicy.ts +64 -0
- package/tui/src/tools/WorkspaceToolAdapter/toolDefFactory.ts +215 -0
- package/tui/src/tools/WorkspaceToolAdapter/toolNames.ts +6 -0
- package/tui/src/tools/WorkspaceToolAdapter/workspacePolicy.ts +15 -0
- package/tui/src/tools/_shared/dispatchPrimitive.ts +6 -6
- package/tui/src/tools/_shared/documentChangeToPatch.ts +125 -0
- package/tui/src/tools/_shared/documentDispatchArguments.ts +87 -0
- package/tui/src/tools/_shared/documentPrimitiveTimeout.ts +13 -0
- package/tui/src/tools/_shared/documentToolResultRender.ts +98 -0
- package/tui/src/tools/_shared/pendingCallRegistry.ts +1 -6
- package/tui/src/tools/_shared/rootPrimitiveInput.ts +1 -0
- package/tui/src/tools/_shared/toolChoiceRepair/documentCompletionPatterns.ts +58 -0
- package/tui/src/tools/_shared/toolChoiceRepair/documentCompletionPrompt.ts +271 -0
- package/tui/src/tools/_shared/toolChoiceRepair/documentRepair.ts +452 -0
- package/tui/src/tools/_shared/toolChoiceRepair/messageAccess.ts +80 -0
- package/tui/src/tools/_shared/toolChoiceRepair/publicDataRepair.ts +92 -0
- package/tui/src/tools/_shared/toolChoiceRepair/supportRepair.ts +135 -0
- package/tui/src/tools/_shared/toolChoiceRepair.ts +55 -860
- package/tui/src/tools/shared/mockDisclaimer.ts +1 -1
- package/tui/src/tools.ts +39 -190
- package/tui/src/types/fileSuggestion.ts +4 -26
- package/tui/src/types/generated/events_mono/claude_code/v1/claude_code_internal_event.ts +186 -148
- package/tui/src/types/generated/events_mono/common/v1/auth.ts +25 -11
- package/tui/src/types/generated/events_mono/growthbook/v1/growthbook_experiment_event.ts +47 -30
- package/tui/src/types/generated/google/protobuf/timestamp.ts +21 -7
- package/tui/src/types/message.ts +80 -102
- package/tui/src/types/messageQueueTypes.ts +6 -28
- package/tui/src/types/notebook.ts +16 -38
- package/tui/src/types/statusLine.ts +4 -26
- package/tui/src/types/tools.ts +24 -46
- package/tui/src/types/utils.ts +6 -28
- package/tui/src/upstreamproxy/relay.ts +7 -3
- package/tui/src/upstreamproxy/upstreamproxy.ts +1 -1
- package/tui/src/utils/assistantMessageFactories.ts +9 -3
- package/tui/src/utils/auth.ts +129 -139
- package/tui/src/utils/bash/ast.ts +23 -23
- package/tui/src/utils/bash/bashParser.ts +5 -5
- package/tui/src/utils/billing.ts +1 -1
- package/tui/src/utils/collapseReadSearch.ts +3 -3
- package/tui/src/utils/cronTasks.ts +1 -1
- package/tui/src/utils/execFileNoThrow.ts +1 -1
- package/tui/src/utils/filePersistence/types.ts +16 -38
- package/tui/src/utils/forkedAgent.ts +1 -1
- package/tui/src/utils/gracefulShutdown.ts +4 -4
- package/tui/src/utils/heapDumpService.ts +12 -8
- package/tui/src/utils/hooks/apiQueryHookHelper.ts +1 -1
- package/tui/src/utils/hooks/execPromptHook.ts +1 -1
- package/tui/src/utils/hooks/skillImprovement.ts +1 -1
- package/tui/src/utils/mcp/dateTimeParser.ts +1 -1
- package/tui/src/utils/messages.ts +18 -0
- package/tui/src/utils/migrateSessions.ts +3 -3
- package/tui/src/utils/model/model.ts +6 -6
- package/tui/src/utils/permissions/yoloClassifier.ts +1 -1
- package/tui/src/utils/plugins/headlessPluginInstall.ts +1 -1
- package/tui/src/utils/plugins/mcpPluginIntegration.ts +1 -1
- package/tui/src/utils/plugins/mcpbHandler.ts +1 -1
- package/tui/src/utils/plugins/pluginLoader.ts +8 -8
- package/tui/src/utils/protectedNamespace.ts +5 -3
- package/tui/src/utils/rawJsonToolCall.ts +242 -0
- package/tui/src/utils/ripgrep.ts +16 -7
- package/tui/src/utils/sessionTitle.ts +1 -1
- package/tui/src/utils/settings/permissionValidation.ts +14 -2
- package/tui/src/utils/shell/prefix.ts +1 -1
- package/tui/src/utils/sideQuery.ts +1 -1
- package/tui/src/utils/systemThemeWatcher.ts +13 -3
- package/tui/src/utils/teleport.tsx +1 -1
- package/uv.lock +400 -14
- package/tui/src/services/api/claude.ts +0 -3540
- package/tui/src/tools/_shared/directPublicDataGuard.ts +0 -362
- package/tui/src/tools/_shared/kmaAnalysisGuard.ts +0 -197
- package/tui/src/tools/_shared/kmaAviationGuard.ts +0 -70
- package/tui/src/tools/_shared/nmcAedGuard.ts +0 -234
- package/tui/src/tools/_shared/protectedCheckGuard.ts +0 -207
- package/tui/src/tools/_shared/textToolCallGuard.ts +0 -91
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
import { lookup } from 'node:dns/promises'
|
|
2
|
+
import { isIP } from 'node:net'
|
|
3
|
+
import {
|
|
4
|
+
validatePublicWebFetchUrl,
|
|
5
|
+
type WebFetchUrlSafetyResult,
|
|
6
|
+
} from './urlSafety.js'
|
|
7
|
+
|
|
8
|
+
type ResolvedAddress = {
|
|
9
|
+
readonly address: string
|
|
10
|
+
readonly family: 4 | 6
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
type LookupHost = (hostname: string) => Promise<readonly ResolvedAddress[]>
|
|
14
|
+
|
|
15
|
+
const lookupHost: LookupHost = async hostname => {
|
|
16
|
+
const addresses = await lookup(hostname, { all: true, verbatim: true })
|
|
17
|
+
return addresses.flatMap(({ address, family }) =>
|
|
18
|
+
family === 4 || family === 6 ? [{ address, family }] : [],
|
|
19
|
+
)
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
export async function validateResolvedPublicWebFetchUrl(
|
|
23
|
+
value: string,
|
|
24
|
+
resolveHost: LookupHost = lookupHost,
|
|
25
|
+
): Promise<WebFetchUrlSafetyResult> {
|
|
26
|
+
const validation = validatePublicWebFetchUrl(value)
|
|
27
|
+
if (!validation.ok || isIP(validation.hostname) !== 0) {
|
|
28
|
+
return validation
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
let addresses: readonly ResolvedAddress[]
|
|
32
|
+
try {
|
|
33
|
+
addresses = await resolveHost(validation.hostname)
|
|
34
|
+
} catch (error) {
|
|
35
|
+
if (error instanceof Error) {
|
|
36
|
+
return unsafeResolvedUrl(
|
|
37
|
+
`WebFetch could not resolve ${validation.hostname} to a public address.`,
|
|
38
|
+
)
|
|
39
|
+
}
|
|
40
|
+
return unsafeResolvedUrl(
|
|
41
|
+
`WebFetch could not safely classify ${validation.hostname}.`,
|
|
42
|
+
)
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
if (addresses.length === 0) {
|
|
46
|
+
return unsafeResolvedUrl(
|
|
47
|
+
`WebFetch could not safely classify ${validation.hostname}.`,
|
|
48
|
+
)
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
for (const resolved of addresses) {
|
|
52
|
+
const resolvedValidation = validatePublicWebFetchUrl(
|
|
53
|
+
addressUrlForSafetyCheck(resolved),
|
|
54
|
+
)
|
|
55
|
+
if (!resolvedValidation.ok) {
|
|
56
|
+
return unsafeResolvedUrl(
|
|
57
|
+
`WebFetch cannot access ${validation.hostname} because it resolved to a private, loopback, metadata, or link-local address (${resolved.address}).`,
|
|
58
|
+
)
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
return validation
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
function addressUrlForSafetyCheck({
|
|
66
|
+
address,
|
|
67
|
+
family,
|
|
68
|
+
}: ResolvedAddress): string {
|
|
69
|
+
return family === 6 ? `http://[${address}]/` : `http://${address}/`
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
function unsafeResolvedUrl(message: string): WebFetchUrlSafetyResult {
|
|
73
|
+
return {
|
|
74
|
+
ok: false,
|
|
75
|
+
reason: 'unsafe_url',
|
|
76
|
+
message,
|
|
77
|
+
}
|
|
78
|
+
}
|
|
@@ -0,0 +1,204 @@
|
|
|
1
|
+
import { z } from 'zod/v4'
|
|
2
|
+
import { validatePublicWebFetchUrl } from './urlSafety.js'
|
|
3
|
+
|
|
4
|
+
export const SOURCE_VERIFICATION_POLICY =
|
|
5
|
+
'source_results_untrusted_until_user_approval' as const
|
|
6
|
+
|
|
7
|
+
export const sourceVerificationEvidenceSchema = z.object({
|
|
8
|
+
toolId: z.string(),
|
|
9
|
+
sourceUrl: z.string().nullable(),
|
|
10
|
+
title: z.string().nullable(),
|
|
11
|
+
observedAt: z.string(),
|
|
12
|
+
citationHandle: z.string(),
|
|
13
|
+
blockedOrUsed: z.enum(['blocked', 'needs_input']),
|
|
14
|
+
trust: z.literal('untrusted_source'),
|
|
15
|
+
promptInjection: z.enum(['detected', 'not_detected']),
|
|
16
|
+
redacted: z.boolean(),
|
|
17
|
+
})
|
|
18
|
+
|
|
19
|
+
export const sourceVerificationSchema = z.object({
|
|
20
|
+
mutationAllowed: z.literal(false),
|
|
21
|
+
userApprovalRequired: z.literal(true),
|
|
22
|
+
secretEgress: z.literal(false),
|
|
23
|
+
policy: z.literal(SOURCE_VERIFICATION_POLICY).default(SOURCE_VERIFICATION_POLICY),
|
|
24
|
+
evidence: z.array(sourceVerificationEvidenceSchema),
|
|
25
|
+
})
|
|
26
|
+
|
|
27
|
+
export type SourceVerificationEvidence = z.infer<
|
|
28
|
+
typeof sourceVerificationEvidenceSchema
|
|
29
|
+
>
|
|
30
|
+
export type SourceVerification = z.infer<typeof sourceVerificationSchema>
|
|
31
|
+
|
|
32
|
+
const SECRET_TEXT_PATTERNS: readonly RegExp[] = [
|
|
33
|
+
/Authorization\s*:\s*[^\n\r]+/gi,
|
|
34
|
+
/Bearer\s+[A-Za-z0-9._~+/=-]+/gi,
|
|
35
|
+
/Cookie\s*:\s*[^\n\r]+/gi,
|
|
36
|
+
/\b[A-Z0-9_]*(?:API|AUTH|ACCESS|REFRESH|SESSION)[_-]?KEY\s*=\s*[^\s&]+/gi,
|
|
37
|
+
/\b(?:session|access|refresh|id)[_-]?token\s*=\s*[^\s&]+/gi,
|
|
38
|
+
/\bsk-[A-Za-z0-9_-]{8,}\b/g,
|
|
39
|
+
]
|
|
40
|
+
|
|
41
|
+
const SECRET_QUERY_KEYS = new Set([
|
|
42
|
+
'access_token',
|
|
43
|
+
'api_key',
|
|
44
|
+
'apikey',
|
|
45
|
+
'auth',
|
|
46
|
+
'authorization',
|
|
47
|
+
'cookie',
|
|
48
|
+
'id_token',
|
|
49
|
+
'key',
|
|
50
|
+
'refresh_token',
|
|
51
|
+
'servicekey',
|
|
52
|
+
'session',
|
|
53
|
+
'session_token',
|
|
54
|
+
'token',
|
|
55
|
+
])
|
|
56
|
+
|
|
57
|
+
const PROMPT_INJECTION_PATTERNS: readonly RegExp[] = [
|
|
58
|
+
/ignore\s+(?:all\s+)?previous\s+instructions/i,
|
|
59
|
+
/change\s+(?:the\s+)?permission\s+policy/i,
|
|
60
|
+
/bypass\s+(?:permissions?|approval|policy)/i,
|
|
61
|
+
/system\s+prompt/i,
|
|
62
|
+
/treat\s+this\s+as\s+(?:a\s+)?system\s+instruction/i,
|
|
63
|
+
]
|
|
64
|
+
|
|
65
|
+
function stableHandlePart(value: string): string {
|
|
66
|
+
const lowered = value.toLowerCase().replace(/[^a-z0-9]+/g, '-')
|
|
67
|
+
const trimmed = lowered.replace(/^-+|-+$/g, '')
|
|
68
|
+
return trimmed.length > 0 ? trimmed.slice(0, 48) : 'source'
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
function hasRedactionCandidate(value: string): boolean {
|
|
72
|
+
return SECRET_TEXT_PATTERNS.some(pattern => {
|
|
73
|
+
pattern.lastIndex = 0
|
|
74
|
+
return pattern.test(value)
|
|
75
|
+
})
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
export function redactSourceVerificationText(value: string): string {
|
|
79
|
+
const redacted = SECRET_TEXT_PATTERNS.reduce(
|
|
80
|
+
(current, pattern) => current.replace(pattern, '[REDACTED]'),
|
|
81
|
+
value,
|
|
82
|
+
)
|
|
83
|
+
return redacted
|
|
84
|
+
.replaceAll('<source_verification>', '[source_verification]')
|
|
85
|
+
.replaceAll('</source_verification>', '[/source_verification]')
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
export function redactSourceVerificationUrl(value: string | null): string | null {
|
|
89
|
+
if (value === null) return null
|
|
90
|
+
const validation = validatePublicWebFetchUrl(value)
|
|
91
|
+
if (!validation.ok) return null
|
|
92
|
+
const { parsedUrl } = validation
|
|
93
|
+
for (const key of [...parsedUrl.searchParams.keys()]) {
|
|
94
|
+
if (SECRET_QUERY_KEYS.has(key.toLowerCase())) {
|
|
95
|
+
parsedUrl.searchParams.set(key, '[REDACTED]')
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
return redactSourceVerificationText(parsedUrl.toString())
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
export function detectPromptInjection(value: string): 'detected' | 'not_detected' {
|
|
102
|
+
return PROMPT_INJECTION_PATTERNS.some(pattern => pattern.test(value))
|
|
103
|
+
? 'detected'
|
|
104
|
+
: 'not_detected'
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
export function buildSourceEvidence({
|
|
108
|
+
toolId,
|
|
109
|
+
sourceUrl,
|
|
110
|
+
title,
|
|
111
|
+
observedAt = new Date().toISOString(),
|
|
112
|
+
blockedOrUsed,
|
|
113
|
+
rawText,
|
|
114
|
+
}: {
|
|
115
|
+
toolId: string
|
|
116
|
+
sourceUrl: string | null
|
|
117
|
+
title: string | null
|
|
118
|
+
observedAt?: string
|
|
119
|
+
blockedOrUsed: SourceVerificationEvidence['blockedOrUsed']
|
|
120
|
+
rawText: string
|
|
121
|
+
}): SourceVerificationEvidence {
|
|
122
|
+
const redactedUrl = redactSourceVerificationUrl(sourceUrl)
|
|
123
|
+
const redactedTitle = title === null ? null : redactSourceVerificationText(title)
|
|
124
|
+
const combined = `${rawText}\n${redactedTitle ?? ''}\n${redactedUrl ?? ''}`
|
|
125
|
+
return {
|
|
126
|
+
toolId,
|
|
127
|
+
sourceUrl: redactedUrl,
|
|
128
|
+
title: redactedTitle,
|
|
129
|
+
observedAt,
|
|
130
|
+
citationHandle: `src-${stableHandlePart(toolId)}-${stableHandlePart(
|
|
131
|
+
redactedUrl ?? redactedTitle ?? rawText,
|
|
132
|
+
)}`,
|
|
133
|
+
blockedOrUsed,
|
|
134
|
+
trust: 'untrusted_source',
|
|
135
|
+
promptInjection: detectPromptInjection(combined),
|
|
136
|
+
redacted:
|
|
137
|
+
hasRedactionCandidate(rawText) ||
|
|
138
|
+
(sourceUrl !== null && redactSourceVerificationUrl(sourceUrl) !== sourceUrl) ||
|
|
139
|
+
(title !== null && redactSourceVerificationText(title) !== title),
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
export function buildSourceVerification(
|
|
144
|
+
evidence: readonly SourceVerificationEvidence[],
|
|
145
|
+
): SourceVerification {
|
|
146
|
+
return {
|
|
147
|
+
mutationAllowed: false,
|
|
148
|
+
userApprovalRequired: true,
|
|
149
|
+
secretEgress: false,
|
|
150
|
+
policy: SOURCE_VERIFICATION_POLICY,
|
|
151
|
+
evidence: [...evidence],
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
export function formatSourceVerificationForModel(
|
|
156
|
+
sourceVerification: SourceVerification | undefined,
|
|
157
|
+
): string {
|
|
158
|
+
if (sourceVerification === undefined) return ''
|
|
159
|
+
const parsed = sourceVerificationSchema.safeParse(sourceVerification)
|
|
160
|
+
if (!parsed.success) return ''
|
|
161
|
+
|
|
162
|
+
const lines = [
|
|
163
|
+
'<source_verification>',
|
|
164
|
+
`policy: ${parsed.data.policy}`,
|
|
165
|
+
`document_mutation_allowed: ${parsed.data.mutationAllowed}`,
|
|
166
|
+
`user_approval_required: ${parsed.data.userApprovalRequired}`,
|
|
167
|
+
`permission_policy_mutation_allowed: false`,
|
|
168
|
+
`no_secret_egress: ${!parsed.data.secretEgress}`,
|
|
169
|
+
`no_fabricated_fact: true`,
|
|
170
|
+
]
|
|
171
|
+
|
|
172
|
+
for (const evidence of parsed.data.evidence) {
|
|
173
|
+
const safeSourceUrl = redactSourceVerificationUrl(evidence.sourceUrl)
|
|
174
|
+
const safeTitle =
|
|
175
|
+
evidence.title === null ? null : redactSourceVerificationText(evidence.title)
|
|
176
|
+
lines.push(
|
|
177
|
+
`tool_id: ${redactSourceVerificationText(evidence.toolId)}`,
|
|
178
|
+
`source_url: ${safeSourceUrl ?? 'none'}`,
|
|
179
|
+
`title: ${safeTitle ?? 'none'}`,
|
|
180
|
+
`timestamp: ${evidence.observedAt}`,
|
|
181
|
+
`citation_handle: ${redactSourceVerificationText(evidence.citationHandle)}`,
|
|
182
|
+
`blocked_or_used: ${evidence.blockedOrUsed}`,
|
|
183
|
+
`trust: ${evidence.trust}`,
|
|
184
|
+
`prompt_injection: ${evidence.promptInjection}`,
|
|
185
|
+
`redacted: ${evidence.redacted}`,
|
|
186
|
+
)
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
lines.push('</source_verification>')
|
|
190
|
+
return lines.join('\n')
|
|
191
|
+
}
|
|
192
|
+
|
|
193
|
+
export function formatSourceVerifiedToolResult({
|
|
194
|
+
result,
|
|
195
|
+
sourceVerification,
|
|
196
|
+
}: {
|
|
197
|
+
result: string
|
|
198
|
+
sourceVerification?: SourceVerification
|
|
199
|
+
}): string {
|
|
200
|
+
const safeResult = redactSourceVerificationText(result)
|
|
201
|
+
const verification = formatSourceVerificationForModel(sourceVerification)
|
|
202
|
+
if (!verification) return safeResult
|
|
203
|
+
return `${safeResult}\n\n${verification}`
|
|
204
|
+
}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import type { SourceVerification } from './sourceVerification.js'
|
|
2
|
+
|
|
3
|
+
export type WebFetchOutput = {
|
|
4
|
+
readonly bytes: number
|
|
5
|
+
readonly code: number
|
|
6
|
+
readonly codeText: string
|
|
7
|
+
readonly result: string
|
|
8
|
+
readonly durationMs: number
|
|
9
|
+
readonly url: string
|
|
10
|
+
readonly sourceVerification?: SourceVerification
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
export type WebFetchCallInput = {
|
|
14
|
+
readonly url: string
|
|
15
|
+
readonly prompt: string
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
export type WebFetchCallContext = {
|
|
19
|
+
readonly abortController: AbortController
|
|
20
|
+
readonly options: {
|
|
21
|
+
readonly isNonInteractiveSession: boolean
|
|
22
|
+
}
|
|
23
|
+
}
|
|
@@ -0,0 +1,181 @@
|
|
|
1
|
+
import { isIP } from 'node:net'
|
|
2
|
+
|
|
3
|
+
const MAX_WEB_FETCH_URL_LENGTH = 2000
|
|
4
|
+
|
|
5
|
+
const INTERNAL_HOSTNAMES = new Set([
|
|
6
|
+
'localhost',
|
|
7
|
+
'localhost.localdomain',
|
|
8
|
+
'ip6-localhost',
|
|
9
|
+
'ip6-loopback',
|
|
10
|
+
'metadata',
|
|
11
|
+
'metadata.google.internal',
|
|
12
|
+
])
|
|
13
|
+
|
|
14
|
+
const INTERNAL_HOSTNAME_SUFFIXES = [
|
|
15
|
+
'.localhost',
|
|
16
|
+
'.local',
|
|
17
|
+
'.internal',
|
|
18
|
+
'.intranet',
|
|
19
|
+
'.lan',
|
|
20
|
+
'.home',
|
|
21
|
+
'.corp',
|
|
22
|
+
] as const
|
|
23
|
+
|
|
24
|
+
export type WebFetchUrlSafetyResult =
|
|
25
|
+
| {
|
|
26
|
+
readonly ok: true
|
|
27
|
+
readonly parsedUrl: URL
|
|
28
|
+
readonly hostname: string
|
|
29
|
+
}
|
|
30
|
+
| {
|
|
31
|
+
readonly ok: false
|
|
32
|
+
readonly reason: 'invalid_url' | 'unsafe_url'
|
|
33
|
+
readonly message: string
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
export function validatePublicWebFetchUrl(
|
|
37
|
+
value: string,
|
|
38
|
+
): WebFetchUrlSafetyResult {
|
|
39
|
+
if (value.length > MAX_WEB_FETCH_URL_LENGTH) {
|
|
40
|
+
return unsafeUrl('URL exceeds the WebFetch length limit.')
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
let parsedUrl: URL
|
|
44
|
+
try {
|
|
45
|
+
parsedUrl = new URL(value)
|
|
46
|
+
} catch (error) {
|
|
47
|
+
if (error instanceof TypeError) {
|
|
48
|
+
return {
|
|
49
|
+
ok: false,
|
|
50
|
+
reason: 'invalid_url',
|
|
51
|
+
message: `Invalid URL "${value}". The URL provided could not be parsed.`,
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
throw error
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') {
|
|
58
|
+
return unsafeUrl('WebFetch only allows public http or https URLs.')
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
if (parsedUrl.username || parsedUrl.password) {
|
|
62
|
+
return unsafeUrl('WebFetch URLs must not contain credentials.')
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
const hostname = normalizeHostname(parsedUrl.hostname)
|
|
66
|
+
if (hostname.length === 0) {
|
|
67
|
+
return unsafeUrl('WebFetch URL host is empty.')
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
if (isIpAddress(hostname)) {
|
|
71
|
+
return isNonPublicIpAddress(hostname)
|
|
72
|
+
? unsafeUrl('WebFetch cannot access private, loopback, metadata, or link-local IP ranges.')
|
|
73
|
+
: { ok: true, parsedUrl, hostname }
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
if (isInternalHostname(hostname)) {
|
|
77
|
+
return unsafeUrl('WebFetch cannot access private, loopback, metadata, or link-local hostnames.')
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
return { ok: true, parsedUrl, hostname }
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
export function isPublicWebFetchUrl(value: string): boolean {
|
|
84
|
+
return validatePublicWebFetchUrl(value).ok
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
function unsafeUrl(message: string): WebFetchUrlSafetyResult {
|
|
88
|
+
return {
|
|
89
|
+
ok: false,
|
|
90
|
+
reason: 'unsafe_url',
|
|
91
|
+
message,
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
function normalizeHostname(hostname: string): string {
|
|
96
|
+
const lower = hostname.toLowerCase()
|
|
97
|
+
const withoutBrackets =
|
|
98
|
+
lower.startsWith('[') && lower.endsWith(']')
|
|
99
|
+
? lower.slice(1, lower.length - 1)
|
|
100
|
+
: lower
|
|
101
|
+
return withoutBrackets.replace(/\.$/u, '')
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
function isIpAddress(hostname: string): boolean {
|
|
105
|
+
return isIP(hostname) !== 0
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
function isNonPublicIpAddress(hostname: string): boolean {
|
|
109
|
+
switch (isIP(hostname)) {
|
|
110
|
+
case 4:
|
|
111
|
+
return isNonPublicIpv4(hostname)
|
|
112
|
+
case 6:
|
|
113
|
+
return isNonPublicIpv6(hostname)
|
|
114
|
+
default:
|
|
115
|
+
return true
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
function isNonPublicIpv4(hostname: string): boolean {
|
|
120
|
+
const octets = hostname.split('.').map(value => Number(value))
|
|
121
|
+
const [first, second] = octets
|
|
122
|
+
if (
|
|
123
|
+
octets.length !== 4 ||
|
|
124
|
+
first === undefined ||
|
|
125
|
+
second === undefined ||
|
|
126
|
+
octets.some(octet => !Number.isInteger(octet) || octet < 0 || octet > 255)
|
|
127
|
+
) {
|
|
128
|
+
return true
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
return (
|
|
132
|
+
first === 0 ||
|
|
133
|
+
first === 10 ||
|
|
134
|
+
first === 127 ||
|
|
135
|
+
first >= 224 ||
|
|
136
|
+
(first === 100 && second >= 64 && second <= 127) ||
|
|
137
|
+
(first === 169 && second === 254) ||
|
|
138
|
+
(first === 172 && second >= 16 && second <= 31) ||
|
|
139
|
+
(first === 192 && second === 168) ||
|
|
140
|
+
(first === 198 && (second === 18 || second === 19))
|
|
141
|
+
)
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
function isNonPublicIpv6(hostname: string): boolean {
|
|
145
|
+
const lower = hostname.toLowerCase()
|
|
146
|
+
if (
|
|
147
|
+
lower === '::' ||
|
|
148
|
+
lower === '::1' ||
|
|
149
|
+
lower.startsWith('::ffff:') ||
|
|
150
|
+
lower.startsWith('2001:db8:')
|
|
151
|
+
) {
|
|
152
|
+
return true
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
const firstSegment = lower.split(':').find(segment => segment.length > 0)
|
|
156
|
+
if (firstSegment === undefined) {
|
|
157
|
+
return true
|
|
158
|
+
}
|
|
159
|
+
const firstHextet = Number.parseInt(firstSegment, 16)
|
|
160
|
+
if (!Number.isInteger(firstHextet)) {
|
|
161
|
+
return true
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
return (
|
|
165
|
+
(firstHextet & 0xfe00) === 0xfc00 ||
|
|
166
|
+
(firstHextet & 0xffc0) === 0xfe80 ||
|
|
167
|
+
(firstHextet & 0xff00) === 0xff00
|
|
168
|
+
)
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
function isInternalHostname(hostname: string): boolean {
|
|
172
|
+
if (INTERNAL_HOSTNAMES.has(hostname)) {
|
|
173
|
+
return true
|
|
174
|
+
}
|
|
175
|
+
|
|
176
|
+
if (!hostname.includes('.')) {
|
|
177
|
+
return true
|
|
178
|
+
}
|
|
179
|
+
|
|
180
|
+
return INTERNAL_HOSTNAME_SUFFIXES.some(suffix => hostname.endsWith(suffix))
|
|
181
|
+
}
|
|
@@ -4,7 +4,7 @@ import {
|
|
|
4
4
|
type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
|
|
5
5
|
logEvent,
|
|
6
6
|
} from '../../services/analytics/index.js'
|
|
7
|
-
import { queryHaiku } from '../../services/api/
|
|
7
|
+
import { queryHaiku } from '../../services/api/ummaya.js'
|
|
8
8
|
import { AbortError } from '../../utils/errors.js'
|
|
9
9
|
import { getWebFetchUserAgent } from '../../utils/http.js'
|
|
10
10
|
import { logError } from '../../utils/log.js'
|
|
@@ -98,4 +98,3 @@ export function getToolUseSummary(input: Partial<{
|
|
|
98
98
|
}
|
|
99
99
|
return truncate(input.query, TOOL_SUMMARY_MAX_LENGTH);
|
|
100
100
|
}
|
|
101
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["React","MessageResponse","TOOL_SUMMARY_MAX_LENGTH","Box","Text","ProgressMessage","truncate","Output","SearchResult","WebSearchProgress","getSearchSummary","results","searchCount","totalResultCount","result","content","length","renderToolUseMessage","query","allowed_domains","blocked_domains","Partial","verbose","ReactNode","message","join","renderToolUseProgressMessage","progressMessages","lastProgress","data","type","resultCount","renderToolResultMessage","output","timeDisplay","durationSeconds","Math","round","getToolUseSummary","input"],"sources":["UI.tsx"],"sourcesContent":["import React from 'react'\nimport { MessageResponse } from '../../components/MessageResponse.js'\nimport { TOOL_SUMMARY_MAX_LENGTH } from '../../constants/toolLimits.js'\nimport { Box, Text } from '../../ink.js'\nimport type { ProgressMessage } from '../../types/message.js'\nimport { truncate } from '../../utils/format.js'\nimport type {\n  Output,\n  SearchResult,\n  WebSearchProgress,\n} from './WebSearchTool.js'\n\nfunction getSearchSummary(\n  results: (SearchResult | string | null | undefined)[],\n): {\n  searchCount: number\n  totalResultCount: number\n} {\n  let searchCount = 0\n  let totalResultCount = 0\n\n  for (const result of results) {\n    if (result != null && typeof result !== 'string') {\n      searchCount++\n      totalResultCount += result.content?.length ?? 0\n    }\n  }\n\n  return { searchCount, totalResultCount }\n}\n\nexport function renderToolUseMessage(\n  {\n    query,\n    allowed_domains,\n    blocked_domains,\n  }: Partial<{\n    query: string\n    allowed_domains?: string[]\n    blocked_domains?: string[]\n  }>,\n  { verbose }: { verbose: boolean },\n): React.ReactNode {\n  if (!query) {\n    return null\n  }\n\n  let message = ''\n\n  if (query) {\n    message += `\"${query}\"`\n  }\n\n  if (verbose) {\n    if (allowed_domains && allowed_domains.length > 0) {\n      message += `, only allowing domains: ${allowed_domains.join(', ')}`\n    }\n\n    if (blocked_domains && blocked_domains.length > 0) {\n      message += `, blocking domains: ${blocked_domains.join(', ')}`\n    }\n  }\n\n  return message\n}\n\nexport function renderToolUseProgressMessage(\n  progressMessages: ProgressMessage<WebSearchProgress>[],\n): React.ReactNode {\n  if (progressMessages.length === 0) {\n    return null\n  }\n\n  const lastProgress = progressMessages[progressMessages.length - 1]\n  if (!lastProgress?.data) {\n    return null\n  }\n\n  const data = lastProgress.data\n\n  switch (data.type) {\n    case 'query_update':\n      return (\n        <MessageResponse>\n          <Text dimColor>Searching: {data.query}</Text>\n        </MessageResponse>\n      )\n    case 'search_results_received':\n      return (\n        <MessageResponse>\n          <Text dimColor>\n            Found {data.resultCount} results for &quot;{data.query}&quot;\n          </Text>\n        </MessageResponse>\n      )\n    default:\n      return null\n  }\n}\n\nexport function renderToolResultMessage(output: Output): React.ReactNode {\n  const { searchCount } = getSearchSummary(output.results ?? [])\n  const timeDisplay =\n    output.durationSeconds >= 1\n      ? `${Math.round(output.durationSeconds)}s`\n      : `${Math.round(output.durationSeconds * 1000)}ms`\n\n  return (\n    <Box justifyContent=\"space-between\" width=\"100%\">\n      <MessageResponse height={1}>\n        <Text>\n          Did {searchCount} search\n          {searchCount !== 1 ? 'es' : ''} in {timeDisplay}\n        </Text>\n      </MessageResponse>\n    </Box>\n  )\n}\n\nexport function getToolUseSummary(\n  input: Partial<{ query: string }> | undefined,\n): string | null {\n  if (!input?.query) {\n    return null\n  }\n  return truncate(input.query, TOOL_SUMMARY_MAX_LENGTH)\n}\n"],"mappings":"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","ignoreList":[]}
|