@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
|
@@ -7,12 +7,11 @@
|
|
|
7
7
|
* Extracted from inbound-message-handler.ts to keep the top-level handler
|
|
8
8
|
* focused on orchestration.
|
|
9
9
|
*/
|
|
10
|
-
import type {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
} from "../../../channels/slack-callback-url.js";
|
|
10
|
+
import type {
|
|
11
|
+
AssistantActivityPhase,
|
|
12
|
+
AssistantEvent,
|
|
13
|
+
} from "../../../api/index.js";
|
|
14
|
+
import { resolveGuardianPromptDelivery } from "../../../approvals/guardian-channel-delivery.js";
|
|
16
15
|
import type { ChannelId, InterfaceId } from "../../../channels/types.js";
|
|
17
16
|
import {
|
|
18
17
|
getGuardianDelivery,
|
|
@@ -20,6 +19,11 @@ import {
|
|
|
20
19
|
} from "../../../contacts/guardian-delivery-reader.js";
|
|
21
20
|
import { isConversationBusyError } from "../../../daemon/conversation-messaging.js";
|
|
22
21
|
import type { TrustContext } from "../../../daemon/trust-context-types.js";
|
|
22
|
+
import {
|
|
23
|
+
channelActivityRefreshMs,
|
|
24
|
+
setChannelActivity,
|
|
25
|
+
supportsChannelActivity,
|
|
26
|
+
} from "../../../messaging/providers/index.js";
|
|
23
27
|
import {
|
|
24
28
|
getSiblingStreamedReplyTs,
|
|
25
29
|
linkMessage,
|
|
@@ -49,11 +53,6 @@ import type {
|
|
|
49
53
|
} from "../../http-types.js";
|
|
50
54
|
import { hasDeliverableAssistantText } from "../../no-response.js";
|
|
51
55
|
import { createSlackReplySession } from "../../slack-reply-session.js";
|
|
52
|
-
import type { TaskProgressData } from "../../slack-task-progress.js";
|
|
53
|
-
import {
|
|
54
|
-
getTaskProgressDataFromSurfaceData,
|
|
55
|
-
mergeTaskProgressData,
|
|
56
|
-
} from "../../slack-task-progress.js";
|
|
57
56
|
import { isContactTrustClass } from "../../trust-class.js";
|
|
58
57
|
import { resolveRoutingState } from "../../trust-context-resolver.js";
|
|
59
58
|
import { finalizeEventDelivery } from "../channel-delivery-routes.js";
|
|
@@ -161,29 +160,14 @@ export function processChannelMessageInBackground(
|
|
|
161
160
|
// `channel-turn-admission.ts` for why channel turns defer rather than route
|
|
162
161
|
// through the SSE-oriented conversation queue.
|
|
163
162
|
void withChannelTurnAdmission(conversationId, async () => {
|
|
164
|
-
const
|
|
165
|
-
sourceChannel,
|
|
166
|
-
replyCallbackUrl,
|
|
167
|
-
)
|
|
168
|
-
? replyCallbackUrl
|
|
169
|
-
: undefined;
|
|
170
|
-
const stopTypingHeartbeat = typingCallbackUrl
|
|
171
|
-
? startTelegramTypingHeartbeat(
|
|
172
|
-
typingCallbackUrl,
|
|
173
|
-
externalChatId,
|
|
174
|
-
assistantId,
|
|
175
|
-
)
|
|
176
|
-
: undefined;
|
|
177
|
-
|
|
178
|
-
const slackThinkingStatus = createSlackThinkingStatusController({
|
|
179
|
-
sourceChannel,
|
|
163
|
+
const channelActivity = startChannelActivity({
|
|
180
164
|
replyCallbackUrl,
|
|
165
|
+
conversationId,
|
|
181
166
|
chatId: externalChatId,
|
|
182
|
-
|
|
183
|
-
startImmediately:
|
|
184
|
-
sourceChannel,
|
|
167
|
+
initiatorUserId: slackInbound?.actorExternalUserId,
|
|
168
|
+
startImmediately: shouldShowActivityImmediately({
|
|
185
169
|
chatType,
|
|
186
|
-
slackBotMentioned,
|
|
170
|
+
botMentioned: slackBotMentioned,
|
|
187
171
|
}),
|
|
188
172
|
});
|
|
189
173
|
const stopApprovalWatcher = replyCallbackUrl
|
|
@@ -193,6 +177,7 @@ export function processChannelMessageInBackground(
|
|
|
193
177
|
externalChatId,
|
|
194
178
|
trustClass: trustCtx.trustClass,
|
|
195
179
|
guardianExternalUserId: trustCtx.guardianExternalUserId,
|
|
180
|
+
guardianChatId: trustCtx.guardianChatId,
|
|
196
181
|
requesterExternalUserId: trustCtx.requesterExternalUserId,
|
|
197
182
|
replyCallbackUrl,
|
|
198
183
|
assistantId,
|
|
@@ -230,7 +215,6 @@ export function processChannelMessageInBackground(
|
|
|
230
215
|
chatType,
|
|
231
216
|
replyCallbackUrl,
|
|
232
217
|
chatId: externalChatId,
|
|
233
|
-
assistantId,
|
|
234
218
|
recipientUserId: slackInbound?.actorExternalUserId,
|
|
235
219
|
recipientTeamId: slackInbound?.actorTeamId,
|
|
236
220
|
// Durably record the streamed message `ts` the instant the stream
|
|
@@ -247,7 +231,7 @@ export function processChannelMessageInBackground(
|
|
|
247
231
|
replyMessageId = msg.messageId;
|
|
248
232
|
}
|
|
249
233
|
slackReplySession?.observeEvent(msg);
|
|
250
|
-
|
|
234
|
+
channelActivity?.observeEvent(msg);
|
|
251
235
|
};
|
|
252
236
|
|
|
253
237
|
let userMessageId: string | undefined;
|
|
@@ -369,8 +353,7 @@ export function processChannelMessageInBackground(
|
|
|
369
353
|
}
|
|
370
354
|
}
|
|
371
355
|
} finally {
|
|
372
|
-
|
|
373
|
-
slackThinkingStatus?.stop();
|
|
356
|
+
channelActivity?.stop();
|
|
374
357
|
stopApprovalWatcher?.();
|
|
375
358
|
stopTcApprovalNotifier?.();
|
|
376
359
|
}
|
|
@@ -383,404 +366,198 @@ export function processChannelMessageInBackground(
|
|
|
383
366
|
}
|
|
384
367
|
|
|
385
368
|
// ---------------------------------------------------------------------------
|
|
386
|
-
//
|
|
369
|
+
// Channel activity indicator
|
|
387
370
|
// ---------------------------------------------------------------------------
|
|
388
371
|
|
|
389
372
|
/**
|
|
390
|
-
* How often the
|
|
391
|
-
*
|
|
392
|
-
*
|
|
393
|
-
* and the Bot API offers no stop/start pair to hold one open, so showing
|
|
394
|
-
* typing across a multi-second turn means re-sending on a timer. The interval
|
|
395
|
-
* has to stay under that expiry or the indicator blinks off between beats;
|
|
396
|
-
* anyone changing it should check the current window first.
|
|
397
|
-
*
|
|
398
|
-
* No explicit stop is needed on the delivery path: Telegram clears the status
|
|
399
|
-
* as soon as the bot sends a message.
|
|
400
|
-
*
|
|
401
|
-
* https://core.telegram.org/bots/api#sendchataction
|
|
373
|
+
* How often the phase is recomputed for a channel whose indicator holds until
|
|
374
|
+
* it is changed. Such a channel is only called when the phase actually moves,
|
|
375
|
+
* so this costs a comparison rather than a request.
|
|
402
376
|
*/
|
|
403
|
-
const
|
|
404
|
-
|
|
405
|
-
function shouldEmitTelegramTyping(
|
|
406
|
-
sourceChannel: ChannelId,
|
|
407
|
-
replyCallbackUrl?: string,
|
|
408
|
-
): boolean {
|
|
409
|
-
if (sourceChannel !== "telegram" || !replyCallbackUrl) {
|
|
410
|
-
return false;
|
|
411
|
-
}
|
|
412
|
-
try {
|
|
413
|
-
return new URL(replyCallbackUrl).pathname.endsWith("/deliver/telegram");
|
|
414
|
-
} catch {
|
|
415
|
-
return replyCallbackUrl.endsWith("/deliver/telegram");
|
|
416
|
-
}
|
|
417
|
-
}
|
|
418
|
-
|
|
419
|
-
function startTelegramTypingHeartbeat(
|
|
420
|
-
callbackUrl: string,
|
|
421
|
-
chatId: string,
|
|
422
|
-
assistantId?: string,
|
|
423
|
-
): () => void {
|
|
424
|
-
let active = true;
|
|
425
|
-
let inFlight = false;
|
|
426
|
-
|
|
427
|
-
const emitTyping = (): void => {
|
|
428
|
-
if (!active || inFlight) {
|
|
429
|
-
return;
|
|
430
|
-
}
|
|
431
|
-
inFlight = true;
|
|
432
|
-
void deliverChannelReply(callbackUrl, {
|
|
433
|
-
chatId,
|
|
434
|
-
chatAction: "typing",
|
|
435
|
-
assistantId,
|
|
436
|
-
})
|
|
437
|
-
.catch((err) => {
|
|
438
|
-
log.debug(
|
|
439
|
-
{ err, chatId },
|
|
440
|
-
"Failed to deliver Telegram typing indicator",
|
|
441
|
-
);
|
|
442
|
-
})
|
|
443
|
-
.finally(() => {
|
|
444
|
-
inFlight = false;
|
|
445
|
-
});
|
|
446
|
-
};
|
|
447
|
-
|
|
448
|
-
emitTyping();
|
|
449
|
-
|
|
450
|
-
const interval = setInterval(emitTyping, TELEGRAM_TYPING_INTERVAL_MS);
|
|
451
|
-
(interval as { unref?: () => void }).unref?.();
|
|
452
|
-
|
|
453
|
-
return () => {
|
|
454
|
-
active = false;
|
|
455
|
-
clearInterval(interval);
|
|
456
|
-
};
|
|
457
|
-
}
|
|
458
|
-
|
|
459
|
-
// ---------------------------------------------------------------------------
|
|
460
|
-
// Slack Assistants API thinking status indicator
|
|
461
|
-
// ---------------------------------------------------------------------------
|
|
377
|
+
const ACTIVITY_PHASE_POLL_MS = 1_000;
|
|
462
378
|
|
|
463
|
-
type
|
|
379
|
+
type ChannelActivityController = {
|
|
464
380
|
observeEvent: (msg: AssistantEvent) => void;
|
|
465
381
|
stop: () => void;
|
|
466
382
|
};
|
|
467
383
|
|
|
468
|
-
|
|
469
|
-
updateLoadingMessages: (loadingMessages?: string[]) => void;
|
|
470
|
-
clear: () => void;
|
|
471
|
-
};
|
|
472
|
-
|
|
473
|
-
export function shouldStartSlackThinkingStatusForText(text: string): boolean {
|
|
384
|
+
export function shouldShowActivityForText(text: string): boolean {
|
|
474
385
|
return hasDeliverableAssistantText(text);
|
|
475
386
|
}
|
|
476
387
|
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
|
|
481
|
-
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
388
|
+
/**
|
|
389
|
+
* Room shapes with one other participant, in each channel's own word for it.
|
|
390
|
+
*
|
|
391
|
+
* SHIM. `chatType` reaches the daemon as whatever the channel called it, so one
|
|
392
|
+
* idea arrives under three spellings and a fourth channel would add a fourth.
|
|
393
|
+
* It belongs normalized at ingress, where each channel already parses its own
|
|
394
|
+
* payload and knows the answer. Until then this is the single place that has to
|
|
395
|
+
* widen for a new channel, and the single place to delete once it does not.
|
|
396
|
+
*
|
|
397
|
+
* Slack's `mpim` is deliberately absent: a group DM has other readers, so it is
|
|
398
|
+
* a room rather than a direct conversation.
|
|
399
|
+
*/
|
|
400
|
+
const DIRECT_CHAT_TYPES: ReadonlySet<string> = new Set([
|
|
401
|
+
"im", // Slack
|
|
402
|
+
"dm", // Discord
|
|
403
|
+
"private", // Telegram
|
|
404
|
+
]);
|
|
485
405
|
|
|
486
|
-
|
|
487
|
-
|
|
406
|
+
/**
|
|
407
|
+
* Whether the assistant should show it is working before it has produced any
|
|
408
|
+
* text: it was addressed directly, so a reply is expected either way.
|
|
409
|
+
*/
|
|
410
|
+
export function shouldShowActivityImmediately(params: {
|
|
488
411
|
chatType?: string;
|
|
489
|
-
|
|
412
|
+
botMentioned?: boolean;
|
|
490
413
|
}): boolean {
|
|
491
|
-
|
|
492
|
-
|
|
493
|
-
|
|
494
|
-
|
|
414
|
+
return (
|
|
415
|
+
(params.chatType !== undefined && DIRECT_CHAT_TYPES.has(params.chatType)) ||
|
|
416
|
+
params.botMentioned === true
|
|
417
|
+
);
|
|
495
418
|
}
|
|
496
419
|
|
|
497
|
-
|
|
498
|
-
|
|
420
|
+
/**
|
|
421
|
+
* Drive one conversation's activity indicator for the length of a turn.
|
|
422
|
+
*
|
|
423
|
+
* The indicator is held back until the turn is known to be producing a reply,
|
|
424
|
+
* because a channel where the assistant was not addressed may process a
|
|
425
|
+
* message and decide to stay quiet, and an indicator there promises something
|
|
426
|
+
* that is not coming. Being addressed directly is enough on its own.
|
|
427
|
+
*
|
|
428
|
+
* TRANSITIONAL: the phase is derived here from what this dispatch knows, and
|
|
429
|
+
* the daemon already publishes the same lifecycle as `assistant_activity_state`
|
|
430
|
+
* with a monotonic version. That event reaches conversation observers rather
|
|
431
|
+
* than this turn's `onEvent`, so consuming it is its own change; until then
|
|
432
|
+
* this is a second derivation of one lifecycle and should not be extended.
|
|
433
|
+
*/
|
|
434
|
+
function startChannelActivity(params: {
|
|
499
435
|
replyCallbackUrl?: string;
|
|
436
|
+
conversationId: string;
|
|
500
437
|
chatId: string;
|
|
501
|
-
|
|
502
|
-
startImmediately
|
|
503
|
-
}):
|
|
504
|
-
const {
|
|
505
|
-
|
|
506
|
-
replyCallbackUrl,
|
|
507
|
-
chatId,
|
|
508
|
-
assistantId,
|
|
509
|
-
startImmediately,
|
|
510
|
-
} = params;
|
|
511
|
-
if (
|
|
512
|
-
!replyCallbackUrl ||
|
|
513
|
-
!shouldEmitSlackThinkingStatus(sourceChannel, replyCallbackUrl)
|
|
514
|
-
) {
|
|
438
|
+
initiatorUserId?: string;
|
|
439
|
+
startImmediately: boolean;
|
|
440
|
+
}): ChannelActivityController | undefined {
|
|
441
|
+
const { replyCallbackUrl, conversationId, chatId, initiatorUserId } = params;
|
|
442
|
+
if (!replyCallbackUrl || !supportsChannelActivity(replyCallbackUrl)) {
|
|
515
443
|
return undefined;
|
|
516
444
|
}
|
|
517
|
-
const
|
|
445
|
+
const url = replyCallbackUrl;
|
|
518
446
|
|
|
447
|
+
const refreshMs = channelActivityRefreshMs(url);
|
|
519
448
|
let stopped = false;
|
|
520
|
-
let
|
|
449
|
+
let showing = false;
|
|
521
450
|
let observedAssistantText = "";
|
|
522
|
-
let
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
451
|
+
let lastPhase: AssistantActivityPhase | undefined;
|
|
452
|
+
|
|
453
|
+
// Serialized so a later phase cannot overtake an earlier one and leave the
|
|
454
|
+
// channel showing a state the turn has already left.
|
|
455
|
+
let pending: Promise<unknown> = Promise.resolve();
|
|
456
|
+
let outstanding = 0;
|
|
457
|
+
|
|
458
|
+
const deliver = (phase: AssistantActivityPhase): Promise<boolean> =>
|
|
459
|
+
setChannelActivity(url, {
|
|
460
|
+
chatId,
|
|
461
|
+
phase,
|
|
462
|
+
...(initiatorUserId ? { initiatorUserId } : {}),
|
|
463
|
+
})
|
|
464
|
+
.then((result) => result.ok)
|
|
465
|
+
.catch((err) => {
|
|
466
|
+
log.debug({ err, chatId, phase }, "Failed to set channel activity");
|
|
467
|
+
return false;
|
|
468
|
+
});
|
|
469
|
+
|
|
470
|
+
/**
|
|
471
|
+
* `refresh` is a re-assertion of a phase the channel is already showing, so
|
|
472
|
+
* it is dropped whenever anything is still outstanding. A slow channel would
|
|
473
|
+
* otherwise queue one per tick, and a busy phase that runs after the turn's
|
|
474
|
+
* `idle` raises the indicator again on a turn that has finished.
|
|
475
|
+
*
|
|
476
|
+
* `outstanding` counts sends that are queued or running, not just the one in
|
|
477
|
+
* flight. A flag cannot express two at once: the earlier link's completion
|
|
478
|
+
* would clear it while its successor is still waiting its turn on the chain,
|
|
479
|
+
* and the next tick would queue a third.
|
|
480
|
+
*/
|
|
481
|
+
const send = (
|
|
482
|
+
phase: AssistantActivityPhase,
|
|
483
|
+
options?: { refresh?: boolean; retryOnce?: boolean },
|
|
484
|
+
): void => {
|
|
485
|
+
if (options?.refresh && outstanding > 0) {
|
|
530
486
|
return;
|
|
531
487
|
}
|
|
532
|
-
|
|
533
|
-
|
|
534
|
-
|
|
535
|
-
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
488
|
+
lastPhase = phase;
|
|
489
|
+
outstanding += 1;
|
|
490
|
+
pending = pending
|
|
491
|
+
.then(async () => {
|
|
492
|
+
const ok = await deliver(phase);
|
|
493
|
+
// A lost terminal transition is not cosmetic: a channel that holds its
|
|
494
|
+
// indicator keeps showing the assistant as working until something
|
|
495
|
+
// else changes it, which on Slack is an hour away.
|
|
496
|
+
if (!ok && options?.retryOnce) {
|
|
497
|
+
await deliver(phase);
|
|
498
|
+
}
|
|
499
|
+
})
|
|
500
|
+
.finally(() => {
|
|
501
|
+
outstanding -= 1;
|
|
502
|
+
});
|
|
539
503
|
};
|
|
540
504
|
|
|
541
|
-
const
|
|
542
|
-
|
|
543
|
-
|
|
505
|
+
const currentPhase = (): AssistantActivityPhase =>
|
|
506
|
+
getApprovalInfoByConversation(conversationId).length > 0
|
|
507
|
+
? "awaiting_confirmation"
|
|
508
|
+
: "thinking";
|
|
509
|
+
|
|
510
|
+
const tick = (): void => {
|
|
511
|
+
if (stopped || !showing) {
|
|
544
512
|
return;
|
|
545
513
|
}
|
|
546
|
-
|
|
547
|
-
|
|
514
|
+
const phase = currentPhase();
|
|
515
|
+
// A channel whose indicator expires needs the same phase re-asserted; one
|
|
516
|
+
// that holds only needs to hear about a change.
|
|
517
|
+
if (phase !== lastPhase) {
|
|
518
|
+
send(phase);
|
|
519
|
+
} else if (refreshMs !== undefined) {
|
|
520
|
+
send(phase, { refresh: true });
|
|
521
|
+
}
|
|
548
522
|
};
|
|
549
523
|
|
|
550
|
-
const
|
|
551
|
-
|
|
552
|
-
|
|
553
|
-
|
|
554
|
-
|
|
555
|
-
}
|
|
556
|
-
taskProgressBySurfaceId.set(msg.surfaceId, progress);
|
|
557
|
-
} else if (msg.type === "ui_surface_update") {
|
|
558
|
-
const existing = taskProgressBySurfaceId.get(msg.surfaceId);
|
|
559
|
-
const progress = mergeTaskProgressData(existing, msg.data);
|
|
560
|
-
if (!progress) {
|
|
561
|
-
return;
|
|
562
|
-
}
|
|
563
|
-
taskProgressBySurfaceId.set(msg.surfaceId, progress);
|
|
564
|
-
} else {
|
|
524
|
+
const interval = setInterval(tick, refreshMs ?? ACTIVITY_PHASE_POLL_MS);
|
|
525
|
+
(interval as { unref?: () => void }).unref?.();
|
|
526
|
+
|
|
527
|
+
const show = (): void => {
|
|
528
|
+
if (stopped || showing) {
|
|
565
529
|
return;
|
|
566
530
|
}
|
|
567
|
-
|
|
568
|
-
|
|
569
|
-
getTaskProgressLoadingMessage(
|
|
570
|
-
taskProgressBySurfaceId.get(msg.surfaceId),
|
|
571
|
-
) ?? [];
|
|
572
|
-
maybeUpdateLoadingMessages();
|
|
531
|
+
showing = true;
|
|
532
|
+
send(currentPhase());
|
|
573
533
|
};
|
|
574
534
|
|
|
575
|
-
if (startImmediately) {
|
|
576
|
-
|
|
535
|
+
if (params.startImmediately) {
|
|
536
|
+
show();
|
|
577
537
|
}
|
|
578
538
|
|
|
579
539
|
return {
|
|
580
540
|
observeEvent(msg) {
|
|
581
|
-
if (stopped) {
|
|
582
|
-
return;
|
|
583
|
-
}
|
|
584
|
-
|
|
585
|
-
if (msg.type === "ui_surface_show" || msg.type === "ui_surface_update") {
|
|
586
|
-
observeTaskProgress(msg);
|
|
541
|
+
if (stopped || showing || msg.type !== "assistant_text_delta") {
|
|
587
542
|
return;
|
|
588
543
|
}
|
|
589
|
-
|
|
590
|
-
if (slackThinkingStatus || msg.type !== "assistant_text_delta") {
|
|
591
|
-
return;
|
|
592
|
-
}
|
|
593
|
-
|
|
594
544
|
observedAssistantText += msg.text;
|
|
595
|
-
if (
|
|
596
|
-
|
|
545
|
+
if (shouldShowActivityForText(observedAssistantText)) {
|
|
546
|
+
show();
|
|
597
547
|
}
|
|
598
548
|
},
|
|
599
549
|
stop() {
|
|
600
|
-
stopped
|
|
601
|
-
slackThinkingStatus?.clear();
|
|
602
|
-
},
|
|
603
|
-
};
|
|
604
|
-
}
|
|
605
|
-
|
|
606
|
-
const SLACK_THINKING_MAX_DURATION_MS = 120_000;
|
|
607
|
-
const SLACK_GENERIC_LOADING_MESSAGES = ["Thinking…"] as const;
|
|
608
|
-
const SLACK_THINKING_STATUSES = ["is on it", "is working hard"] as const;
|
|
609
|
-
|
|
610
|
-
function getRandomSlackThinkingStatus(): string {
|
|
611
|
-
return SLACK_THINKING_STATUSES[
|
|
612
|
-
Math.floor(Math.random() * SLACK_THINKING_STATUSES.length)
|
|
613
|
-
]!;
|
|
614
|
-
}
|
|
615
|
-
|
|
616
|
-
function getLoadingMessagesKey(loadingMessages?: string[]): string | undefined {
|
|
617
|
-
return loadingMessages?.join("\n");
|
|
618
|
-
}
|
|
619
|
-
|
|
620
|
-
function getTaskProgressLoadingMessage(
|
|
621
|
-
progress: TaskProgressData | undefined,
|
|
622
|
-
): string[] | undefined {
|
|
623
|
-
if (!progress) {
|
|
624
|
-
return undefined;
|
|
625
|
-
}
|
|
626
|
-
|
|
627
|
-
const activeStepIndex = progress.steps.findIndex(
|
|
628
|
-
(step) => step.status === "in_progress",
|
|
629
|
-
);
|
|
630
|
-
if (activeStepIndex < 0) {
|
|
631
|
-
return undefined;
|
|
632
|
-
}
|
|
633
|
-
|
|
634
|
-
const activeStep = progress.steps[activeStepIndex]!;
|
|
635
|
-
return [
|
|
636
|
-
`In progress (${activeStepIndex + 1}/${progress.steps.length}): ${
|
|
637
|
-
activeStep.label
|
|
638
|
-
}`,
|
|
639
|
-
];
|
|
640
|
-
}
|
|
641
|
-
|
|
642
|
-
/**
|
|
643
|
-
* Set Slack Assistants API status on the thread and return a handle for
|
|
644
|
-
* updating loading messages or clearing the indicator.
|
|
645
|
-
*
|
|
646
|
-
* A safety timer auto-clears the status after {@link SLACK_THINKING_MAX_DURATION_MS}
|
|
647
|
-
* to prevent a stuck indicator when `processMessage` hangs.
|
|
648
|
-
*/
|
|
649
|
-
function setSlackThinkingStatus(
|
|
650
|
-
callbackUrl: string,
|
|
651
|
-
chatId: string,
|
|
652
|
-
assistantId?: string,
|
|
653
|
-
loadingMessages?: string[],
|
|
654
|
-
): SlackThinkingStatusHandle {
|
|
655
|
-
let cleared = false;
|
|
656
|
-
|
|
657
|
-
// Extract the thread timestamp from the callback URL so we can target
|
|
658
|
-
// the correct thread for the Assistants API status.
|
|
659
|
-
const threadTs = extractThreadTsFromCallbackUrl(callbackUrl);
|
|
660
|
-
|
|
661
|
-
// For non-threaded DMs, fall back to emoji reaction on the original message.
|
|
662
|
-
if (!threadTs) {
|
|
663
|
-
const messageTs = extractMessageTsFromCallbackUrl(callbackUrl);
|
|
664
|
-
if (!messageTs) {
|
|
665
|
-
return {
|
|
666
|
-
updateLoadingMessages: () => {},
|
|
667
|
-
clear: () => {},
|
|
668
|
-
};
|
|
669
|
-
}
|
|
670
|
-
|
|
671
|
-
const addPromise = deliverChannelReply(callbackUrl, {
|
|
672
|
-
chatId,
|
|
673
|
-
assistantId,
|
|
674
|
-
reaction: { action: "add", name: "eyes", messageTs },
|
|
675
|
-
}).catch((err) => {
|
|
676
|
-
log.debug(
|
|
677
|
-
{ err, chatId, messageTs },
|
|
678
|
-
"Failed to add Slack eyes reaction",
|
|
679
|
-
);
|
|
680
|
-
});
|
|
681
|
-
|
|
682
|
-
const clearReaction = (): void => {
|
|
683
|
-
if (cleared) {
|
|
550
|
+
if (stopped) {
|
|
684
551
|
return;
|
|
685
552
|
}
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
689
|
-
|
|
690
|
-
|
|
691
|
-
|
|
692
|
-
|
|
693
|
-
}).catch((err) => {
|
|
694
|
-
log.debug(
|
|
695
|
-
{ err, chatId, messageTs },
|
|
696
|
-
"Failed to remove Slack eyes reaction",
|
|
697
|
-
);
|
|
698
|
-
}),
|
|
699
|
-
);
|
|
700
|
-
};
|
|
701
|
-
|
|
702
|
-
const safetyTimer = setTimeout(
|
|
703
|
-
clearReaction,
|
|
704
|
-
SLACK_THINKING_MAX_DURATION_MS,
|
|
705
|
-
);
|
|
706
|
-
(safetyTimer as { unref?: () => void }).unref?.();
|
|
707
|
-
|
|
708
|
-
return {
|
|
709
|
-
updateLoadingMessages: () => {},
|
|
710
|
-
clear: clearReaction,
|
|
711
|
-
};
|
|
712
|
-
}
|
|
713
|
-
|
|
714
|
-
// Track the set promise so clear waits for it to settle first,
|
|
715
|
-
// preventing a race where clear arrives at Slack before set.
|
|
716
|
-
let statusPromise = deliverChannelReply(callbackUrl, {
|
|
717
|
-
chatId,
|
|
718
|
-
assistantId,
|
|
719
|
-
assistantThreadStatus: {
|
|
720
|
-
channel: chatId,
|
|
721
|
-
threadTs,
|
|
722
|
-
status: getRandomSlackThinkingStatus(),
|
|
723
|
-
...(loadingMessages ? { loadingMessages } : {}),
|
|
553
|
+
stopped = true;
|
|
554
|
+
clearInterval(interval);
|
|
555
|
+
// Only owed when something was shown. `idle` is a real transition on
|
|
556
|
+
// channels that hold the indicator, not a no-op clear.
|
|
557
|
+
if (showing) {
|
|
558
|
+
send("idle", { retryOnce: true });
|
|
559
|
+
}
|
|
724
560
|
},
|
|
725
|
-
}).catch((err) => {
|
|
726
|
-
log.debug({ err, chatId, threadTs }, "Failed to set Slack thinking status");
|
|
727
|
-
});
|
|
728
|
-
|
|
729
|
-
const updateLoadingMessages = (nextLoadingMessages?: string[]): void => {
|
|
730
|
-
if (cleared) {
|
|
731
|
-
return;
|
|
732
|
-
}
|
|
733
|
-
statusPromise = statusPromise.then(() =>
|
|
734
|
-
deliverChannelReply(callbackUrl, {
|
|
735
|
-
chatId,
|
|
736
|
-
assistantId,
|
|
737
|
-
assistantThreadStatus: {
|
|
738
|
-
channel: chatId,
|
|
739
|
-
threadTs,
|
|
740
|
-
status: getRandomSlackThinkingStatus(),
|
|
741
|
-
...(nextLoadingMessages
|
|
742
|
-
? { loadingMessages: nextLoadingMessages }
|
|
743
|
-
: {}),
|
|
744
|
-
},
|
|
745
|
-
}).catch((err) => {
|
|
746
|
-
log.debug(
|
|
747
|
-
{ err, chatId, threadTs },
|
|
748
|
-
"Failed to update Slack thinking status",
|
|
749
|
-
);
|
|
750
|
-
}),
|
|
751
|
-
);
|
|
752
|
-
};
|
|
753
|
-
|
|
754
|
-
const clearStatus = (): void => {
|
|
755
|
-
if (cleared) {
|
|
756
|
-
return;
|
|
757
|
-
}
|
|
758
|
-
cleared = true;
|
|
759
|
-
clearTimeout(safetyTimer);
|
|
760
|
-
void statusPromise.then(() =>
|
|
761
|
-
deliverChannelReply(callbackUrl, {
|
|
762
|
-
chatId,
|
|
763
|
-
assistantId,
|
|
764
|
-
assistantThreadStatus: {
|
|
765
|
-
channel: chatId,
|
|
766
|
-
threadTs,
|
|
767
|
-
status: "",
|
|
768
|
-
},
|
|
769
|
-
}).catch((err) => {
|
|
770
|
-
log.debug(
|
|
771
|
-
{ err, chatId, threadTs },
|
|
772
|
-
"Failed to clear Slack thinking status",
|
|
773
|
-
);
|
|
774
|
-
}),
|
|
775
|
-
);
|
|
776
|
-
};
|
|
777
|
-
|
|
778
|
-
const safetyTimer = setTimeout(clearStatus, SLACK_THINKING_MAX_DURATION_MS);
|
|
779
|
-
(safetyTimer as { unref?: () => void }).unref?.();
|
|
780
|
-
|
|
781
|
-
return {
|
|
782
|
-
updateLoadingMessages,
|
|
783
|
-
clear: clearStatus,
|
|
784
561
|
};
|
|
785
562
|
}
|
|
786
563
|
|
|
@@ -796,6 +573,7 @@ function startPendingApprovalPromptWatcher(params: {
|
|
|
796
573
|
externalChatId: string;
|
|
797
574
|
trustClass: TrustContext["trustClass"];
|
|
798
575
|
guardianExternalUserId?: string;
|
|
576
|
+
guardianChatId?: string;
|
|
799
577
|
requesterExternalUserId?: string;
|
|
800
578
|
replyCallbackUrl: string;
|
|
801
579
|
assistantId?: string;
|
|
@@ -807,6 +585,7 @@ function startPendingApprovalPromptWatcher(params: {
|
|
|
807
585
|
externalChatId,
|
|
808
586
|
trustClass,
|
|
809
587
|
guardianExternalUserId,
|
|
588
|
+
guardianChatId,
|
|
810
589
|
requesterExternalUserId,
|
|
811
590
|
replyCallbackUrl,
|
|
812
591
|
assistantId,
|
|
@@ -838,9 +617,17 @@ function startPendingApprovalPromptWatcher(params: {
|
|
|
838
617
|
const info = pending[0];
|
|
839
618
|
if (prompt && info && !deliveredRequestIds.has(info.requestId)) {
|
|
840
619
|
deliveredRequestIds.add(info.requestId);
|
|
620
|
+
// Addressed to the guardian's own chat, not the chat the turn is
|
|
621
|
+
// running in, which can be a room that reads the tool and its
|
|
622
|
+
// command preview.
|
|
623
|
+
const promptDelivery = resolveGuardianPromptDelivery({
|
|
624
|
+
turnChatId: externalChatId,
|
|
625
|
+
turnCallbackUrl: replyCallbackUrl,
|
|
626
|
+
guardianChatId,
|
|
627
|
+
});
|
|
841
628
|
const delivered = await deliverGeneratedApprovalPrompt({
|
|
842
|
-
replyCallbackUrl,
|
|
843
|
-
chatId:
|
|
629
|
+
replyCallbackUrl: promptDelivery.callbackUrl,
|
|
630
|
+
chatId: promptDelivery.chatId,
|
|
844
631
|
sourceChannel,
|
|
845
632
|
assistantId: assistantId ?? DAEMON_INTERNAL_ASSISTANT_ID,
|
|
846
633
|
prompt,
|