@vellumai/assistant 0.11.4 → 0.11.5-dev.202608220019.a778cf0
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/AGENTS.md +6 -2
- package/ARCHITECTURE.md +29 -4
- package/README.md +1 -1
- package/docs/architecture/memory.md +17 -5
- package/docs/architecture/security.md +96 -152
- package/docs/guardian-request-flow.md +13 -2
- package/node_modules/@vellumai/ces-client/node_modules/@vellumai/service-contracts/package.json +1 -0
- package/node_modules/@vellumai/ces-client/node_modules/@vellumai/service-contracts/src/__tests__/ingress.test.ts +118 -0
- package/node_modules/@vellumai/ces-client/node_modules/@vellumai/service-contracts/src/__tests__/url-normalization.test.ts +135 -0
- package/node_modules/@vellumai/ces-client/node_modules/@vellumai/service-contracts/src/index.ts +1 -0
- package/node_modules/@vellumai/ces-client/node_modules/@vellumai/service-contracts/src/ingress.ts +103 -0
- package/node_modules/@vellumai/ces-client/node_modules/@vellumai/service-contracts/src/url-normalization.ts +107 -0
- package/node_modules/@vellumai/gateway-client/node_modules/@vellumai/service-contracts/package.json +1 -0
- package/node_modules/@vellumai/gateway-client/node_modules/@vellumai/service-contracts/src/__tests__/ingress.test.ts +118 -0
- package/node_modules/@vellumai/gateway-client/node_modules/@vellumai/service-contracts/src/__tests__/url-normalization.test.ts +135 -0
- package/node_modules/@vellumai/gateway-client/node_modules/@vellumai/service-contracts/src/index.ts +1 -0
- package/node_modules/@vellumai/gateway-client/node_modules/@vellumai/service-contracts/src/ingress.ts +103 -0
- package/node_modules/@vellumai/gateway-client/node_modules/@vellumai/service-contracts/src/url-normalization.ts +107 -0
- package/node_modules/@vellumai/gateway-client/src/gateway-ipc-contracts.ts +166 -1
- package/node_modules/@vellumai/gateway-client/src/http-delivery.ts +7 -14
- package/node_modules/@vellumai/gateway-client/src/index.ts +2 -0
- package/node_modules/@vellumai/gateway-client/src/outbound-contract.ts +30 -32
- package/node_modules/@vellumai/service-contracts/package.json +1 -0
- package/node_modules/@vellumai/service-contracts/src/__tests__/ingress.test.ts +118 -0
- package/node_modules/@vellumai/service-contracts/src/__tests__/url-normalization.test.ts +135 -0
- package/node_modules/@vellumai/service-contracts/src/index.ts +1 -0
- package/node_modules/@vellumai/service-contracts/src/ingress.ts +103 -0
- package/node_modules/@vellumai/service-contracts/src/url-normalization.ts +107 -0
- package/openapi.yaml +487 -11
- package/package.json +1 -1
- package/scripts/sync-web-search-catalog.ts +6 -0
- package/src/__tests__/anthropic-provider.test.ts +10 -3
- package/src/__tests__/approval-interception-trust-gates.test.ts +40 -0
- package/src/__tests__/background-workers-disk-pressure.test.ts +1 -1
- package/src/__tests__/channel-approval-routes.test.ts +4 -0
- package/src/__tests__/channel-inbound-disk-pressure.test.ts +5 -6
- package/src/__tests__/channel-readiness-service.test.ts +126 -0
- package/src/__tests__/channel-reply-delivery.test.ts +30 -17
- package/src/__tests__/checker.test.ts +20 -314
- package/src/__tests__/cli-memory-v2-reembed-skills.test.ts +6 -2
- package/src/__tests__/client-os-metadata-persistence.test.ts +16 -0
- package/src/__tests__/compactor-retained-image-validation.test.ts +142 -0
- package/src/__tests__/config-loader-backfill.test.ts +19 -10
- package/src/__tests__/container-cpu-sampler.test.ts +153 -0
- package/src/__tests__/context-search-memory-v2-source.test.ts +0 -1
- package/src/__tests__/conversation-attachments.test.ts +0 -1
- package/src/__tests__/conversation-delete-watch-timeline.test.ts +231 -0
- package/src/__tests__/conversation-error.test.ts +17 -0
- package/src/__tests__/conversation-lifecycle.test.ts +20 -26
- package/src/__tests__/conversation-pairing.test.ts +186 -0
- package/src/__tests__/conversation-runtime-assembly.test.ts +21 -2
- package/src/__tests__/credential-broker-server-use.test.ts +24 -5
- package/src/__tests__/credential-routes.test.ts +22 -3
- package/src/__tests__/credential-security-invariants.test.ts +2 -1
- package/src/__tests__/daemon-credential-client.test.ts +88 -0
- package/src/__tests__/default-plugin-names-guard.test.ts +12 -1
- package/src/__tests__/dm-backfill.test.ts +63 -0
- package/src/__tests__/dynamic-skill-background-guard.test.ts +0 -2
- package/src/__tests__/edit-propagation.test.ts +107 -4
- package/src/__tests__/events-client-registration.test.ts +28 -0
- package/src/__tests__/file-write-tool.test.ts +4 -2
- package/src/__tests__/guardian-prompt-notice-privacy.test.ts +133 -0
- package/src/__tests__/guardian-verify-setup-skill-regression.test.ts +143 -97
- package/src/__tests__/helpers/gateway-classify-mock.ts +27 -6
- package/src/__tests__/host-proxy-interface.test.ts +11 -1
- package/src/__tests__/host-shell-tool.test.ts +23 -4
- package/src/__tests__/image-conversion.test.ts +143 -1
- package/src/__tests__/inline-skill-load-permissions.test.ts +47 -36
- package/src/__tests__/input-repairs.test.ts +207 -0
- package/src/__tests__/live-workspace-guard.test.ts +75 -0
- package/src/__tests__/managed-profile-guard.test.ts +4 -2
- package/src/__tests__/mcp-abort-signal.test.ts +1 -1
- package/src/__tests__/mcp-client-auth.test.ts +1 -1
- package/src/__tests__/mcp-tool-annotations-risk.test.ts +1 -1
- package/src/__tests__/media-resolve-image-validation.test.ts +310 -0
- package/src/__tests__/mtime-cache.test.ts +2 -0
- package/src/__tests__/notification-vellum-adapter.test.ts +124 -1
- package/src/__tests__/openai-provider.test.ts +40 -0
- package/src/__tests__/openai-responses-provider.test.ts +18 -0
- package/src/__tests__/personal-memory-auth-bypass.test.ts +22 -6
- package/src/__tests__/platform-bash-auto-approve.test.ts +0 -4
- package/src/__tests__/platform.test.ts +16 -1
- package/src/__tests__/plugin-api-resolve-credential.test.ts +22 -13
- package/src/__tests__/plugin-api-shim.test.ts +5 -0
- package/src/__tests__/plugin-api-store-credential.test.ts +268 -0
- package/src/__tests__/plugin-config-data-migration.test.ts +8 -1
- package/src/__tests__/plugin-disabled-state.test.ts +2 -0
- package/src/__tests__/plugin-effective-enabled-set.test.ts +55 -3
- package/src/__tests__/plugin-execution-context.test.ts +73 -0
- package/src/__tests__/plugin-import-boundary-guard.test.ts +0 -1
- package/src/__tests__/plugin-import-boundary-reverse-guard.test.ts +0 -1
- package/src/__tests__/reaction-persistence.test.ts +200 -7
- package/src/__tests__/require-fresh-approval.test.ts +0 -4
- package/src/__tests__/resource-pressure-guard.test.ts +428 -0
- package/src/__tests__/resource-pressure-routes.test.ts +113 -0
- package/src/__tests__/risk-classification-boundary-guard.test.ts +115 -0
- package/src/__tests__/run-conversation-turn-persistence.test.ts +27 -1
- package/src/__tests__/sanitize-config-for-transfer.test.ts +28 -0
- package/src/__tests__/secret-routes-platform-proxy.test.ts +7 -0
- package/src/__tests__/settings-routes.test.ts +85 -3
- package/src/__tests__/skill-tool-factory.test.ts +161 -0
- package/src/__tests__/tool-execution-pipeline.benchmark.test.ts +1 -1
- package/src/__tests__/tool-executor-lifecycle-events.test.ts +132 -5
- package/src/__tests__/tool-executor.test.ts +63 -38
- package/src/__tests__/tool-policy.test.ts +97 -1
- package/src/__tests__/trusted-contact-inline-approval-integration.test.ts +7 -4
- package/src/__tests__/user-plugin-loader.test.ts +2 -0
- package/src/__tests__/validate-input.test.ts +243 -7
- package/src/__tests__/verification-control-plane-policy.test.ts +0 -2
- package/src/__tests__/voice-scoped-grant-consumer.test.ts +2 -0
- package/src/__tests__/voice-session-bridge.test.ts +42 -0
- package/src/__tests__/web-search-catalog-parity.test.ts +8 -0
- package/src/acp/__tests__/acp-claude-oauth.test.ts +97 -29
- package/src/acp/__tests__/prepare-agent-env.test.ts +376 -153
- package/src/acp/acp-claude-oauth.ts +38 -21
- package/src/acp/prepare-agent-env.ts +146 -55
- package/src/agent/loop-tool-dedup.test.ts +161 -0
- package/src/agent/loop.ts +68 -22
- package/src/api/constants/app-tools.ts +34 -0
- package/src/api/constants/profile-config-validation.ts +60 -0
- package/src/api/events/resource-pressure-status-changed.ts +53 -0
- package/src/api/events/tool-result.ts +6 -1
- package/src/api/events/watch-retro-completed.ts +52 -0
- package/src/api/index.ts +30 -0
- package/src/api/responses/resource-pressure-status.ts +25 -0
- package/src/approvals/guardian-channel-delivery.ts +70 -6
- package/src/approvals/guardian-request-resolvers.ts +32 -66
- package/src/calls/__tests__/voice-session-bridge.test.ts +114 -0
- package/src/calls/voice-session-bridge.ts +60 -6
- package/src/channels/__tests__/message-audience.test.ts +49 -0
- package/src/channels/__tests__/types.test.ts +17 -3
- package/src/channels/message-audience.ts +40 -0
- package/src/channels/types.ts +16 -12
- package/src/cli/__tests__/catalog-search-help.test.ts +50 -0
- package/src/cli/commands/__tests__/channel-verification-sessions.test.ts +31 -0
- package/src/cli/commands/__tests__/conversations-search.test.ts +289 -0
- package/src/cli/commands/__tests__/conversations-slack.test.ts +2 -1
- package/src/cli/commands/__tests__/inference-profiles.test.ts +16 -4
- package/src/cli/commands/__tests__/inference-providers.test.ts +135 -2
- package/src/cli/commands/__tests__/keys.test.ts +89 -8
- package/src/cli/commands/__tests__/plugins.test.ts +57 -1
- package/src/cli/commands/channel-verification-sessions.help.ts +11 -9
- package/src/cli/commands/channel-verification-sessions.ts +11 -21
- package/src/cli/commands/conversations.help.ts +34 -0
- package/src/cli/commands/conversations.ts +125 -0
- package/src/cli/commands/inference-profiles.ts +56 -3
- package/src/cli/commands/inference-providers.ts +37 -6
- package/src/cli/commands/inference.help.ts +9 -4
- package/src/cli/commands/keys.help.ts +13 -1
- package/src/cli/commands/keys.ts +26 -15
- package/src/cli/commands/memory/__tests__/memory-v2.test.ts +57 -7
- package/src/cli/commands/memory/index.help.ts +41 -27
- package/src/cli/commands/memory/index.ts +2 -0
- package/src/cli/commands/memory/memory-v2.ts +58 -54
- package/src/cli/commands/memory/memory-validate.ts +18 -0
- package/src/cli/commands/monitoring.ts +1 -0
- package/src/cli/commands/oauth/request.test.ts +93 -0
- package/src/cli/commands/oauth/request.ts +23 -9
- package/src/cli/commands/plugins.help.ts +28 -31
- package/src/cli/commands/plugins.ts +10 -0
- package/src/cli/commands/skills.help.ts +13 -16
- package/src/cli/commands/trust.ts +3 -14
- package/src/cli/lib/__tests__/install-from-github.test.ts +38 -0
- package/src/cli/lib/__tests__/merge-plugin-tree.test.ts +34 -0
- package/src/cli/lib/__tests__/plugin-surfaces.test.ts +32 -1
- package/src/cli/lib/__tests__/toggle-plugin.test.ts +2 -1
- package/src/cli/lib/__tests__/upgrade-plugin.test.ts +64 -0
- package/src/cli/lib/bundled-marketplace.json +26 -0
- package/src/cli/lib/daemon-credential-client.ts +25 -3
- package/src/cli/lib/install-from-github.ts +35 -24
- package/src/cli/lib/merge-plugin-tree.ts +22 -4
- package/src/cli/lib/open-browser.test.ts +67 -0
- package/src/cli/lib/open-browser.ts +24 -5
- package/src/cli/lib/plugin-surfaces.ts +27 -0
- package/src/config/__tests__/balanced-model-experiment.test.ts +7 -7
- package/src/config/__tests__/default-profile-catalog.test.ts +3 -3
- package/src/config/__tests__/profile-materialization.test.ts +26 -0
- package/src/config/default-profile-catalog.ts +5 -6
- package/src/config/feature-flag-registry.json +36 -28
- package/src/config/profile-materialization.ts +29 -0
- package/src/config/sanitize-for-transfer.ts +16 -0
- package/src/config/schemas/llm.ts +7 -0
- package/src/config/schemas/services.ts +6 -0
- package/src/config/webhook-routing.ts +8 -0
- package/src/context/compactor.ts +31 -2
- package/src/context/outbound-sanitize.ts +6 -0
- package/src/daemon/__tests__/lifecycle-watch-timeline-sweep.test.ts +98 -0
- package/src/daemon/__tests__/provider-rejection-log-fields.test.ts +272 -0
- package/src/daemon/conversation-agent-loop-handlers.ts +4 -1
- package/src/daemon/conversation-error.ts +19 -2
- package/src/daemon/conversation-messaging.ts +22 -2
- package/src/daemon/conversation-process.ts +11 -0
- package/src/daemon/conversation-store.ts +10 -0
- package/src/daemon/conversation-surfaces.ts +21 -8
- package/src/daemon/conversation.ts +12 -10
- package/src/daemon/daemon-control.ts +1 -0
- package/src/daemon/handlers/__tests__/config-ingress-tunnel-records.test.ts +208 -0
- package/src/daemon/handlers/config-ingress.ts +115 -5
- package/src/daemon/lifecycle.ts +30 -2
- package/src/daemon/message-types/conversations.ts +5 -7
- package/src/daemon/message-types/web-activity.ts +3 -2
- package/src/daemon/provider-rejection-log-fields.ts +124 -0
- package/src/daemon/resource-pressure-guard-lifecycle.ts +66 -0
- package/src/daemon/resource-pressure-guard.ts +387 -0
- package/src/daemon/shutdown-handlers.ts +2 -0
- package/src/daemon/startup-error.ts +16 -0
- package/src/daemon/trust-context.ts +14 -10
- package/src/daemon/unsendable-image-notice.ts +76 -0
- package/src/hooks/registry.ts +65 -51
- package/src/inbound/__tests__/tunnel-probe.test.ts +448 -0
- package/src/inbound/tunnel-probe.ts +261 -0
- package/src/ipc/__tests__/socket-path.test.ts +15 -7
- package/src/ipc/gateway-client.test.ts +1 -1
- package/src/ipc/gateway-client.ts +14 -21
- package/src/ipc/socket-cleanup.ts +2 -11
- package/src/mcp/__tests__/mcp-auth-orchestrator.test.ts +1 -1
- package/src/messaging/provider-message-metadata.ts +128 -0
- package/src/messaging/providers/__tests__/transport-dispatch.test.ts +138 -73
- package/src/messaging/providers/channel-transport.ts +100 -16
- package/src/messaging/providers/discord/send.ts +16 -0
- package/src/messaging/providers/discord/transport.ts +23 -1
- package/src/messaging/providers/index.ts +84 -16
- package/src/messaging/providers/slack/message-metadata.ts +45 -0
- package/src/messaging/providers/slack/render-transcript.ts +1 -4
- package/src/messaging/providers/slack/send.test.ts +88 -34
- package/src/messaging/providers/slack/send.ts +99 -50
- package/src/messaging/providers/slack/transport.ts +35 -37
- package/src/messaging/providers/telegram-bot/send.test.ts +88 -18
- package/src/messaging/providers/telegram-bot/send.ts +36 -0
- package/src/messaging/providers/telegram-bot/transport.ts +22 -8
- package/src/messaging/read-provider-metadata.test.ts +157 -0
- package/src/messaging/read-provider-metadata.ts +51 -0
- package/src/notifications/__tests__/assistant-reply-producer.test.ts +94 -0
- package/src/notifications/__tests__/edit-notification.test.ts +174 -2
- package/src/notifications/__tests__/home-feed-side-effect.test.ts +536 -4
- package/src/notifications/adapters/macos.ts +55 -0
- package/src/notifications/adapters/slack.ts +10 -5
- package/src/notifications/assistant-reply-producer.ts +37 -4
- package/src/notifications/conversation-pairing.ts +111 -21
- package/src/notifications/edit-notification.ts +38 -8
- package/src/notifications/emit-signal.ts +12 -14
- package/src/notifications/home-feed-side-effect.ts +218 -15
- package/src/notifications/types.ts +5 -0
- package/src/permissions/AGENTS.md +16 -0
- package/src/permissions/checker.test.ts +75 -122
- package/src/permissions/checker.ts +44 -560
- package/src/permissions/confirmation-guardian-request.test.ts +28 -3
- package/src/permissions/confirmation-guardian-request.ts +5 -1
- package/src/persistence/conversation-crud.ts +69 -20
- package/src/persistence/conversation-queries.ts +14 -1
- package/src/persistence/conversation-types.ts +22 -0
- package/src/persistence/db-async-query.ts +2 -1
- package/src/persistence/db-maintenance.ts +15 -0
- package/src/persistence/delivery-crud.ts +122 -15
- package/src/persistence/embeddings/qdrant-manager.ts +1 -0
- package/src/persistence/migrations/367-create-watch-timeline-entries.ts +46 -0
- package/src/persistence/migrations/368-watch-timeline-screenshot-blob.ts +33 -0
- package/src/persistence/migrations/__tests__/367-create-watch-timeline-entries.test.ts +98 -0
- package/src/persistence/migrations/__tests__/368-watch-timeline-screenshot-blob.test.ts +98 -0
- package/src/persistence/schema/index.ts +1 -0
- package/src/persistence/schema/watch.ts +29 -0
- package/src/persistence/steps.ts +4 -0
- package/src/plugin-api/__tests__/import-graph-partial-mock.test.ts +67 -0
- package/src/plugin-api/conversation-turn.ts +27 -0
- package/src/plugin-api/credential-scope.test.ts +15 -0
- package/src/plugin-api/credential-scope.ts +14 -0
- package/src/plugin-api/index.ts +19 -1
- package/src/plugin-api/resolve-credential.ts +15 -10
- package/src/plugin-api/store-credential.ts +148 -0
- package/src/plugin-api/system-card.ts +36 -0
- package/src/plugin-api/vision-support.test.ts +82 -0
- package/src/plugin-api/vision-support.ts +14 -2
- package/src/plugins/defaults/image-fallback/__tests__/image-fallback.test.ts +361 -110
- package/src/plugins/defaults/image-fallback/__tests__/vision-recovery.test.ts +4 -0
- package/src/plugins/defaults/image-fallback/hooks/user-prompt-submit.ts +58 -0
- package/src/plugins/defaults/image-fallback/src/caption-blocks.ts +64 -23
- package/src/plugins/defaults/image-recovery/detect.ts +24 -1
- package/src/plugins/defaults/main.ts +15 -0
- package/src/plugins/defaults/memory/AGENTS.md +11 -3
- package/src/plugins/defaults/memory/__tests__/memory-tier-boundary-guard.test.ts +0 -1
- package/src/plugins/defaults/memory/graph-topology/pending-buffer.ts +9 -12
- package/src/plugins/defaults/memory/memory-retrospective-prompt.ts +1 -1
- package/src/plugins/defaults/memory/src/memory-v2-routes.ts +12 -10
- package/src/plugins/defaults/memory/substrate/__tests__/consolidation-job.test.ts +114 -0
- package/src/plugins/defaults/memory/substrate/__tests__/consolidation-prompt-flag-gating-guard.test.ts +8 -0
- package/src/plugins/defaults/memory/substrate/__tests__/edge-index.test.ts +0 -30
- package/src/plugins/defaults/memory/substrate/__tests__/ingest.test.ts +73 -1
- package/src/plugins/defaults/memory/substrate/__tests__/page-index.test.ts +37 -0
- package/src/plugins/defaults/memory/substrate/__tests__/page-links.test.ts +208 -0
- package/src/plugins/defaults/memory/substrate/__tests__/prompts-consolidation.test.ts +158 -1
- package/src/plugins/defaults/memory/substrate/__tests__/static-context.test.ts +1 -61
- package/src/plugins/defaults/memory/substrate/consolidation-job.ts +68 -6
- package/src/plugins/defaults/memory/substrate/edge-index.ts +0 -31
- package/src/plugins/defaults/memory/substrate/ingest.ts +59 -0
- package/src/plugins/defaults/memory/substrate/page-index.ts +35 -8
- package/src/plugins/defaults/memory/substrate/page-links.ts +133 -0
- package/src/plugins/defaults/memory/substrate/page-store.ts +10 -0
- package/src/plugins/defaults/memory/substrate/prompts/consolidation.ts +124 -34
- package/src/plugins/defaults/memory/substrate/static-context.ts +0 -29
- package/src/plugins/defaults/memory/v3/__tests__/shadow-plugin.test.ts +3 -1
- package/src/plugins/defaults/memory/v3/card.ts +9 -9
- package/src/plugins/defaults/memory/v3/core-set.test.ts +7 -0
- package/src/plugins/defaults/memory/v3/core-set.ts +5 -1
- package/src/plugins/defaults/memory/v3/edge.ts +13 -57
- package/src/plugins/mtime-cache.ts +1 -1
- package/src/plugins/pipeline.ts +14 -7
- package/src/plugins/plugin-execution-context.ts +35 -11
- package/src/plugins/plugin-tree-walk.ts +63 -4
- package/src/providers/__tests__/retry-network-error.test.ts +84 -0
- package/src/providers/anthropic/__tests__/pause-turn-continuation.test.ts +170 -0
- package/src/providers/anthropic/client.ts +332 -241
- package/src/providers/connection-resolution.ts +25 -2
- package/src/providers/content-blocks.ts +22 -0
- package/src/providers/fetch-provider-catalog.ts +19 -0
- package/src/providers/gemini/client.ts +5 -2
- package/src/providers/inference/__tests__/adapter-factory-litellm.test.ts +47 -1
- package/src/providers/inference/__tests__/adapter-factory-ollama.test.ts +83 -0
- package/src/providers/inference/__tests__/adapter-factory-openai-compatible.test.ts +98 -1
- package/src/providers/inference/__tests__/base-url-route-validation.test.ts +38 -0
- package/src/providers/inference/__tests__/base-url-security.test.ts +10 -0
- package/src/providers/inference/__tests__/connections-ollama.test.ts +90 -0
- package/src/providers/inference/__tests__/endpoint-probe.test.ts +92 -0
- package/src/providers/inference/__tests__/missing-credential-guard.test.ts +117 -0
- package/src/providers/inference/__tests__/profile-config-validation.test.ts +39 -0
- package/src/providers/inference/__tests__/profile-probe-classify.test.ts +66 -0
- package/src/providers/inference/adapter-factory.ts +33 -2
- package/src/providers/inference/auth.ts +13 -2
- package/src/providers/inference/credential-usage.ts +37 -0
- package/src/providers/inference/endpoint-probe.ts +115 -0
- package/src/providers/inference/missing-credential-guard.ts +110 -0
- package/src/providers/inference/profile-probe.ts +256 -0
- package/src/providers/inference/resolve-auth.ts +7 -7
- package/src/providers/media-resolve.ts +176 -15
- package/src/providers/model-catalog.ts +10 -0
- package/src/providers/openai/__tests__/api-error-normalization.test.ts +17 -1
- package/src/providers/openai/__tests__/chat-completions-provider-reasoning.test.ts +576 -46
- package/src/providers/openai/__tests__/connection-error-wrap.test.ts +44 -0
- package/src/providers/openai/__tests__/tool-choice-mapping.test.ts +125 -2
- package/src/providers/openai/api-error-normalization.ts +16 -2
- package/src/providers/openai/chat-completions-provider.ts +326 -44
- package/src/providers/openai/responses-provider.ts +5 -2
- package/src/providers/provider-send-message.ts +11 -0
- package/src/providers/retry.ts +6 -0
- package/src/providers/search-provider-catalog.ts +20 -0
- package/src/routes/route-host-protocol.ts +7 -0
- package/src/routes/worker.ts +31 -10
- package/src/runtime/AGENTS.md +36 -0
- package/src/runtime/__tests__/host-observe.test.ts +302 -0
- package/src/runtime/__tests__/runtime-http-port-collision.test.ts +131 -0
- package/src/runtime/__tests__/web-presence.test.ts +234 -0
- package/src/runtime/assistant-event-hub.ts +38 -0
- package/src/runtime/channel-readiness-service.ts +39 -13
- package/src/runtime/channel-readiness-types.ts +49 -2
- package/src/runtime/channel-reply-delivery.ts +55 -32
- package/src/runtime/channel-retry-sweep.ts +6 -4
- package/src/runtime/effective-capabilities.test.ts +19 -0
- package/src/runtime/effective-capabilities.ts +25 -0
- package/src/runtime/guardian-reply-router.ts +6 -2
- package/src/runtime/host-observe.ts +246 -0
- package/src/runtime/http-errors.ts +1 -0
- package/src/runtime/http-server.ts +185 -6
- package/src/runtime/routes/__tests__/client-routes.test.ts +150 -0
- package/src/runtime/routes/__tests__/conversation-list-routes.test.ts +133 -0
- package/src/runtime/routes/__tests__/conversation-query-routes.test.ts +80 -0
- package/src/runtime/routes/__tests__/credential-delete-in-use.test.ts +155 -0
- package/src/runtime/routes/__tests__/inference-profiles-routes.test.ts +118 -0
- package/src/runtime/routes/__tests__/inference-provider-connection-routes.test.ts +72 -1
- package/src/runtime/routes/__tests__/ingress-status-routes.test.ts +508 -0
- package/src/runtime/routes/__tests__/monitoring-routes.test.ts +1 -0
- package/src/runtime/routes/__tests__/pending-interactions-route.test.ts +175 -0
- package/src/runtime/routes/__tests__/plugins-routes.test.ts +103 -71
- package/src/runtime/routes/__tests__/surface-action-routes.test.ts +55 -6
- package/src/runtime/routes/__tests__/system-card-turn-termination.test.ts +107 -0
- package/src/runtime/routes/__tests__/user-route-dispatcher-host.test.ts +52 -1
- package/src/runtime/routes/__tests__/user-route-dispatcher.test.ts +75 -4
- package/src/runtime/routes/__tests__/watch-routes-guardian-cache.test.ts +139 -0
- package/src/runtime/routes/__tests__/watch-routes.test.ts +598 -0
- package/src/runtime/routes/approval-routes.ts +37 -4
- package/src/runtime/routes/approval-strategies/guardian-text-engine-strategy.ts +16 -22
- package/src/runtime/routes/canned-message-complete.ts +68 -29
- package/src/runtime/routes/channel-readiness-routes.ts +14 -2
- package/src/runtime/routes/client-routes.ts +113 -0
- package/src/runtime/routes/conversation-list-routes.ts +22 -7
- package/src/runtime/routes/conversation-management-routes.ts +15 -9
- package/src/runtime/routes/conversation-query-routes.ts +10 -0
- package/src/runtime/routes/conversation-routes.ts +36 -22
- package/src/runtime/routes/credential-in-use.ts +85 -0
- package/src/runtime/routes/credential-routes.ts +55 -85
- package/src/runtime/routes/guardian-approval-interception.ts +44 -53
- package/src/runtime/routes/guardian-approval-reply-helpers.ts +14 -12
- package/src/runtime/routes/host-cu-routes.ts +18 -0
- package/src/runtime/routes/identity-routes.ts +5 -121
- package/src/runtime/routes/inbound-message-handler.ts +74 -30
- package/src/runtime/routes/inbound-stages/acl-enforcement.ts +16 -17
- package/src/runtime/routes/inbound-stages/background-dispatch.test.ts +182 -297
- package/src/runtime/routes/inbound-stages/background-dispatch.ts +173 -386
- package/src/runtime/routes/inbound-stages/edit-intercept.ts +101 -77
- package/src/runtime/routes/inbound-stages/guardian-reply-intercept.ts +17 -8
- package/src/runtime/routes/inbound-stages/reaction-intercept.test.ts +91 -7
- package/src/runtime/routes/inbound-stages/reaction-intercept.ts +72 -70
- package/src/runtime/routes/index.ts +4 -0
- package/src/runtime/routes/inference-profiles-routes.ts +232 -31
- package/src/runtime/routes/inference-provider-connection-routes.ts +33 -11
- package/src/runtime/routes/ingress-status-routes.ts +180 -0
- package/src/runtime/routes/monitoring-routes.ts +9 -1
- package/src/runtime/routes/oauth-commands-routes.ts +1 -1
- package/src/runtime/routes/plugins-routes.ts +28 -32
- package/src/runtime/routes/resource-pressure-routes.ts +22 -0
- package/src/runtime/routes/secret-routes.ts +39 -8
- package/src/runtime/routes/settings-routes.ts +15 -12
- package/src/runtime/routes/surface-action-routes.ts +20 -19
- package/src/runtime/routes/user-route-dispatcher.ts +31 -2
- package/src/runtime/routes/user-route-resolution.ts +18 -1
- package/src/runtime/routes/watch-routes.ts +807 -0
- package/src/runtime/slack-reply-session.test.ts +23 -13
- package/src/runtime/slack-reply-session.ts +38 -55
- package/src/runtime/web-presence.ts +90 -0
- package/src/security/__tests__/untrusted-content.test.ts +42 -0
- package/src/security/untrusted-content.ts +28 -9
- package/src/skills/validate-input.ts +177 -40
- package/src/subagent/__tests__/consult-context-gating.test.ts +6 -10
- package/src/subagent/consult-context.ts +7 -23
- package/src/tools/credentials/broker.ts +24 -79
- package/src/tools/credentials/ref-parse.ts +35 -0
- package/src/tools/credentials/resolve.ts +4 -10
- package/src/tools/credentials/store.ts +168 -0
- package/src/tools/credentials/tool-policy.ts +67 -0
- package/src/tools/executor.ts +53 -15
- package/src/tools/network/__tests__/firecrawl-compat.test.ts +77 -0
- package/src/tools/network/__tests__/web-fetch-fastcrw.test.ts +169 -0
- package/src/tools/network/__tests__/web-search.test.ts +138 -3
- package/src/tools/network/firecrawl-compat.ts +90 -0
- package/src/tools/network/url-safety.ts +9 -16
- package/src/tools/network/web-fetch.ts +142 -62
- package/src/tools/network/web-search.ts +162 -58
- package/src/tools/permission-checker.ts +43 -52
- package/src/tools/schema-transforms.ts +40 -5
- package/src/tools/shared/input-repairs.ts +160 -0
- package/src/tools/skills/skill-tool-factory.ts +18 -4
- package/src/tools/subagent/spawn.ts +0 -1
- package/src/tools/tool-approval-handler.ts +16 -10
- package/src/tools/tool-types.ts +26 -13
- package/src/tools/types.ts +6 -6
- package/src/util/__tests__/cgroup-memory.test.ts +3 -0
- package/src/util/cgroup-memory.ts +3 -0
- package/src/util/container-cpu-sampler.ts +250 -0
- package/src/util/image-conversion.ts +178 -14
- package/src/util/platform.ts +93 -10
- package/src/util/worker-process.ts +1 -0
- package/src/watch/__tests__/watch-retro.test.ts +665 -0
- package/src/watch/__tests__/watch-session-manager.test.ts +566 -0
- package/src/watch/__tests__/watch-timeline.test.ts +670 -0
- package/src/watch/watch-retro.ts +480 -0
- package/src/watch/watch-session-manager.ts +575 -0
- package/src/watch/watch-timeline.ts +848 -0
- package/src/permissions/ipc-risk-types.ts +0 -143
- package/src/permissions/risk-types.ts +0 -76
|
@@ -21,6 +21,13 @@ import type {
|
|
|
21
21
|
ToolExecutionResult,
|
|
22
22
|
} from "../types.js";
|
|
23
23
|
import { extractDomain } from "./domain-normalize.js";
|
|
24
|
+
import {
|
|
25
|
+
extractFirecrawlCompatSearchResults,
|
|
26
|
+
FASTCRW_DEFAULT_API_BASE,
|
|
27
|
+
type FirecrawlCompatSearchResult,
|
|
28
|
+
resolveProviderApiUrl,
|
|
29
|
+
searchResultSnippet,
|
|
30
|
+
} from "./firecrawl-compat.js";
|
|
24
31
|
import type { ManagedSearchProxyResult } from "./managed-search-proxy.js";
|
|
25
32
|
import {
|
|
26
33
|
classifyWebSearchFailure,
|
|
@@ -35,6 +42,7 @@ const BRAVE_API_URL = `https://api.search.brave.com${BRAVE_SEARCH_PATH}`;
|
|
|
35
42
|
const PERPLEXITY_API_URL = "https://api.perplexity.ai/chat/completions";
|
|
36
43
|
const TAVILY_API_URL = "https://api.tavily.com/search";
|
|
37
44
|
const FIRECRAWL_API_URL = "https://api.firecrawl.dev/v2/search";
|
|
45
|
+
const FASTCRW_SEARCH_PATH = "/v1/search";
|
|
38
46
|
// Keenable is keyless by default: the public path needs no key (rate-limited);
|
|
39
47
|
// a key switches to the authenticated path and lifts the cap.
|
|
40
48
|
const KEENABLE_API_BASE_URL = "https://api.keenable.ai";
|
|
@@ -46,7 +54,8 @@ type WebSearchProvider =
|
|
|
46
54
|
| "brave"
|
|
47
55
|
| "tavily"
|
|
48
56
|
| "firecrawl"
|
|
49
|
-
| "keenable"
|
|
57
|
+
| "keenable"
|
|
58
|
+
| "fastcrw";
|
|
50
59
|
|
|
51
60
|
/**
|
|
52
61
|
* Arguments passed to every {@link WebSearchAdapter}. The full superset is
|
|
@@ -123,32 +132,31 @@ interface TavilySearchResponse {
|
|
|
123
132
|
results?: TavilySearchResult[];
|
|
124
133
|
}
|
|
125
134
|
|
|
126
|
-
interface FirecrawlSearchResult {
|
|
127
|
-
title?: string;
|
|
128
|
-
description?: string;
|
|
129
|
-
url?: string;
|
|
130
|
-
category?: string;
|
|
131
|
-
}
|
|
132
|
-
|
|
133
135
|
/**
|
|
134
|
-
* Firecrawl `/v2/search`
|
|
135
|
-
*
|
|
136
|
-
* `
|
|
136
|
+
* Firecrawl `/v2/search` and fastCRW `/v1/search` payloads. Result rows are
|
|
137
|
+
* read via {@link extractFirecrawlCompatSearchResults} (grouped `data.web`,
|
|
138
|
+
* self-hosted `data.results.web`, flat `data.results`, or array `data`).
|
|
137
139
|
*/
|
|
138
|
-
interface
|
|
140
|
+
interface FirecrawlCompatSearchResponse {
|
|
139
141
|
success?: boolean;
|
|
140
|
-
data?:
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
142
|
+
data?:
|
|
143
|
+
| FirecrawlCompatSearchResult[]
|
|
144
|
+
| {
|
|
145
|
+
web?: FirecrawlCompatSearchResult[];
|
|
146
|
+
results?: FirecrawlCompatSearchResult[];
|
|
147
|
+
news?: FirecrawlCompatSearchResult[];
|
|
148
|
+
images?: unknown[];
|
|
149
|
+
};
|
|
145
150
|
warning?: string | null;
|
|
146
151
|
}
|
|
147
152
|
|
|
148
153
|
interface KeenableSearchResult {
|
|
149
154
|
title?: string;
|
|
150
155
|
url?: string;
|
|
156
|
+
/** The page's meta description. Empty for most pages; see keenableSnippet. */
|
|
151
157
|
description?: string;
|
|
158
|
+
/** The page text. This is what carries content on a Keenable result. */
|
|
159
|
+
snippet?: string;
|
|
152
160
|
published_at?: string;
|
|
153
161
|
acquired_at?: string;
|
|
154
162
|
}
|
|
@@ -275,11 +283,11 @@ function formatTavilyResults(
|
|
|
275
283
|
return lines.join("\n");
|
|
276
284
|
}
|
|
277
285
|
|
|
278
|
-
function
|
|
279
|
-
data:
|
|
286
|
+
function formatFirecrawlCompatResults(
|
|
287
|
+
data: FirecrawlCompatSearchResponse,
|
|
280
288
|
query: string,
|
|
281
289
|
): string {
|
|
282
|
-
const results = data
|
|
290
|
+
const results = extractFirecrawlCompatSearchResults(data);
|
|
283
291
|
|
|
284
292
|
if (results.length === 0) {
|
|
285
293
|
return `No results found for "${query}".`;
|
|
@@ -294,8 +302,9 @@ function formatFirecrawlResults(
|
|
|
294
302
|
if (r.url) {
|
|
295
303
|
lines.push(` URL: ${r.url}`);
|
|
296
304
|
}
|
|
297
|
-
|
|
298
|
-
|
|
305
|
+
const snippet = searchResultSnippet(r);
|
|
306
|
+
if (snippet) {
|
|
307
|
+
lines.push(` ${snippet}`);
|
|
299
308
|
}
|
|
300
309
|
lines.push("");
|
|
301
310
|
}
|
|
@@ -439,12 +448,13 @@ function tavilyTimeRangeForFreshness(
|
|
|
439
448
|
}
|
|
440
449
|
}
|
|
441
450
|
|
|
442
|
-
function
|
|
443
|
-
data:
|
|
451
|
+
function buildFirecrawlCompatMetadata(
|
|
452
|
+
data: FirecrawlCompatSearchResponse,
|
|
444
453
|
query: string,
|
|
445
454
|
durationMs: number,
|
|
455
|
+
provider: "firecrawl" | "fastcrw",
|
|
446
456
|
): WebSearchMetadata {
|
|
447
|
-
const results = data
|
|
457
|
+
const results = extractFirecrawlCompatSearchResults(data);
|
|
448
458
|
const items: WebSearchResultItem[] = results.map((r, i) => {
|
|
449
459
|
const url = r.url ?? "";
|
|
450
460
|
const domain = extractDomain(url);
|
|
@@ -454,12 +464,12 @@ function buildFirecrawlMetadata(
|
|
|
454
464
|
url,
|
|
455
465
|
domain,
|
|
456
466
|
faviconUrl: faviconUrlForDomain(domain),
|
|
457
|
-
snippet: r
|
|
467
|
+
snippet: searchResultSnippet(r),
|
|
458
468
|
};
|
|
459
469
|
});
|
|
460
470
|
return {
|
|
461
471
|
query,
|
|
462
|
-
provider
|
|
472
|
+
provider,
|
|
463
473
|
resultCount: items.length,
|
|
464
474
|
durationMs,
|
|
465
475
|
results: items,
|
|
@@ -488,6 +498,20 @@ function firecrawlTbsForFreshness(
|
|
|
488
498
|
}
|
|
489
499
|
}
|
|
490
500
|
|
|
501
|
+
/** Characters of page text kept per result. Keenable returns the whole page on
|
|
502
|
+
* every search result, an order of magnitude more than the other providers here
|
|
503
|
+
* return, so it is capped to keep one search from filling the context. */
|
|
504
|
+
const KEENABLE_SNIPPET_MAX_LENGTH = 500;
|
|
505
|
+
|
|
506
|
+
/** Keenable sends both `snippet` and `description` on every result: `snippet`
|
|
507
|
+
* carries the page text and `description` is the page's meta description, which
|
|
508
|
+
* is empty for most pages. `||` rather than `??`, since the empty description is
|
|
509
|
+
* present rather than nullish. */
|
|
510
|
+
function keenableSnippet(result: KeenableSearchResult): string {
|
|
511
|
+
const text = result.snippet || result.description || "";
|
|
512
|
+
return text.replace(/\s+/g, " ").trim().slice(0, KEENABLE_SNIPPET_MAX_LENGTH);
|
|
513
|
+
}
|
|
514
|
+
|
|
491
515
|
function formatKeenableResults(
|
|
492
516
|
data: KeenableSearchResponse,
|
|
493
517
|
query: string,
|
|
@@ -505,8 +529,9 @@ function formatKeenableResults(
|
|
|
505
529
|
if (r.url) {
|
|
506
530
|
lines.push(` URL: ${r.url}`);
|
|
507
531
|
}
|
|
508
|
-
|
|
509
|
-
|
|
532
|
+
const snippet = keenableSnippet(r);
|
|
533
|
+
if (snippet) {
|
|
534
|
+
lines.push(` ${snippet}`);
|
|
510
535
|
}
|
|
511
536
|
if (r.published_at) {
|
|
512
537
|
lines.push(` Published: ${r.published_at}`);
|
|
@@ -531,7 +556,7 @@ function buildKeenableMetadata(
|
|
|
531
556
|
url,
|
|
532
557
|
domain,
|
|
533
558
|
faviconUrl: faviconUrlForDomain(domain),
|
|
534
|
-
snippet: r
|
|
559
|
+
snippet: keenableSnippet(r),
|
|
535
560
|
};
|
|
536
561
|
});
|
|
537
562
|
return {
|
|
@@ -1062,12 +1087,17 @@ async function executeTavilySearch(
|
|
|
1062
1087
|
);
|
|
1063
1088
|
}
|
|
1064
1089
|
|
|
1065
|
-
async function
|
|
1090
|
+
async function executeFirecrawlCompatSearch(
|
|
1066
1091
|
query: string,
|
|
1067
1092
|
count: number,
|
|
1068
1093
|
freshness: string | undefined,
|
|
1069
1094
|
apiKey: string,
|
|
1070
|
-
|
|
1095
|
+
options: {
|
|
1096
|
+
endpoint: string;
|
|
1097
|
+
provider: "firecrawl" | "fastcrw";
|
|
1098
|
+
displayName: string;
|
|
1099
|
+
signal?: AbortSignal;
|
|
1100
|
+
},
|
|
1071
1101
|
): Promise<ToolExecutionResult> {
|
|
1072
1102
|
const tbs = firecrawlTbsForFreshness(freshness);
|
|
1073
1103
|
const body: Record<string, unknown> = {
|
|
@@ -1080,36 +1110,51 @@ async function executeFirecrawlSearch(
|
|
|
1080
1110
|
}
|
|
1081
1111
|
|
|
1082
1112
|
const startedAt = Date.now();
|
|
1113
|
+
const headers: Record<string, string> = {
|
|
1114
|
+
"Content-Type": "application/json",
|
|
1115
|
+
"X-Client-Source": "vellum-assistant",
|
|
1116
|
+
};
|
|
1117
|
+
const trimmedKey = apiKey.trim();
|
|
1118
|
+
if (trimmedKey.length > 0) {
|
|
1119
|
+
headers.Authorization = `Bearer ${trimmedKey}`;
|
|
1120
|
+
}
|
|
1083
1121
|
|
|
1084
1122
|
for (let attempt = 0; attempt <= DEFAULT_MAX_RETRIES; attempt++) {
|
|
1085
1123
|
let response: Response;
|
|
1086
1124
|
try {
|
|
1087
|
-
response = await fetch(
|
|
1125
|
+
response = await fetch(options.endpoint, {
|
|
1088
1126
|
method: "POST",
|
|
1089
|
-
headers
|
|
1090
|
-
"Content-Type": "application/json",
|
|
1091
|
-
Authorization: `Bearer ${apiKey}`,
|
|
1092
|
-
"X-Client-Source": "vellum-assistant",
|
|
1093
|
-
},
|
|
1127
|
+
headers,
|
|
1094
1128
|
body: JSON.stringify(body),
|
|
1095
|
-
signal,
|
|
1129
|
+
signal: options.signal,
|
|
1096
1130
|
});
|
|
1097
1131
|
} catch (err) {
|
|
1098
|
-
return networkFailureResult(
|
|
1132
|
+
return networkFailureResult(
|
|
1133
|
+
query,
|
|
1134
|
+
options.provider,
|
|
1135
|
+
startedAt,
|
|
1136
|
+
err,
|
|
1137
|
+
options.signal,
|
|
1138
|
+
);
|
|
1099
1139
|
}
|
|
1100
1140
|
|
|
1101
1141
|
if (response.ok) {
|
|
1102
|
-
const data = (await response.json()) as
|
|
1142
|
+
const data = (await response.json()) as FirecrawlCompatSearchResponse;
|
|
1103
1143
|
const durationMs = Date.now() - startedAt;
|
|
1104
1144
|
return {
|
|
1105
1145
|
content:
|
|
1106
|
-
wrapUntrustedContent(
|
|
1146
|
+
wrapUntrustedContent(formatFirecrawlCompatResults(data, query), {
|
|
1107
1147
|
source: "search",
|
|
1108
|
-
sourceDetail:
|
|
1148
|
+
sourceDetail: options.provider,
|
|
1109
1149
|
}) + CITATION_INSTRUCTION,
|
|
1110
1150
|
isError: false,
|
|
1111
1151
|
activityMetadata: {
|
|
1112
|
-
webSearch:
|
|
1152
|
+
webSearch: buildFirecrawlCompatMetadata(
|
|
1153
|
+
data,
|
|
1154
|
+
query,
|
|
1155
|
+
durationMs,
|
|
1156
|
+
options.provider,
|
|
1157
|
+
),
|
|
1113
1158
|
},
|
|
1114
1159
|
};
|
|
1115
1160
|
}
|
|
@@ -1119,9 +1164,9 @@ async function executeFirecrawlSearch(
|
|
|
1119
1164
|
if (response.status === 401 || response.status === 403) {
|
|
1120
1165
|
return errorResult(
|
|
1121
1166
|
query,
|
|
1122
|
-
|
|
1167
|
+
options.provider,
|
|
1123
1168
|
startedAt,
|
|
1124
|
-
|
|
1169
|
+
`Invalid or expired ${options.displayName} API key`,
|
|
1125
1170
|
);
|
|
1126
1171
|
}
|
|
1127
1172
|
|
|
@@ -1132,34 +1177,73 @@ async function executeFirecrawlSearch(
|
|
|
1132
1177
|
DEFAULT_BASE_DELAY_MS,
|
|
1133
1178
|
);
|
|
1134
1179
|
log.warn(
|
|
1135
|
-
{ attempt: attempt + 1, delayMs },
|
|
1136
|
-
|
|
1180
|
+
{ attempt: attempt + 1, delayMs, provider: options.provider },
|
|
1181
|
+
`${options.displayName} Search rate limited, retrying`,
|
|
1137
1182
|
);
|
|
1138
1183
|
await sleep(delayMs);
|
|
1139
1184
|
continue;
|
|
1140
1185
|
}
|
|
1141
1186
|
|
|
1142
|
-
log.warn(
|
|
1187
|
+
log.warn(
|
|
1188
|
+
{ status: response.status, provider: options.provider },
|
|
1189
|
+
`${options.displayName} Search API error`,
|
|
1190
|
+
);
|
|
1143
1191
|
return backendFailureResult(
|
|
1144
1192
|
query,
|
|
1145
|
-
|
|
1193
|
+
options.provider,
|
|
1146
1194
|
startedAt,
|
|
1147
1195
|
{ statusCode: response.status, error: rawBodyDetail(bodyText) },
|
|
1148
1196
|
response.status === 429
|
|
1149
|
-
?
|
|
1150
|
-
:
|
|
1197
|
+
? `${options.displayName} Search rate limit exceeded after retries. Try again shortly.`
|
|
1198
|
+
: `${options.displayName} Search API returned status ${response.status}`,
|
|
1151
1199
|
);
|
|
1152
1200
|
}
|
|
1153
1201
|
|
|
1154
1202
|
return backendFailureResult(
|
|
1155
1203
|
query,
|
|
1156
|
-
|
|
1204
|
+
options.provider,
|
|
1157
1205
|
startedAt,
|
|
1158
1206
|
{ statusCode: 429 },
|
|
1159
|
-
|
|
1207
|
+
`${options.displayName} Search rate limit exceeded after retries. Try again shortly.`,
|
|
1160
1208
|
);
|
|
1161
1209
|
}
|
|
1162
1210
|
|
|
1211
|
+
function executeFirecrawlSearch(
|
|
1212
|
+
query: string,
|
|
1213
|
+
count: number,
|
|
1214
|
+
freshness: string | undefined,
|
|
1215
|
+
apiKey: string,
|
|
1216
|
+
signal?: AbortSignal,
|
|
1217
|
+
): Promise<ToolExecutionResult> {
|
|
1218
|
+
return executeFirecrawlCompatSearch(query, count, freshness, apiKey, {
|
|
1219
|
+
endpoint: FIRECRAWL_API_URL,
|
|
1220
|
+
provider: "firecrawl",
|
|
1221
|
+
displayName: "Firecrawl",
|
|
1222
|
+
signal,
|
|
1223
|
+
});
|
|
1224
|
+
}
|
|
1225
|
+
|
|
1226
|
+
function executeFastcrwSearch(
|
|
1227
|
+
query: string,
|
|
1228
|
+
count: number,
|
|
1229
|
+
freshness: string | undefined,
|
|
1230
|
+
apiKey: string,
|
|
1231
|
+
signal?: AbortSignal,
|
|
1232
|
+
): Promise<ToolExecutionResult> {
|
|
1233
|
+
const apiBase = getConfig().services["web-search"]?.apiBase;
|
|
1234
|
+
const endpoint = resolveProviderApiUrl(
|
|
1235
|
+
apiBase,
|
|
1236
|
+
FASTCRW_SEARCH_PATH,
|
|
1237
|
+
FASTCRW_DEFAULT_API_BASE,
|
|
1238
|
+
);
|
|
1239
|
+
return executeFirecrawlCompatSearch(query, count, freshness, apiKey, {
|
|
1240
|
+
endpoint,
|
|
1241
|
+
provider: "fastcrw",
|
|
1242
|
+
displayName: "fastCRW",
|
|
1243
|
+
signal,
|
|
1244
|
+
});
|
|
1245
|
+
}
|
|
1246
|
+
|
|
1163
1247
|
async function executeKeenableSearch(
|
|
1164
1248
|
query: string,
|
|
1165
1249
|
count: number,
|
|
@@ -1327,6 +1411,14 @@ const keenableSearchAdapter: WebSearchAdapter = {
|
|
|
1327
1411
|
executeKeenableSearch(query, count, freshness, apiKey, signal),
|
|
1328
1412
|
};
|
|
1329
1413
|
|
|
1414
|
+
const fastcrwSearchAdapter: WebSearchAdapter = {
|
|
1415
|
+
id: "fastcrw",
|
|
1416
|
+
providerKeyName: "fastcrw",
|
|
1417
|
+
fallbackOrder: 6,
|
|
1418
|
+
execute: ({ query, count, freshness, apiKey, signal }) =>
|
|
1419
|
+
executeFastcrwSearch(query, count, freshness, apiKey, signal),
|
|
1420
|
+
};
|
|
1421
|
+
|
|
1330
1422
|
/**
|
|
1331
1423
|
* All built-in web-search adapters keyed by provider id. The
|
|
1332
1424
|
* `Record<WebSearchProvider, ...>` shape forces TypeScript to flag any
|
|
@@ -1338,6 +1430,7 @@ const WEB_SEARCH_ADAPTERS: Record<WebSearchProvider, WebSearchAdapter> = {
|
|
|
1338
1430
|
tavily: tavilySearchAdapter,
|
|
1339
1431
|
firecrawl: firecrawlSearchAdapter,
|
|
1340
1432
|
keenable: keenableSearchAdapter,
|
|
1433
|
+
fastcrw: fastcrwSearchAdapter,
|
|
1341
1434
|
};
|
|
1342
1435
|
|
|
1343
1436
|
/**
|
|
@@ -1369,7 +1462,7 @@ export const webSearchTool = {
|
|
|
1369
1462
|
count: {
|
|
1370
1463
|
type: "number",
|
|
1371
1464
|
description:
|
|
1372
|
-
"Number of results to return (1-20, default 10). Used with Brave, Tavily, Firecrawl, and
|
|
1465
|
+
"Number of results to return (1-20, default 10). Used with Brave, Tavily, Firecrawl, Keenable, and fastCRW providers.",
|
|
1373
1466
|
},
|
|
1374
1467
|
offset: {
|
|
1375
1468
|
type: "number",
|
|
@@ -1379,7 +1472,7 @@ export const webSearchTool = {
|
|
|
1379
1472
|
freshness: {
|
|
1380
1473
|
type: "string",
|
|
1381
1474
|
description:
|
|
1382
|
-
'Filter by recency: "pd" (past day), "pw" (past week), "pm" (past month), "py" (past year). Used with Brave, Tavily, Firecrawl, and
|
|
1475
|
+
'Filter by recency: "pd" (past day), "pw" (past week), "pm" (past month), "py" (past year). Used with Brave, Tavily, Firecrawl, Keenable, and fastCRW providers.',
|
|
1383
1476
|
},
|
|
1384
1477
|
},
|
|
1385
1478
|
required: ["query"],
|
|
@@ -1444,13 +1537,24 @@ export const webSearchTool = {
|
|
|
1444
1537
|
let provider = getWebSearchProvider();
|
|
1445
1538
|
let apiKey = await getApiKey(provider);
|
|
1446
1539
|
|
|
1540
|
+
const webSearchApiBase = getConfig().services["web-search"]?.apiBase;
|
|
1541
|
+
const fastcrwAllowsKeylessSelfHost =
|
|
1542
|
+
provider === "fastcrw" &&
|
|
1543
|
+
typeof webSearchApiBase === "string" &&
|
|
1544
|
+
webSearchApiBase.trim().length > 0;
|
|
1545
|
+
|
|
1447
1546
|
// A keyless provider (e.g. Keenable) runs without a stored key, so skip the
|
|
1448
1547
|
// missing-key fallback/error entirely and execute it as configured.
|
|
1548
|
+
// fastCRW with a custom API Base may also run without a key (self-hosted).
|
|
1449
1549
|
// Fallback: if a key-based provider has no key, try other BYOK search
|
|
1450
1550
|
// providers in a stable order. This preserves existing installs that only
|
|
1451
1551
|
// configured one search-provider key while still allowing new providers to
|
|
1452
1552
|
// be selected explicitly.
|
|
1453
|
-
if (
|
|
1553
|
+
if (
|
|
1554
|
+
!apiKey &&
|
|
1555
|
+
!WEB_SEARCH_ADAPTERS[provider].keyless &&
|
|
1556
|
+
!fastcrwAllowsKeylessSelfHost
|
|
1557
|
+
) {
|
|
1454
1558
|
for (const fallback of fallbackProvidersFor(provider)) {
|
|
1455
1559
|
const fallbackKey = await getApiKey(fallback);
|
|
1456
1560
|
if (!fallbackKey) {
|
|
@@ -1484,7 +1588,7 @@ export const webSearchTool = {
|
|
|
1484
1588
|
query,
|
|
1485
1589
|
provider,
|
|
1486
1590
|
startedAt,
|
|
1487
|
-
"No web search API key configured. Set it via `keys set perplexity <key>`, `keys set brave <key>`, `keys set tavily <key>`, or `keys set
|
|
1591
|
+
"No web search API key configured. Set it via `keys set perplexity <key>`, `keys set brave <key>`, `keys set tavily <key>`, `keys set firecrawl <key>`, or `keys set fastcrw <key>`, or configure it from the Settings page under API Keys. Or switch the web-search provider to Keenable, which works without a key.",
|
|
1488
1592
|
);
|
|
1489
1593
|
}
|
|
1490
1594
|
}
|
|
@@ -1,13 +1,18 @@
|
|
|
1
|
+
import type {
|
|
2
|
+
RiskAllowlistOption,
|
|
3
|
+
RiskDirectoryScopeOption,
|
|
4
|
+
RiskPatternScopeOption,
|
|
5
|
+
} from "@vellumai/gateway-client";
|
|
6
|
+
|
|
1
7
|
import { getIsContainerized } from "../config/env-registry.js";
|
|
2
8
|
import { mapApprovalProvenance } from "../permissions/approval-provenance.js";
|
|
3
9
|
import { buildChannelPermissionCellQuery } from "../permissions/channel-permission-query.js";
|
|
4
10
|
import {
|
|
5
11
|
check,
|
|
6
12
|
classifyRisk,
|
|
7
|
-
generateAllowlistOptions,
|
|
8
13
|
generateScopeOptions,
|
|
9
|
-
getCachedAssessment,
|
|
10
14
|
isDynamicSkillLoadInvocation,
|
|
15
|
+
type RiskClassificationWithMeta,
|
|
11
16
|
} from "../permissions/checker.js";
|
|
12
17
|
import { getAutoApproveThreshold } from "../permissions/gateway-threshold-reader.js";
|
|
13
18
|
import type { PermissionPrompter } from "../permissions/prompter.js";
|
|
@@ -37,19 +42,15 @@ export type PermissionDecision =
|
|
|
37
42
|
decision: string;
|
|
38
43
|
riskLevel: string;
|
|
39
44
|
wasPrompted?: boolean;
|
|
40
|
-
/** ID of the trust rule that matched this invocation (if any).
|
|
45
|
+
/** ID of the trust rule that matched this invocation (if any). */
|
|
41
46
|
matchedTrustRuleId?: string;
|
|
42
|
-
/** Risk metadata from the
|
|
43
|
-
riskMeta
|
|
47
|
+
/** Risk metadata from the invocation's classification. */
|
|
48
|
+
riskMeta: {
|
|
44
49
|
riskLevel: string;
|
|
45
50
|
riskReason: string;
|
|
46
|
-
riskScopeOptions:
|
|
47
|
-
riskAllowlistOptions?:
|
|
48
|
-
|
|
49
|
-
description: string;
|
|
50
|
-
pattern: string;
|
|
51
|
-
}>;
|
|
52
|
-
riskDirectoryScopeOptions?: Array<{ scope: string; label: string }>;
|
|
51
|
+
riskScopeOptions: RiskPatternScopeOption[];
|
|
52
|
+
riskAllowlistOptions?: RiskAllowlistOption[];
|
|
53
|
+
riskDirectoryScopeOptions?: RiskDirectoryScopeOption[];
|
|
53
54
|
isContainerized?: boolean;
|
|
54
55
|
};
|
|
55
56
|
approvalMode?: ApprovalMode;
|
|
@@ -61,19 +62,15 @@ export type PermissionDecision =
|
|
|
61
62
|
decision: string;
|
|
62
63
|
riskLevel: string;
|
|
63
64
|
content: string;
|
|
64
|
-
/** ID of the trust rule that matched this invocation (if any).
|
|
65
|
+
/** ID of the trust rule that matched this invocation (if any). */
|
|
65
66
|
matchedTrustRuleId?: string;
|
|
66
|
-
/** Risk metadata from the
|
|
67
|
-
riskMeta
|
|
67
|
+
/** Risk metadata from the invocation's classification. */
|
|
68
|
+
riskMeta: {
|
|
68
69
|
riskLevel: string;
|
|
69
70
|
riskReason: string;
|
|
70
|
-
riskScopeOptions:
|
|
71
|
-
riskAllowlistOptions?:
|
|
72
|
-
|
|
73
|
-
description: string;
|
|
74
|
-
pattern: string;
|
|
75
|
-
}>;
|
|
76
|
-
riskDirectoryScopeOptions?: Array<{ scope: string; label: string }>;
|
|
71
|
+
riskScopeOptions: RiskPatternScopeOption[];
|
|
72
|
+
riskAllowlistOptions?: RiskAllowlistOption[];
|
|
73
|
+
riskDirectoryScopeOptions?: RiskDirectoryScopeOption[];
|
|
77
74
|
isContainerized?: boolean;
|
|
78
75
|
};
|
|
79
76
|
approvalMode?: ApprovalMode;
|
|
@@ -89,10 +86,13 @@ export class PermissionChecker {
|
|
|
89
86
|
}
|
|
90
87
|
|
|
91
88
|
/**
|
|
92
|
-
* Run
|
|
93
|
-
*
|
|
94
|
-
*
|
|
95
|
-
*
|
|
89
|
+
* Run trust rule evaluation and (if needed) user prompting for a tool
|
|
90
|
+
* invocation. Returns whether the tool is allowed to execute, along with
|
|
91
|
+
* the decision string and risk level for lifecycle event reporting.
|
|
92
|
+
*
|
|
93
|
+
* `classification` is the invocation's gateway classification when the
|
|
94
|
+
* executor already holds it (it classifies once, before its gates); absent
|
|
95
|
+
* that, the same input is classified here.
|
|
96
96
|
*/
|
|
97
97
|
async checkPermission(
|
|
98
98
|
name: string,
|
|
@@ -113,10 +113,11 @@ export class PermissionChecker {
|
|
|
113
113
|
}
|
|
114
114
|
| undefined
|
|
115
115
|
>,
|
|
116
|
+
classification?: RiskClassificationWithMeta,
|
|
116
117
|
): Promise<PermissionDecision> {
|
|
117
118
|
// Sandbox/host routing for the prompt comes from the tool's manifest.
|
|
118
119
|
const executionTarget = resolveExecutionTarget(tool);
|
|
119
|
-
|
|
120
|
+
classification ??= await classifyRisk(
|
|
120
121
|
name,
|
|
121
122
|
input,
|
|
122
123
|
context.workingDir,
|
|
@@ -124,26 +125,19 @@ export class PermissionChecker {
|
|
|
124
125
|
undefined,
|
|
125
126
|
context.signal,
|
|
126
127
|
);
|
|
128
|
+
const { level: risk, reason: riskReason } = classification;
|
|
127
129
|
const riskLevel: string = risk;
|
|
128
130
|
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
// Save ladder (Minimatch globs — what the gateway matches against).
|
|
140
|
-
// Populated for classifiers that produce allowlist options
|
|
141
|
-
// (bash, file, skill); undefined otherwise.
|
|
142
|
-
riskAllowlistOptions: cachedAssessment.allowlistOptions,
|
|
143
|
-
riskDirectoryScopeOptions: cachedAssessment.directoryScopeOptions,
|
|
144
|
-
isContainerized: getIsContainerized(),
|
|
145
|
-
}
|
|
146
|
-
: undefined;
|
|
131
|
+
const riskMeta = {
|
|
132
|
+
riskLevel: classification.level,
|
|
133
|
+
riskReason: classification.reason,
|
|
134
|
+
// Display ladder: bash only, internal, never persisted as a rule.
|
|
135
|
+
riskScopeOptions: classification.scopeOptions,
|
|
136
|
+
// Save ladder: the patterns the gateway matches a rule by, exactly.
|
|
137
|
+
riskAllowlistOptions: classification.allowlistOptions,
|
|
138
|
+
riskDirectoryScopeOptions: classification.directoryScopeOptions,
|
|
139
|
+
isContainerized: getIsContainerized(),
|
|
140
|
+
};
|
|
147
141
|
|
|
148
142
|
// Wrap the rest of permission evaluation so that any exception
|
|
149
143
|
// carries the classified risk level back to the caller. Without
|
|
@@ -158,6 +152,7 @@ export class PermissionChecker {
|
|
|
158
152
|
policyContext,
|
|
159
153
|
undefined,
|
|
160
154
|
context.signal,
|
|
155
|
+
classification,
|
|
161
156
|
);
|
|
162
157
|
|
|
163
158
|
// Every threshold read for this invocation must consult the same
|
|
@@ -240,7 +235,7 @@ export class PermissionChecker {
|
|
|
240
235
|
if (
|
|
241
236
|
context.isInteractive === false &&
|
|
242
237
|
isDynamicSkillLoadInvocation(name, input) &&
|
|
243
|
-
|
|
238
|
+
classification.matchType !== "user_rule"
|
|
244
239
|
) {
|
|
245
240
|
log.info(
|
|
246
241
|
{ toolName: name, riskLevel },
|
|
@@ -385,11 +380,7 @@ export class PermissionChecker {
|
|
|
385
380
|
context.workingDir,
|
|
386
381
|
);
|
|
387
382
|
const promptOptions = {
|
|
388
|
-
allowlistOptions:
|
|
389
|
-
name,
|
|
390
|
-
input,
|
|
391
|
-
context.signal,
|
|
392
|
-
),
|
|
383
|
+
allowlistOptions: classification.allowlistOptions ?? [],
|
|
393
384
|
scopeOptions: generateScopeOptions(context.workingDir, name),
|
|
394
385
|
persistentDecisionsAllowed: !context.requireFreshApproval,
|
|
395
386
|
};
|
|
@@ -410,7 +401,7 @@ export class PermissionChecker {
|
|
|
410
401
|
context.toolUseId,
|
|
411
402
|
riskReason,
|
|
412
403
|
getIsContainerized(),
|
|
413
|
-
|
|
404
|
+
classification.directoryScopeOptions,
|
|
414
405
|
);
|
|
415
406
|
|
|
416
407
|
const decision = response.decision;
|
|
@@ -6,6 +6,45 @@ import type { ToolDefinition } from "../providers/types.js";
|
|
|
6
6
|
*/
|
|
7
7
|
export const ACTIVITY_SKIP_SET = new Set<string>();
|
|
8
8
|
|
|
9
|
+
/** The status field injected into every advertised tool input schema. */
|
|
10
|
+
export const ACTIVITY_FIELD = "activity";
|
|
11
|
+
|
|
12
|
+
const ACTIVITY_PROPERTY = {
|
|
13
|
+
type: "string",
|
|
14
|
+
description:
|
|
15
|
+
"Brief, natural description of what you're doing, shown as a live status update (e.g. 'Checking your project settings')",
|
|
16
|
+
};
|
|
17
|
+
|
|
18
|
+
/**
|
|
19
|
+
* Add the injected `activity` property to a schema, so a validator checking a
|
|
20
|
+
* call against the tool's own schema accepts the field the advertised schema
|
|
21
|
+
* asked the model to send.
|
|
22
|
+
*
|
|
23
|
+
* `injectActivityField` rewrites the definitions the model sees, not the
|
|
24
|
+
* manifest a skill tool validates against, so without this the model is
|
|
25
|
+
* offered a field its own tool then rejects as unknown. The property is added
|
|
26
|
+
* but never the `required` entry: the advertised copy asks for it, and a call
|
|
27
|
+
* that leaves it out is still a call the tool can serve.
|
|
28
|
+
*/
|
|
29
|
+
export function withActivityProperty(
|
|
30
|
+
schema: Record<string, unknown> | undefined,
|
|
31
|
+
): Record<string, unknown> | undefined {
|
|
32
|
+
if (!schema || schema.type !== "object") {
|
|
33
|
+
return schema;
|
|
34
|
+
}
|
|
35
|
+
const properties = schema.properties;
|
|
36
|
+
if (typeof properties !== "object" || properties === null) {
|
|
37
|
+
return schema;
|
|
38
|
+
}
|
|
39
|
+
if (schemaDefinesProperty(schema, ACTIVITY_FIELD)) {
|
|
40
|
+
return schema;
|
|
41
|
+
}
|
|
42
|
+
return {
|
|
43
|
+
...schema,
|
|
44
|
+
properties: { ...properties, [ACTIVITY_FIELD]: ACTIVITY_PROPERTY },
|
|
45
|
+
};
|
|
46
|
+
}
|
|
47
|
+
|
|
9
48
|
/**
|
|
10
49
|
* Injects an `activity` string property into each tool definition's input
|
|
11
50
|
* schema, unless the tool is in the skip set, already has an activity field,
|
|
@@ -46,11 +85,7 @@ export function injectActivityField(
|
|
|
46
85
|
// Deep clone to avoid mutating shared refs
|
|
47
86
|
const newProperties = {
|
|
48
87
|
...properties,
|
|
49
|
-
|
|
50
|
-
type: "string",
|
|
51
|
-
description:
|
|
52
|
-
"Brief, natural description of what you're doing, shown as a live status update (e.g. 'Checking your project settings')",
|
|
53
|
-
},
|
|
88
|
+
[ACTIVITY_FIELD]: ACTIVITY_PROPERTY,
|
|
54
89
|
};
|
|
55
90
|
const existingRequired = Array.isArray(schema.required)
|
|
56
91
|
? [...schema.required, "activity"]
|