@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
|
@@ -14,6 +14,22 @@ let deliverImpl: (
|
|
|
14
14
|
ts: "stream-ts-1",
|
|
15
15
|
});
|
|
16
16
|
|
|
17
|
+
const sentStreamOps: Array<Record<string, unknown>> = [];
|
|
18
|
+
let streamOpImpl: (op: Record<string, unknown>) => Promise<{
|
|
19
|
+
ok: boolean;
|
|
20
|
+
ts?: string;
|
|
21
|
+
}> = async () => ({ ok: true, ts: "stream-ts-1" });
|
|
22
|
+
mock.module("../messaging/providers/index.js", () => ({
|
|
23
|
+
sendChannelStreamOp: async (
|
|
24
|
+
_callbackUrl: string,
|
|
25
|
+
_chatId: string,
|
|
26
|
+
op: Record<string, unknown>,
|
|
27
|
+
) => {
|
|
28
|
+
sentStreamOps.push(op);
|
|
29
|
+
return streamOpImpl(op);
|
|
30
|
+
},
|
|
31
|
+
}));
|
|
32
|
+
|
|
17
33
|
mock.module("./gateway-client.js", () => ({
|
|
18
34
|
deliverChannelReply: async (
|
|
19
35
|
callbackUrl: string,
|
|
@@ -96,10 +112,7 @@ const taskProgressUpdate = (
|
|
|
96
112
|
const tick = (ms: number): Promise<void> =>
|
|
97
113
|
new Promise((resolve) => setTimeout(resolve, ms));
|
|
98
114
|
|
|
99
|
-
const slackStreamOps = (): Array<Record<string, unknown>> =>
|
|
100
|
-
deliverCalls
|
|
101
|
-
.map((call) => call.payload.slackStream as Record<string, unknown>)
|
|
102
|
-
.filter(Boolean);
|
|
115
|
+
const slackStreamOps = (): Array<Record<string, unknown>> => sentStreamOps;
|
|
103
116
|
|
|
104
117
|
const streamedMarkdown = (): string =>
|
|
105
118
|
slackStreamOps()
|
|
@@ -108,6 +121,8 @@ const streamedMarkdown = (): string =>
|
|
|
108
121
|
|
|
109
122
|
beforeEach(() => {
|
|
110
123
|
deliverCalls.length = 0;
|
|
124
|
+
sentStreamOps.length = 0;
|
|
125
|
+
streamOpImpl = async () => ({ ok: true, ts: "stream-ts-1" });
|
|
111
126
|
deliverImpl = async () => ({ ok: true, ts: "stream-ts-1" });
|
|
112
127
|
});
|
|
113
128
|
|
|
@@ -314,7 +329,7 @@ describe("createSlackReplySession", () => {
|
|
|
314
329
|
});
|
|
315
330
|
|
|
316
331
|
test("falls back when startStream returns no stream ts", async () => {
|
|
317
|
-
|
|
332
|
+
streamOpImpl = async () => ({ ok: false });
|
|
318
333
|
const session = createSlackReplySession({
|
|
319
334
|
sourceChannel: "slack",
|
|
320
335
|
chatType: "im",
|
|
@@ -331,7 +346,7 @@ describe("createSlackReplySession", () => {
|
|
|
331
346
|
});
|
|
332
347
|
|
|
333
348
|
test("falls back when startStream throws", async () => {
|
|
334
|
-
|
|
349
|
+
streamOpImpl = async () => {
|
|
335
350
|
throw new Error("rate limited");
|
|
336
351
|
};
|
|
337
352
|
const session = createSlackReplySession({
|
|
@@ -349,8 +364,7 @@ describe("createSlackReplySession", () => {
|
|
|
349
364
|
});
|
|
350
365
|
|
|
351
366
|
test("falls back when stopStream throws after streaming text", async () => {
|
|
352
|
-
|
|
353
|
-
const op = payload.slackStream as { action: string };
|
|
367
|
+
streamOpImpl = async (op) => {
|
|
354
368
|
if (op.action === "stop") {
|
|
355
369
|
throw new Error("stop failed");
|
|
356
370
|
}
|
|
@@ -482,11 +496,7 @@ describe("createSlackReplySession", () => {
|
|
|
482
496
|
});
|
|
483
497
|
|
|
484
498
|
test("leaves progress to stop when the task-only append fails", async () => {
|
|
485
|
-
|
|
486
|
-
const op = payload.slackStream as {
|
|
487
|
-
action: string;
|
|
488
|
-
markdownText?: string;
|
|
489
|
-
};
|
|
499
|
+
streamOpImpl = async (op) => {
|
|
490
500
|
if (op.action === "append" && op.markdownText === undefined) {
|
|
491
501
|
throw new Error("chunks-only append rejected");
|
|
492
502
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { SlackStreamTask } from "@vellumai/gateway-client";
|
|
1
|
+
import type { SlackStreamOp, SlackStreamTask } from "@vellumai/gateway-client";
|
|
2
2
|
|
|
3
3
|
import type { AssistantEvent } from "../api/index.js";
|
|
4
4
|
import {
|
|
@@ -10,11 +10,11 @@ import {
|
|
|
10
10
|
incompleteVellumLinkSuffixLength,
|
|
11
11
|
stripVellumLinks,
|
|
12
12
|
} from "../daemon/assistant-attachments.js";
|
|
13
|
+
import { sendChannelStreamOp } from "../messaging/providers/index.js";
|
|
13
14
|
import { SLACK_STREAM_MARKDOWN_LIMIT } from "../messaging/providers/slack/api.js";
|
|
14
15
|
import { renderSlackBlocks } from "../messaging/providers/slack/render.js";
|
|
15
16
|
import { getLogger } from "../util/logger.js";
|
|
16
17
|
import { needsBoundarySpace } from "../util/text-spacing.js";
|
|
17
|
-
import { deliverChannelReply } from "./gateway-client.js";
|
|
18
18
|
import {
|
|
19
19
|
hasDeliverableAssistantText,
|
|
20
20
|
NO_RESPONSE_INLINE_RE,
|
|
@@ -113,7 +113,6 @@ export function createSlackReplySession(params: {
|
|
|
113
113
|
chatType?: string;
|
|
114
114
|
replyCallbackUrl?: string;
|
|
115
115
|
chatId: string;
|
|
116
|
-
assistantId?: string;
|
|
117
116
|
/** Slack user ID of the reader; required to stream into a channel. */
|
|
118
117
|
recipientUserId?: string;
|
|
119
118
|
/** Slack team ID of the reader; required to stream into a channel. */
|
|
@@ -132,7 +131,7 @@ export function createSlackReplySession(params: {
|
|
|
132
131
|
if (!shouldStreamSlackReply(params) || !params.replyCallbackUrl) {
|
|
133
132
|
return undefined;
|
|
134
133
|
}
|
|
135
|
-
const { chatId,
|
|
134
|
+
const { chatId, recipientUserId, recipientTeamId } = params;
|
|
136
135
|
const coalesceMs = params.coalesceMs ?? STREAM_COALESCE_MS;
|
|
137
136
|
const replyCallbackUrl = params.replyCallbackUrl;
|
|
138
137
|
const threadTs = extractThreadTsFromCallbackUrl(replyCallbackUrl);
|
|
@@ -197,11 +196,11 @@ export function createSlackReplySession(params: {
|
|
|
197
196
|
): string | undefined =>
|
|
198
197
|
tasks ? JSON.stringify({ title, tasks }) : undefined;
|
|
199
198
|
|
|
199
|
+
// Typed from the stream operation these are passed to, so the element type
|
|
200
|
+
// follows that contract rather than drifting from it.
|
|
200
201
|
const imageBlocks = (
|
|
201
202
|
text: string,
|
|
202
|
-
):
|
|
203
|
-
| NonNullable<Parameters<typeof deliverChannelReply>[1]["blocks"]>
|
|
204
|
-
| undefined => {
|
|
203
|
+
): Extract<SlackStreamOp, { action: "stop" }>["blocks"] => {
|
|
205
204
|
const blocks = renderSlackBlocks(text)?.filter(
|
|
206
205
|
(block) => block.type === "image",
|
|
207
206
|
);
|
|
@@ -222,24 +221,20 @@ export function createSlackReplySession(params: {
|
|
|
222
221
|
const title = activeProgress?.title;
|
|
223
222
|
const tasks = planTasks();
|
|
224
223
|
try {
|
|
225
|
-
const result = await
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
...(tasks ? { tasks } : {}),
|
|
240
|
-
...(recipientUserId ? { recipientUserId } : {}),
|
|
241
|
-
...(recipientTeamId ? { recipientTeamId } : {}),
|
|
242
|
-
},
|
|
224
|
+
const result = await sendChannelStreamOp(replyCallbackUrl, chatId, {
|
|
225
|
+
action: "start",
|
|
226
|
+
threadTs,
|
|
227
|
+
markdownText: firstChunk,
|
|
228
|
+
// The task display mode is fixed for the stream's lifetime at
|
|
229
|
+
// start, while a `task_progress` surface usually appears only
|
|
230
|
+
// after the first text flush has opened the stream. Plan mode
|
|
231
|
+
// only affects how task chunks render, so a stream that never
|
|
232
|
+
// carries tasks still reads as a plain message.
|
|
233
|
+
taskDisplayMode: "plan" as const,
|
|
234
|
+
...(title ? { planTitle: title } : {}),
|
|
235
|
+
...(tasks ? { tasks } : {}),
|
|
236
|
+
...(recipientUserId ? { recipientUserId } : {}),
|
|
237
|
+
...(recipientTeamId ? { recipientTeamId } : {}),
|
|
243
238
|
});
|
|
244
239
|
if (result.ok && result.ts) {
|
|
245
240
|
streamTs = result.ts;
|
|
@@ -287,16 +282,12 @@ export function createSlackReplySession(params: {
|
|
|
287
282
|
confirmedLength + SLACK_STREAM_MARKDOWN_LIMIT,
|
|
288
283
|
);
|
|
289
284
|
try {
|
|
290
|
-
await
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
markdownText: chunk,
|
|
297
|
-
...(title ? { planTitle: title } : {}),
|
|
298
|
-
...(tasks ? { tasks } : {}),
|
|
299
|
-
},
|
|
285
|
+
await sendChannelStreamOp(replyCallbackUrl, chatId, {
|
|
286
|
+
action: "append",
|
|
287
|
+
streamTs,
|
|
288
|
+
markdownText: chunk,
|
|
289
|
+
...(title ? { planTitle: title } : {}),
|
|
290
|
+
...(tasks ? { tasks } : {}),
|
|
300
291
|
});
|
|
301
292
|
confirmedLength += chunk.length;
|
|
302
293
|
deliveredProgressKey = key ?? deliveredProgressKey;
|
|
@@ -316,15 +307,11 @@ export function createSlackReplySession(params: {
|
|
|
316
307
|
// next text append and `stopStream` carries the final state.
|
|
317
308
|
if (!taskOnlyAppendsDisabled && tasks && key !== deliveredProgressKey) {
|
|
318
309
|
try {
|
|
319
|
-
await
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
streamTs,
|
|
325
|
-
...(title ? { planTitle: title } : {}),
|
|
326
|
-
tasks,
|
|
327
|
-
},
|
|
310
|
+
await sendChannelStreamOp(replyCallbackUrl, chatId, {
|
|
311
|
+
action: "append",
|
|
312
|
+
streamTs,
|
|
313
|
+
...(title ? { planTitle: title } : {}),
|
|
314
|
+
tasks,
|
|
328
315
|
});
|
|
329
316
|
deliveredProgressKey = key;
|
|
330
317
|
} catch (err) {
|
|
@@ -450,17 +437,13 @@ export function createSlackReplySession(params: {
|
|
|
450
437
|
const title = activeProgress?.title;
|
|
451
438
|
const tasks = planTasks();
|
|
452
439
|
try {
|
|
453
|
-
await
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
...(blocks ? { blocks } : {}),
|
|
461
|
-
...(title ? { planTitle: title } : {}),
|
|
462
|
-
...(tasks ? { tasks } : {}),
|
|
463
|
-
},
|
|
440
|
+
await sendChannelStreamOp(replyCallbackUrl, chatId, {
|
|
441
|
+
action: "stop",
|
|
442
|
+
streamTs,
|
|
443
|
+
...(remaining.length > 0 ? { markdownText: remaining } : {}),
|
|
444
|
+
...(blocks ? { blocks } : {}),
|
|
445
|
+
...(title ? { planTitle: title } : {}),
|
|
446
|
+
...(tasks ? { tasks } : {}),
|
|
464
447
|
});
|
|
465
448
|
confirmedLength = clean.length;
|
|
466
449
|
} catch (err) {
|
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Web presence policy.
|
|
3
|
+
*
|
|
4
|
+
* Answers exactly one question for notification producers: is the user
|
|
5
|
+
* demonstrably looking at this specific conversation in a web browser tab
|
|
6
|
+
* right now? Producers use the answer to skip an APNs push the user would
|
|
7
|
+
* see on screen anyway.
|
|
8
|
+
*
|
|
9
|
+
* Fails open by design, the same posture as desktop presence
|
|
10
|
+
* (`runtime/desktop-presence.ts`): presence is in-memory, best-effort, and
|
|
11
|
+
* reported by a client that can drop off (crash, network loss, backgrounded
|
|
12
|
+
* tab killed by the OS) without telling the daemon, so anything short of a
|
|
13
|
+
* fresh, visible, matching-conversation report answers `false` and the push
|
|
14
|
+
* goes out. A missed notification is strictly worse than a redundant one.
|
|
15
|
+
*
|
|
16
|
+
* Deliberately separate from desktop presence: a web report is scoped to one
|
|
17
|
+
* conversation (the tab's focused thread), not the whole app. The Electron
|
|
18
|
+
* desktop renderer detects its own host OS and tags its turns
|
|
19
|
+
* `macos`/`windows` (`detectClientOs()` in the web client), so an Electron
|
|
20
|
+
* turn is already covered by `isDesktopAttended()` and never reaches this
|
|
21
|
+
* gate. Do not fold this into `setClientPresence` / the `macos`-scoped
|
|
22
|
+
* desktop-attendance path.
|
|
23
|
+
*/
|
|
24
|
+
|
|
25
|
+
import { getLogger } from "../util/logger.js";
|
|
26
|
+
import { assistantEventHub } from "./assistant-event-hub.js";
|
|
27
|
+
|
|
28
|
+
const log = getLogger("web-presence");
|
|
29
|
+
|
|
30
|
+
/**
|
|
31
|
+
* Shared semantic + transport freshness bound. The semantic report says what
|
|
32
|
+
* the tab was showing; `lastActiveAt` says the owning SSE connection is still
|
|
33
|
+
* alive. Both must be fresh so a live-but-hidden stream cannot preserve an old
|
|
34
|
+
* visible report, and a fresh report cannot suppress after its transport dies.
|
|
35
|
+
*/
|
|
36
|
+
export const WEB_PRESENCE_STALE_AFTER_MS = 180_000;
|
|
37
|
+
|
|
38
|
+
export interface WebPresenceOptions {
|
|
39
|
+
/**
|
|
40
|
+
* Only count web clients whose verified actor principal matches this id.
|
|
41
|
+
* A client that connected without a principal (legacy or service token)
|
|
42
|
+
* never matches a supplied id.
|
|
43
|
+
*/
|
|
44
|
+
actorPrincipalId?: string;
|
|
45
|
+
/** Clock used for the staleness comparison. */
|
|
46
|
+
now?: Date;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
/**
|
|
50
|
+
* Whether some web client has reported, recently enough to trust, that the
|
|
51
|
+
* given conversation is visible and focused. Stale, absent, hidden,
|
|
52
|
+
* unfocused, non-web, and error reads all answer `false`.
|
|
53
|
+
*
|
|
54
|
+
* Callers whose notification targets one recipient must pass that
|
|
55
|
+
* recipient's `actorPrincipalId`, or another user's focused tab suppresses
|
|
56
|
+
* the push. Omitting it treats any matching web client as focus, which only
|
|
57
|
+
* suits notifications with no single recipient.
|
|
58
|
+
*/
|
|
59
|
+
export function isWebConversationFocused(
|
|
60
|
+
conversationId: string,
|
|
61
|
+
options: WebPresenceOptions = {},
|
|
62
|
+
): boolean {
|
|
63
|
+
const { actorPrincipalId, now = new Date() } = options;
|
|
64
|
+
try {
|
|
65
|
+
return assistantEventHub.listClientsByInterface("web").some((client) => {
|
|
66
|
+
if (
|
|
67
|
+
actorPrincipalId !== undefined &&
|
|
68
|
+
client.actorPrincipalId !== actorPrincipalId
|
|
69
|
+
) {
|
|
70
|
+
return false;
|
|
71
|
+
}
|
|
72
|
+
const report = client.webPresence;
|
|
73
|
+
if (!report) {
|
|
74
|
+
return false;
|
|
75
|
+
}
|
|
76
|
+
const nowMs = now.getTime();
|
|
77
|
+
if (
|
|
78
|
+
nowMs - report.reportedAt.getTime() > WEB_PRESENCE_STALE_AFTER_MS ||
|
|
79
|
+
nowMs - client.lastActiveAt.getTime() > WEB_PRESENCE_STALE_AFTER_MS
|
|
80
|
+
) {
|
|
81
|
+
return false;
|
|
82
|
+
}
|
|
83
|
+
return report.visible && report.focusedConversationId === conversationId;
|
|
84
|
+
});
|
|
85
|
+
} catch (err) {
|
|
86
|
+
// Returning false sends the push, which is the safe direction.
|
|
87
|
+
log.warn({ err }, "web presence read failed; treating as unfocused");
|
|
88
|
+
return false;
|
|
89
|
+
}
|
|
90
|
+
}
|
|
@@ -2,6 +2,7 @@ import { describe, expect, test } from "bun:test";
|
|
|
2
2
|
|
|
3
3
|
import {
|
|
4
4
|
escapeContentBoundaries,
|
|
5
|
+
escapeTagBoundaries,
|
|
5
6
|
parseExternalContentEnvelope,
|
|
6
7
|
unwrapExternalContentForDisplay,
|
|
7
8
|
wrapUntrustedContent,
|
|
@@ -79,6 +80,47 @@ describe("wrapUntrustedContent", () => {
|
|
|
79
80
|
});
|
|
80
81
|
});
|
|
81
82
|
|
|
83
|
+
describe("escapeTagBoundaries", () => {
|
|
84
|
+
// A complete literal tag is the easiest boundary to forge and the least
|
|
85
|
+
// interesting. Matching stops at the tag name so the near-misses a model
|
|
86
|
+
// still reads as a fence go too.
|
|
87
|
+
const VARIANTS = [
|
|
88
|
+
"</watch-timeline>",
|
|
89
|
+
"</watch-timeline >",
|
|
90
|
+
"</watch-timeline\n>",
|
|
91
|
+
"</WATCH-TIMELINE>",
|
|
92
|
+
"</WaTcH-TiMeLiNe>",
|
|
93
|
+
"</watch-timeline",
|
|
94
|
+
'</watch-timeline id="x">',
|
|
95
|
+
"<watch-timeline>",
|
|
96
|
+
"<watch-timeline",
|
|
97
|
+
];
|
|
98
|
+
|
|
99
|
+
for (const variant of VARIANTS) {
|
|
100
|
+
test(`neutralizes ${JSON.stringify(variant)}`, () => {
|
|
101
|
+
const escaped = escapeTagBoundaries(
|
|
102
|
+
`before ${variant} after`,
|
|
103
|
+
"watch-timeline",
|
|
104
|
+
);
|
|
105
|
+
expect(escaped).not.toMatch(/<\/?watch-timeline/i);
|
|
106
|
+
expect(escaped).toContain("<");
|
|
107
|
+
// Neutralized in place: the surrounding text is untouched.
|
|
108
|
+
expect(escaped.startsWith("before ")).toBe(true);
|
|
109
|
+
expect(escaped.endsWith(" after")).toBe(true);
|
|
110
|
+
});
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
test("leaves a different tag alone", () => {
|
|
114
|
+
const axTree = "<ax-tree>Window: Editor</ax-tree>";
|
|
115
|
+
expect(escapeTagBoundaries(axTree, "watch-timeline")).toBe(axTree);
|
|
116
|
+
});
|
|
117
|
+
|
|
118
|
+
test("leaves ordinary markup alone", () => {
|
|
119
|
+
const safe = "Hello, this is a normal note about <html> tags.";
|
|
120
|
+
expect(escapeTagBoundaries(safe, "watch-timeline")).toBe(safe);
|
|
121
|
+
});
|
|
122
|
+
});
|
|
123
|
+
|
|
82
124
|
describe("escapeContentBoundaries", () => {
|
|
83
125
|
test("escapes closing tag", () => {
|
|
84
126
|
expect(escapeContentBoundaries("</external_content>")).toBe(
|
|
@@ -58,6 +58,9 @@ const DEFAULT_BUDGETS: Record<UntrustedContentSource, number> = {
|
|
|
58
58
|
|
|
59
59
|
const UNTRUSTED_CONTENT_SOURCE_SET = new Set<string>(UNTRUSTED_CONTENT_SOURCES);
|
|
60
60
|
|
|
61
|
+
/** Name of the wrapper element untrusted content is fenced in. */
|
|
62
|
+
const EXTERNAL_CONTENT_TAG_NAME = "external_content";
|
|
63
|
+
|
|
61
64
|
const EXTERNAL_CONTENT_ENVELOPE_PATTERN =
|
|
62
65
|
/^<external_content\s+([^\r\n<>]*)>\n([\s\S]*)\n<\/external_content>$/;
|
|
63
66
|
|
|
@@ -113,24 +116,40 @@ export function unwrapExternalContentForDisplay(value: string): string {
|
|
|
113
116
|
}
|
|
114
117
|
|
|
115
118
|
/**
|
|
116
|
-
* Escape sequences that could forge or break out of
|
|
117
|
-
*
|
|
119
|
+
* Escape sequences that could forge or break out of a `<tagName>` fence
|
|
120
|
+
* placed around untrusted text. Case-insensitive to cover mixed-case
|
|
118
121
|
* evasion attempts.
|
|
119
122
|
*
|
|
120
123
|
* Both tag forms are escaped. A closing tag would end the fence early.
|
|
121
|
-
* An opening tag is subtler: it lets
|
|
122
|
-
*
|
|
123
|
-
*
|
|
124
|
-
*
|
|
125
|
-
*
|
|
124
|
+
* An opening tag is subtler: it lets untrusted text fabricate what reads
|
|
125
|
+
* as a second fence, one it gets to label with any attribute it likes, and
|
|
126
|
+
* it defeats any structural reasoning over the result, since a forged tag
|
|
127
|
+
* is indistinguishable from a real one. Nothing legitimate arrives from
|
|
128
|
+
* the outside world carrying either.
|
|
129
|
+
*
|
|
130
|
+
* Matching stops at the tag name rather than at a closing `>`, so the
|
|
131
|
+
* variants a model still reads as a boundary are all neutralized:
|
|
132
|
+
* `</tag >`, a newline before the `>`, an unclosed `</tag`, and anything
|
|
133
|
+
* with attributes. Requiring the full literal tag would let every one of
|
|
134
|
+
* those through.
|
|
135
|
+
*
|
|
136
|
+
* Not to be confused with `escapeAxTreeContent` in
|
|
137
|
+
* `context/outbound-sanitize.ts`, which escapes the closing `</ax-tree>`
|
|
138
|
+
* only and must keep doing so: AX-tree compaction finds whole blocks by
|
|
139
|
+
* their opening tag and replaces them with a placeholder.
|
|
126
140
|
*/
|
|
127
|
-
export function
|
|
141
|
+
export function escapeTagBoundaries(content: string, tagName: string): string {
|
|
128
142
|
return content.replace(
|
|
129
|
-
|
|
143
|
+
new RegExp(`</?${tagName}`, "gi"),
|
|
130
144
|
(match) => `<${match.slice(1)}`,
|
|
131
145
|
);
|
|
132
146
|
}
|
|
133
147
|
|
|
148
|
+
/** {@link escapeTagBoundaries} for the `<external_content>` wrapper. */
|
|
149
|
+
export function escapeContentBoundaries(content: string): string {
|
|
150
|
+
return escapeTagBoundaries(content, EXTERNAL_CONTENT_TAG_NAME);
|
|
151
|
+
}
|
|
152
|
+
|
|
134
153
|
// ---------------------------------------------------------------------------
|
|
135
154
|
// Helpers
|
|
136
155
|
// ---------------------------------------------------------------------------
|