@vellumai/assistant 0.12.1 → 0.12.2-staging.2
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 +4 -0
- package/ARCHITECTURE.md +20 -21
- package/docs/architecture/turn-actor.md +15 -8
- package/docs/guardian-request-flow.md +16 -0
- package/node_modules/@vellumai/slack-text/src/index.ts +13 -8
- package/node_modules/@vellumai/slack-text/src/label-resolution-entities.test.ts +95 -0
- package/openapi.yaml +360 -51
- package/package.json +3 -1
- package/scripts/smoke-desktop-window-theme.ts +186 -0
- package/src/__tests__/always-loaded-tools-guard.test.ts +18 -10
- package/src/__tests__/anthropic-provider.test.ts +0 -63
- package/src/__tests__/app-compiler.test.ts +6 -0
- package/src/__tests__/app-control-tool-schemas.test.ts +5 -2
- package/src/__tests__/app-dir-path-guard.test.ts +1 -3
- package/src/__tests__/assistant-event-hub-machine-name.test.ts +6 -7
- package/src/__tests__/assistant-event-hub.test.ts +44 -0
- package/src/__tests__/computer-use-skill-manifest-regression.test.ts +1 -1
- package/src/__tests__/computer-use-skill-proxy-bridge.test.ts +5 -2
- package/src/__tests__/computer-use-tools.test.ts +19 -7
- package/src/__tests__/config-schema-cmd.test.ts +2 -2
- package/src/__tests__/config-schema.test.ts +28 -29
- package/src/__tests__/config-watcher.test.ts +23 -8
- package/src/__tests__/connection-model-compat.test.ts +2 -2
- package/src/__tests__/conversation-key-store-disk-view.test.ts +1 -1
- package/src/__tests__/conversation-pairing.test.ts +26 -0
- package/src/__tests__/conversation-process-app-control-preactivation.test.ts +4 -10
- package/src/__tests__/conversation-queue.test.ts +48 -207
- package/src/__tests__/conversation-retry-discard.test.ts +54 -1
- package/src/__tests__/conversation-runtime-assembly.test.ts +28 -0
- package/src/__tests__/conversation-skill-tools.test.ts +27 -0
- package/src/__tests__/conversation-surfaces-app-control.test.ts +8 -3
- package/src/__tests__/conversation-surfaces-point-at-budget.test.ts +1 -0
- package/src/__tests__/conversation-surfaces-point-at-capability.test.ts +1 -0
- package/src/__tests__/conversation-surfaces-task-progress.test.ts +67 -0
- package/src/__tests__/conversation-title-service.test.ts +14 -10
- package/src/__tests__/conversation-tool-setup-app-refresh.test.ts +3 -5
- package/src/__tests__/conversation-tool-setup-attribution.test.ts +51 -0
- package/src/__tests__/credential-record-retire.test.ts +171 -1
- package/src/__tests__/credential-routes.test.ts +250 -3
- package/src/__tests__/credential-security-invariants.test.ts +5 -3
- package/src/__tests__/cu-unified-flow.test.ts +14 -4
- package/src/__tests__/document-sync-tags.test.ts +25 -0
- package/src/__tests__/drain-kick-guard.test.ts +0 -2
- package/src/__tests__/drain-requeue-on-contention.test.ts +0 -6
- package/src/__tests__/evict-conversations-for-reload.test.ts +1 -1
- package/src/__tests__/git-porcelain.test.ts +47 -0
- package/src/__tests__/heartbeat-service.test.ts +56 -40
- package/src/__tests__/helpers/set-workspace-mcp.ts +11 -0
- package/src/__tests__/host-bash-proxy.test.ts +26 -45
- package/src/__tests__/host-browser-proxy.test.ts +6 -17
- package/src/__tests__/host-cu-proxy.test.ts +596 -0
- package/src/__tests__/host-file-proxy-targeted.test.ts +23 -0
- package/src/__tests__/host-file-proxy.test.ts +11 -23
- package/src/__tests__/host-transfer-proxy-targeted.test.ts +30 -9
- package/src/__tests__/list-messages-camera-frame.test.ts +121 -0
- package/src/__tests__/llm-catalog-parity.test.ts +25 -0
- package/src/__tests__/mcp-auth-routes.test.ts +6 -9
- package/src/__tests__/mcp-config-secret-boundary.test.ts +78 -136
- package/src/__tests__/mcp-health-check.test.ts +8 -11
- package/src/__tests__/mcp-list-plugin-servers.test.ts +8 -10
- package/src/__tests__/message-deleted-hook-dispatch.test.ts +119 -0
- package/src/__tests__/messages-after-tiebreaker.test.ts +91 -0
- package/src/__tests__/messages-read-boundary-guard.test.ts +1 -1
- package/src/__tests__/messaging-send-tool.test.ts +355 -548
- package/src/__tests__/model-intents.test.ts +3 -0
- package/src/__tests__/notification-vellum-adapter.test.ts +85 -2
- package/src/__tests__/oauth-commands-routes.test.ts +168 -0
- package/src/__tests__/oauth-provider-profiles.test.ts +18 -0
- package/src/__tests__/oauth-provider-serializer.test.ts +22 -0
- package/src/__tests__/oauth-providers-routes.test.ts +1 -0
- package/src/__tests__/openai-provider.test.ts +1 -0
- package/src/__tests__/outlook-messaging-provider.test.ts +6 -6
- package/src/__tests__/platform-callback-registration.test.ts +8 -16
- package/src/__tests__/platform-client-verify-credential.test.ts +2 -0
- package/src/__tests__/plugin-import-boundary-guard.test.ts +14 -0
- package/src/__tests__/qdrant-manager.test.ts +132 -0
- package/src/__tests__/resolve-app.test.ts +135 -0
- package/src/__tests__/scaffold-managed-skill-tool.test.ts +229 -6
- package/src/__tests__/script-proxy-certs.test.ts +35 -0
- package/src/__tests__/secret-routes-acp-guard.test.ts +59 -1
- package/src/__tests__/service-account-token.test.ts +247 -0
- package/src/__tests__/skill-feature-flags-integration.test.ts +1 -1
- package/src/__tests__/skill-feature-flags.test.ts +2 -2
- package/src/__tests__/skills.test.ts +9 -4
- package/src/__tests__/source-fingerprint.test.ts +184 -0
- package/src/__tests__/subagent-tool-gate-mode.test.ts +70 -3
- package/src/__tests__/subagent-tools.test.ts +3 -2
- package/src/__tests__/telephony-tts-guard.test.ts +38 -3
- package/src/__tests__/test-support/computer-use-skill-harness.ts +3 -2
- package/src/__tests__/ui-channel-variants.test.ts +1 -56
- package/src/__tests__/unicode.test.ts +13 -0
- package/src/__tests__/vellum-self-knowledge-inline-command.test.ts +4 -0
- package/src/__tests__/watch-retro-tool-availability.test.ts +8 -17
- package/src/__tests__/workspace-git-service.test.ts +26 -0
- package/src/__tests__/workspace-migration-154-repair-retired-codex-gpt-5-4-model-ids.test.ts +336 -0
- package/src/acp/__tests__/acp-claude-oauth.test.ts +257 -6
- package/src/acp/__tests__/acp-credentials.test.ts +13 -0
- package/src/acp/__tests__/agent-process.test.ts +258 -4
- package/src/acp/__tests__/auth-required.test.ts +96 -0
- package/src/acp/__tests__/claude-token-refresh.test.ts +257 -0
- package/src/acp/__tests__/client-handler.test.ts +90 -2
- package/src/acp/__tests__/helpers/acp-model-option.ts +51 -0
- package/src/acp/__tests__/prepare-agent-env.test.ts +60 -1
- package/src/acp/__tests__/session-manager-persistence.test.ts +5 -1
- package/src/acp/__tests__/session-manager-resume.test.ts +270 -6
- package/src/acp/__tests__/session-manager-usage.test.ts +4 -2
- package/src/acp/__tests__/session-manager.test.ts +895 -4
- package/src/acp/acp-claude-oauth.ts +328 -14
- package/src/acp/acp-credentials.ts +19 -0
- package/src/acp/agent-process.test.ts +4 -1
- package/src/acp/agent-process.ts +96 -10
- package/src/acp/auth-required.ts +50 -1
- package/src/acp/auto-install.test.ts +9 -7
- package/src/acp/claude-token-refresh.ts +150 -0
- package/src/acp/client-handler.ts +16 -3
- package/src/acp/model-config.test.ts +166 -0
- package/src/acp/model-config.ts +138 -0
- package/src/acp/prepare-agent-env.ts +21 -6
- package/src/acp/resolve-agent.test.ts +220 -6
- package/src/acp/resolve-agent.ts +88 -23
- package/src/acp/session-manager.test.ts +196 -3
- package/src/acp/session-manager.ts +441 -18
- package/src/acp/types.ts +50 -5
- package/src/agent/loop.ts +1 -0
- package/src/api/events/acp-session-model-update.test.ts +88 -0
- package/src/api/events/acp-session-model-update.ts +46 -0
- package/src/api/events/app-files-changed.ts +4 -3
- package/src/api/events/notification-intent.ts +2 -0
- package/src/api/events/user-message-echo.ts +7 -1
- package/src/api/index.ts +6 -0
- package/src/api/responses/conversation-message.ts +5 -0
- package/src/apps/app-store.ts +1 -1
- package/src/apps/resolve-app.ts +81 -0
- package/src/apps/source-fingerprint.ts +266 -0
- package/src/avatar/identity-avatar.ts +7 -2
- package/src/bundler/app-compiler.ts +15 -0
- package/src/calls/__tests__/barge-in-guard.test.ts +81 -0
- package/src/{__tests__ → calls/__tests__}/call-controller.test.ts +503 -82
- package/src/{__tests__ → calls/__tests__}/media-stream-audio-transcode.test.ts +1 -1
- package/src/{__tests__ → calls/__tests__}/media-stream-output.test.ts +37 -8
- package/src/{__tests__ → calls/__tests__}/media-stream-parser.test.ts +1 -1
- package/src/{__tests__ → calls/__tests__}/media-stream-server-integration.test.ts +150 -57
- package/src/{__tests__ → calls/__tests__}/media-stream-stt-session.test.ts +5 -5
- package/src/{__tests__ → calls/__tests__}/media-turn-detector.test.ts +1 -1
- package/src/{live-voice → calls}/__tests__/progress-narration.test.ts +4 -4
- package/src/{live-voice → calls}/__tests__/progress-phrases.test.ts +1 -1
- package/src/calls/__tests__/voice-control-protocol.test.ts +120 -25
- package/src/calls/__tests__/voice-leg-coordinator.test.ts +229 -0
- package/src/calls/__tests__/voice-progress-cadence.test.ts +274 -0
- package/src/{__tests__/voice-session-bridge.test.ts → calls/__tests__/voice-session-bridge-turn-flow.test.ts} +20 -12
- package/src/calls/__tests__/voice-session-bridge.test.ts +56 -1
- package/src/calls/__tests__/voice-triage-escalate.test.ts +105 -0
- package/src/calls/barge-in-guard.ts +118 -0
- package/src/calls/call-constants.ts +24 -4
- package/src/calls/call-controller.ts +499 -199
- package/src/calls/call-transport.ts +16 -0
- package/src/calls/media-stream-output.ts +32 -0
- package/src/calls/media-stream-server.ts +82 -30
- package/src/calls/media-stream-stt-session.ts +15 -0
- package/src/{live-voice → calls}/progress-narration.ts +2 -2
- package/src/calls/resolve-call-tts-provider.ts +33 -2
- package/src/calls/tts-call-strategy.ts +9 -5
- package/src/calls/types.ts +2 -0
- package/src/calls/voice-control-protocol.ts +155 -21
- package/src/calls/voice-leg-coordinator.ts +189 -0
- package/src/calls/voice-progress-cadence.ts +423 -0
- package/src/calls/voice-session-bridge.ts +92 -72
- package/src/calls/voice-triage-escalate.ts +178 -59
- package/src/cli/commands/__tests__/apps.test.ts +245 -0
- package/src/cli/commands/__tests__/bash.test.ts +53 -0
- package/src/cli/commands/__tests__/roadmap.help.test.ts +19 -0
- package/src/cli/commands/apps.help.ts +67 -13
- package/src/cli/commands/apps.ts +183 -0
- package/src/cli/commands/bash.help.ts +8 -13
- package/src/cli/commands/bash.ts +7 -25
- package/src/cli/commands/channels/__tests__/send.test.ts +218 -0
- package/src/cli/commands/channels/index.help.ts +70 -2
- package/src/cli/commands/channels/index.ts +16 -3
- package/src/cli/commands/channels/send.ts +128 -0
- package/src/cli/commands/credentials.help.ts +6 -2
- package/src/cli/commands/credentials.ts +2 -2
- package/src/cli/commands/mcp.help.ts +8 -8
- package/src/cli/commands/mcp.ts +1 -1
- package/src/cli/commands/oauth/status.ts +5 -0
- package/src/cli/commands/roadmap.help.ts +5 -1
- package/src/cli/commands/roadmap.ts +1 -1
- package/src/cli/lib/bundled-marketplace.json +103 -90
- package/src/config/__tests__/default-profile-catalog.test.ts +22 -0
- package/src/config/__tests__/memory-retrospective-schema.test.ts +15 -1
- package/src/config/__tests__/platform-identity.test.ts +255 -0
- package/src/config/__tests__/platform-rehydration.test.ts +99 -9
- package/src/config/acp-agent-write.ts +43 -0
- package/src/config/acp-defaults.test.ts +13 -3
- package/src/config/acp-defaults.ts +23 -6
- package/src/config/acp-schema.test.ts +81 -0
- package/src/config/acp-schema.ts +30 -2
- package/src/config/bundled-skills/acp/SKILL.md +22 -14
- package/src/config/bundled-skills/acp/TOOLS.json +5 -1
- package/src/config/bundled-skills/app-builder/SKILL.md +12 -9
- package/src/config/bundled-skills/app-builder/references/CUSTOM_ROUTES.md +1 -1
- package/src/config/bundled-skills/computer-use/SKILL.md +29 -2
- package/src/config/bundled-skills/computer-use/TOOLS.json +99 -0
- package/src/config/bundled-skills/computer-use/tools/computer-use-sequence.ts +12 -0
- package/src/config/bundled-skills/media-processing/services/preprocess.ts +2 -1
- package/src/config/bundled-skills/media-processing/services/processing-pipeline.ts +2 -1
- package/src/config/bundled-skills/media-processing/tools/generate-clip.ts +2 -1
- package/src/config/bundled-skills/messaging/SKILL.md +3 -3
- package/src/config/bundled-skills/messaging/TOOLS.json +3 -3
- package/src/config/bundled-skills/messaging/tools/messaging-send.ts +67 -139
- package/src/config/bundled-skills/phone-calls/references/TRANSCRIPTS.md +1 -1
- package/src/config/bundled-skills/playbooks/tools/playbook-create.ts +2 -1
- package/src/config/bundled-skills/playbooks/tools/playbook-update.ts +2 -1
- package/src/config/bundled-skills/schedule/SKILL.md +3 -4
- package/src/config/bundled-skills/screen-annotation/SKILL.md +8 -1
- package/src/config/bundled-skills/screen-annotation/tools/screen-annotation.test.ts +4 -1
- package/src/config/bundled-skills/skill-management/TOOLS.json +6 -2
- package/src/config/bundled-skills/transcribe/tools/transcribe-media.ts +5 -2
- package/src/config/default-profile-catalog.ts +1 -1
- package/src/config/env.ts +2 -2
- package/src/config/feature-flag-registry.json +33 -13
- package/src/config/loader.ts +2 -0
- package/src/config/memory-v3-gate.test.ts +31 -0
- package/src/config/memory-v3-gate.ts +20 -16
- package/src/config/platform-identity.ts +201 -0
- package/src/config/platform-rehydration.ts +11 -27
- package/src/config/schema.ts +2 -2
- package/src/config/schemas/__tests__/live-voice.test.ts +8 -158
- package/src/config/schemas/__tests__/voice.test.ts +148 -0
- package/src/config/schemas/calls.ts +1 -28
- package/src/config/schemas/live-voice.ts +1 -173
- package/src/config/schemas/mcp.ts +1 -1
- package/src/config/schemas/memory-retrospective.ts +10 -0
- package/src/config/schemas/services.ts +18 -0
- package/src/config/schemas/skills.ts +0 -14
- package/src/config/schemas/voice.ts +150 -0
- package/src/credential-execution/process-manager.test.ts +18 -19
- package/src/credential-health/credential-health-service.ts +11 -17
- package/src/daemon/__tests__/conversation-tool-setup.test.ts +66 -121
- package/src/daemon/__tests__/plugin-mcp-reconcile.test.ts +4 -1
- package/src/daemon/__tests__/skill-memory-refresh-mtime.test.ts +133 -0
- package/src/daemon/app-change-notify.ts +45 -0
- package/src/daemon/config-watcher.ts +13 -194
- package/src/daemon/conversation-error.ts +3 -2
- package/src/daemon/conversation-media-retry.ts +2 -1
- package/src/daemon/conversation-process.ts +35 -64
- package/src/daemon/conversation-runtime-assembly.ts +20 -7
- package/src/daemon/conversation-skill-tools.ts +13 -31
- package/src/daemon/conversation-store.ts +1 -1
- package/src/daemon/conversation-surfaces.ts +21 -10
- package/src/daemon/conversation-tool-setup.ts +45 -59
- package/src/daemon/conversation.ts +0 -3
- package/src/daemon/dictation-profile-store.ts +2 -1
- package/src/daemon/handlers/shared.ts +2 -1
- package/src/daemon/handlers/skills.ts +6 -3
- package/src/daemon/host-bash-proxy.ts +8 -12
- package/src/daemon/host-browser-proxy.ts +15 -1
- package/src/daemon/host-cu-proxy.ts +224 -19
- package/src/daemon/host-file-proxy.ts +8 -10
- package/src/daemon/host-proxy-preactivation.ts +2 -1
- package/src/daemon/host-transfer-proxy.ts +14 -18
- package/src/daemon/lifecycle.ts +0 -5
- package/src/daemon/mcp-reload-service.ts +5 -5
- package/src/daemon/message-types/sync.ts +1 -0
- package/src/daemon/orphan-reaper.ts +1 -1
- package/src/daemon/providers-setup.ts +1 -1
- package/src/daemon/reaction-history-render.ts +2 -1
- package/src/daemon/shutdown-handlers.ts +1 -9
- package/src/daemon/skill-memory-refresh.ts +64 -0
- package/src/daemon/tool-side-effects.ts +7 -18
- package/src/desktop/__tests__/fake-desktop.ts +122 -0
- package/src/desktop/desktop-chrome-policy.test.ts +79 -0
- package/src/desktop/desktop-chrome-policy.ts +47 -0
- package/src/desktop/desktop-chrome-session.ts +37 -0
- package/src/desktop/desktop-dependencies.test.ts +102 -0
- package/src/desktop/desktop-dependencies.ts +308 -0
- package/src/desktop/desktop-feature.test.ts +18 -0
- package/src/desktop/desktop-feature.ts +19 -0
- package/src/desktop/desktop-panel-config.test.ts +135 -0
- package/src/desktop/desktop-panel-config.ts +149 -0
- package/src/desktop/desktop-session-manager.test.ts +730 -0
- package/src/desktop/desktop-session-manager.ts +850 -0
- package/src/desktop/desktop-stream-bridge.test.ts +395 -0
- package/src/desktop/desktop-stream-bridge.ts +214 -0
- package/src/desktop/desktop-wallpaper.test.ts +191 -0
- package/src/desktop/desktop-wallpaper.ts +113 -0
- package/src/desktop/desktop-window-drag.ts +177 -0
- package/src/desktop/desktop-window-manager-config.test.ts +230 -0
- package/src/desktop/desktop-window-manager-config.ts +238 -0
- package/src/desktop/desktop-window-theme.ts +170 -0
- package/src/heartbeat/heartbeat-service.ts +21 -3
- package/src/home/__tests__/feed-writer.test.ts +22 -0
- package/src/home/feed-writer.ts +11 -2
- package/src/hooks/types.ts +33 -0
- package/src/i18n/AGENTS.md +22 -0
- package/src/i18n/__tests__/i18n.test.ts +108 -0
- package/src/i18n/index.ts +16 -0
- package/src/i18n/locales.ts +93 -0
- package/src/i18n/messages.ts +61 -0
- package/src/i18n/title.ts +25 -0
- package/src/inbound/platform-callback-registration.ts +4 -5
- package/src/live-voice/__tests__/live-voice-agent-turn.test.ts +121 -0
- package/src/live-voice/__tests__/live-voice-events.test.ts +8 -7
- package/src/live-voice/__tests__/live-voice-metrics.test.ts +0 -3
- package/src/live-voice/__tests__/live-voice-progress.test.ts +94 -15
- package/src/live-voice/__tests__/live-voice-sight-frame-echo.test.ts +238 -0
- package/src/live-voice/__tests__/live-voice-vad.test.ts +2 -2
- package/src/live-voice/__tests__/protocol.test.ts +39 -0
- package/src/live-voice/__tests__/runtime-websocket-shell.test.ts +13 -69
- package/src/live-voice/__tests__/session-controls.test.ts +79 -0
- package/src/live-voice/live-voice-photo.ts +25 -6
- package/src/live-voice/live-voice-session.ts +297 -699
- package/src/live-voice/protocol.ts +60 -2
- package/src/live-voice/session-controls.ts +111 -0
- package/src/mcp/__tests__/effective-config.test.ts +2 -2
- package/src/mcp/__tests__/workspace-mcp-config.test.ts +135 -0
- package/src/mcp/effective-config.ts +3 -3
- package/src/mcp/mcp-header-store.ts +29 -45
- package/src/mcp/spec-schema.ts +111 -0
- package/src/mcp/startup.ts +8 -4
- package/src/mcp/workspace-mcp-config.ts +188 -0
- package/src/messaging/provider.ts +10 -3
- package/src/messaging/providers/__tests__/proactive-address.test.ts +95 -0
- package/src/messaging/providers/callback-routing.ts +18 -0
- package/src/messaging/providers/channel-transport.ts +56 -0
- package/src/messaging/providers/discord/transport.ts +17 -0
- package/src/messaging/providers/slack/__tests__/adapter-token-routing.test.ts +6 -17
- package/src/messaging/providers/slack/adapter.ts +7 -44
- package/src/messaging/providers/slack/transport.ts +16 -0
- package/src/messaging/providers/telegram-bot/adapter.ts +1 -48
- package/src/messaging/providers/telegram-bot/client.ts +0 -26
- package/src/messaging/providers/telegram-bot/transport.ts +20 -0
- package/src/messaging/providers/whatsapp/adapter.ts +1 -48
- package/src/messaging/providers/whatsapp/transport.ts +18 -0
- package/src/monitoring/__tests__/workspace-git-heartbeat.test.ts +8 -0
- package/src/notifications/__tests__/assistant-reply-producer.test.ts +55 -0
- package/src/notifications/__tests__/guardian-feed-projection.test.ts +158 -2
- package/src/notifications/__tests__/home-feed-side-effect.test.ts +153 -3
- package/src/notifications/__tests__/schedule-result-producer.test.ts +99 -3
- package/src/notifications/adapters/macos.ts +3 -0
- package/src/notifications/assistant-reply-producer.ts +8 -3
- package/src/notifications/conversation-pairing.ts +36 -16
- package/src/notifications/delivered-post-record.ts +11 -1
- package/src/notifications/guardian-feed-projection.ts +125 -5
- package/src/notifications/home-feed-side-effect.ts +55 -7
- package/src/notifications/schedule-result-producer.ts +66 -22
- package/src/oauth/AGENTS.md +2 -0
- package/src/oauth/__tests__/seed-providers-managed.test.ts +149 -0
- package/src/oauth/byo-connection.test.ts +105 -0
- package/src/oauth/byo-connection.ts +36 -6
- package/src/oauth/connection-resolver.test.ts +100 -0
- package/src/oauth/connection-resolver.ts +120 -3
- package/src/oauth/provider-serializer.ts +9 -0
- package/src/oauth/scope-utils.ts +24 -0
- package/src/oauth/seed-providers.ts +314 -27
- package/src/outbound-proxy/certs.ts +3 -5
- package/src/permissions/checker.test.ts +11 -6
- package/src/persistence/compaction-log-store-clickhouse.ts +3 -3
- package/src/persistence/conversation-crud.ts +71 -63
- package/src/persistence/conversation-lineage.ts +12 -4
- package/src/persistence/conversation-queries.ts +2 -2
- package/src/persistence/conversation-title-placeholders.ts +23 -0
- package/src/persistence/conversation-title-service.ts +9 -26
- package/src/persistence/embeddings/qdrant-manager.ts +163 -18
- package/src/persistence/llm-request-log-sink-clickhouse.ts +3 -3
- package/src/persistence/llm-request-log-source-clickhouse.ts +3 -3
- package/src/persistence/message-cursor.ts +78 -0
- package/src/persistence/message-reads.ts +30 -0
- package/src/persistence/migrations/157-invite-contact-id.ts +18 -6
- package/src/persistence/migrations/__tests__/157-invite-contact-id.test.ts +149 -0
- package/src/persistence/schema/memory-core.ts +5 -0
- package/src/platform/client.test.ts +4 -2
- package/src/platform/client.ts +2 -10
- package/src/plugin-api/constants.ts +2 -0
- package/src/plugin-api/index.ts +1 -0
- package/src/plugin-api/types.ts +2 -0
- package/src/plugins/defaults/index.ts +2 -0
- package/src/plugins/defaults/memory/__tests__/memory-retrospective-accounting.test.ts +46 -0
- package/src/plugins/defaults/memory/__tests__/memory-retrospective-cursor-backfill.test.ts +118 -0
- package/src/plugins/defaults/memory/__tests__/memory-retrospective-cursor-preserve.test.ts +83 -0
- package/src/plugins/defaults/memory/__tests__/memory-retrospective-enqueue.test.ts +9 -5
- package/src/plugins/defaults/memory/__tests__/memory-retrospective-job.test.ts +20 -10
- package/src/plugins/defaults/memory/__tests__/memory-retrospective-prompt.test.ts +5 -0
- package/src/plugins/defaults/memory/__tests__/memory-retrospective-state.test.ts +219 -0
- package/src/plugins/defaults/memory/__tests__/memory-retrospective-sweep.test.ts +31 -0
- package/src/plugins/defaults/memory/__tests__/memory-retrospective-trigger-check.test.ts +63 -0
- package/src/plugins/defaults/memory/__tests__/shutdown-hook.test.ts +4 -0
- package/src/plugins/defaults/memory/context-search/agent-runner.ts +3 -2
- package/src/plugins/defaults/memory/context-search/format.ts +3 -2
- package/src/plugins/defaults/memory/context-search/sources/memory-v2.ts +6 -3
- package/src/plugins/defaults/memory/context-search/sources/workspace.ts +3 -2
- package/src/plugins/defaults/memory/graph/capability-seed.ts +6 -7
- package/src/plugins/defaults/memory/hooks/init.ts +10 -0
- package/src/plugins/defaults/memory/hooks/message-deleted.ts +21 -0
- package/src/plugins/defaults/memory/hooks/shutdown.ts +2 -0
- package/src/plugins/defaults/memory/host-utils.ts +10 -0
- package/src/plugins/defaults/memory/jobs-worker.ts +13 -0
- package/src/plugins/defaults/memory/memory-retrospective-accounting.ts +34 -60
- package/src/plugins/defaults/memory/memory-retrospective-cursor-backfill.ts +126 -0
- package/src/plugins/defaults/memory/memory-retrospective-cursor-preserve.ts +79 -0
- package/src/plugins/defaults/memory/memory-retrospective-cursor.ts +28 -0
- package/src/plugins/defaults/memory/memory-retrospective-enqueue.ts +3 -5
- package/src/plugins/defaults/memory/memory-retrospective-job.ts +12 -3
- package/src/plugins/defaults/memory/memory-retrospective-prompt.ts +1 -1
- package/src/plugins/defaults/memory/memory-retrospective-state.ts +312 -71
- package/src/plugins/defaults/memory/memory-retrospective-sweep.ts +2 -1
- package/src/plugins/defaults/memory/memory-retrospective-trigger-check.ts +5 -3
- package/src/plugins/defaults/memory/skill-md-mtime-poll.ts +9 -0
- package/src/plugins/defaults/memory/startup.ts +28 -2
- package/src/plugins/defaults/memory/substrate/__tests__/skill-content.test.ts +7 -9
- package/src/plugins/defaults/memory/substrate/page-index.ts +6 -1
- package/src/plugins/defaults/memory/substrate/skill-content.ts +2 -2
- package/src/plugins/defaults/memory/v1/graph/consolidation.ts +4 -2
- package/src/plugins/defaults/memory/v1/graph/extraction.ts +4 -2
- package/src/plugins/defaults/memory/v1/graph/retriever.ts +4 -1
- package/src/plugins/defaults/memory/v2/reranker.ts +6 -1
- package/src/plugins/defaults/memory/v3/__tests__/card.test.ts +24 -0
- package/src/plugins/defaults/memory/v3/__tests__/pool-select.test.ts +125 -0
- package/src/plugins/defaults/memory/v3/__tests__/sections.test.ts +26 -0
- package/src/plugins/defaults/memory/v3/__tests__/shadow-plugin.test.ts +30 -0
- package/src/plugins/defaults/memory/v3/card.ts +3 -2
- package/src/plugins/defaults/memory/v3/pool-select.ts +5 -3
- package/src/plugins/defaults/memory/v3/sections.ts +9 -3
- package/src/plugins/defaults/memory/v3/shadow-plugin.ts +5 -2
- package/src/plugins/defaults/memory/worker.ts +6 -0
- package/src/plugins/mcp-servers.ts +15 -75
- package/src/providers/__tests__/connection-model-compat.test.ts +3 -3
- package/src/providers/__tests__/retry-callsite.test.ts +41 -0
- package/src/providers/__tests__/retry-outbound-sanitize.test.ts +176 -0
- package/src/providers/anthropic/client.ts +0 -47
- package/src/providers/gemini/client.ts +9 -23
- package/src/providers/gemini-thought-signature.test.ts +63 -0
- package/src/providers/gemini-thought-signature.ts +44 -0
- package/src/providers/inference/__tests__/endpoint-probe.test.ts +42 -3
- package/src/providers/inference/auth.ts +2 -3
- package/src/providers/inference/connection-availability.ts +27 -8
- package/src/providers/inference/endpoint-probe.ts +10 -1
- package/src/providers/inference/resolve-auth.ts +22 -4
- package/src/providers/inference/service-account-token.ts +248 -0
- package/src/providers/model-catalog.ts +34 -0
- package/src/providers/model-intents.ts +10 -5
- package/src/providers/openai/__tests__/chat-completions-output-token-limit.test.ts +141 -0
- package/src/providers/openai/__tests__/chat-completions-provider-reasoning.test.ts +146 -18
- package/src/providers/openai/__tests__/chat-completions-provider-thought-signature.test.ts +613 -0
- package/src/providers/openai/__tests__/google-thought-signature.test.ts +235 -0
- package/src/providers/openai/__tests__/tool-choice-mapping.test.ts +83 -1
- package/src/providers/openai/chat-completions-provider.ts +212 -79
- package/src/providers/openai/codex-models.ts +0 -4
- package/src/providers/openai/google-thought-signature.ts +320 -0
- package/src/providers/opencode/client.test.ts +73 -4
- package/src/providers/opencode/client.ts +60 -3
- package/src/providers/openrouter/client.ts +20 -0
- package/src/providers/outbound-request-sanitize.ts +96 -0
- package/src/providers/retry.ts +30 -19
- package/src/providers/unparseable-tool-args.ts +5 -1
- package/src/runtime/AGENTS.md +3 -1
- package/src/runtime/__tests__/channel-send.test.ts +443 -0
- package/src/runtime/__tests__/desktop-stream-upgrade.test.ts +89 -0
- package/src/runtime/__tests__/host-observe.test.ts +40 -1
- package/src/runtime/__tests__/live-voice-upgrade.test.ts +58 -0
- package/src/runtime/__tests__/runtime-ws-test-utils.ts +72 -0
- package/src/runtime/__tests__/watch-stream-upgrade.test.ts +59 -0
- package/src/runtime/agent-wake.ts +2 -1
- package/src/runtime/assistant-event-hub.ts +21 -3
- package/src/runtime/auth/same-actor.ts +38 -3
- package/src/runtime/channel-send.ts +316 -0
- package/src/runtime/host-observe.ts +11 -1
- package/src/runtime/http-server.ts +160 -151
- package/src/runtime/routes/__tests__/acp-claude-auth-routes.test.ts +16 -5
- package/src/runtime/routes/__tests__/acp-routes.test.ts +159 -4
- package/src/runtime/routes/__tests__/apps-refresh-route.test.ts +275 -0
- package/src/runtime/routes/__tests__/channel-send-routes.test.ts +127 -0
- package/src/runtime/routes/__tests__/conversation-query-routes.test.ts +108 -1
- package/src/runtime/routes/__tests__/default-provider-routes.test.ts +2 -2
- package/src/runtime/routes/__tests__/dictation-cleanup-guard.test.ts +107 -0
- package/src/runtime/routes/__tests__/mcp-add-default-risk.test.ts +16 -12
- package/src/runtime/routes/acp-claude-auth-routes.ts +11 -3
- package/src/runtime/routes/acp-routes.test.ts +15 -0
- package/src/runtime/routes/acp-routes.ts +72 -9
- package/src/runtime/routes/app-management-routes.ts +90 -2
- package/src/runtime/routes/app-routes.ts +1 -1
- package/src/runtime/routes/channel-send-routes.ts +85 -0
- package/src/runtime/routes/conversation-list-routes.ts +14 -3
- package/src/runtime/routes/conversation-query-routes.ts +40 -0
- package/src/runtime/routes/conversation-routes.ts +16 -3
- package/src/runtime/routes/credential-routes.ts +20 -14
- package/src/runtime/routes/desktop-setup-routes.test.ts +74 -0
- package/src/runtime/routes/desktop-setup-routes.ts +35 -0
- package/src/runtime/routes/diagnostics-routes.ts +61 -4
- package/src/runtime/routes/events-routes.ts +4 -0
- package/src/runtime/routes/host-cu-routes.ts +6 -0
- package/src/runtime/routes/index.ts +4 -2
- package/src/runtime/routes/log-export-routes.ts +2 -0
- package/src/runtime/routes/mcp-auth-routes.ts +39 -47
- package/src/runtime/routes/migration-routes.ts +6 -20
- package/src/runtime/routes/oauth-commands-routes.ts +50 -0
- package/src/runtime/routes/oauth-providers.ts +7 -0
- package/src/runtime/routes/platform-routes.ts +18 -15
- package/src/runtime/routes/workspace-routes.test.ts +55 -26
- package/src/runtime/routes/workspace-routes.ts +46 -63
- package/src/runtime/routes/workspace-tree-walk.test.ts +244 -0
- package/src/runtime/routes/workspace-tree-walk.ts +240 -0
- package/src/runtime/routes/workspace-utils.ts +17 -0
- package/src/runtime/services/__tests__/conversation-serializer.test.ts +28 -0
- package/src/runtime/services/conversation-serializer.ts +16 -3
- package/src/runtime/sync/resource-sync-events.ts +2 -1
- package/src/schedule/run-script.ts +2 -1
- package/src/schedule/schedule-store.ts +9 -2
- package/src/schedule/worker.ts +1 -1
- package/src/security/__tests__/ces-http-record-backend.test.ts +137 -0
- package/src/security/ces-http-record-backend.ts +120 -0
- package/src/security/ces-rpc-record-backend.ts +7 -0
- package/src/security/untrusted-content.ts +3 -1
- package/src/skills/__tests__/workspace-skill-md-signature.test.ts +60 -0
- package/src/skills/workspace-skill-md-signature.ts +50 -0
- package/src/subagent/consult-context.ts +12 -25
- package/src/tools/__tests__/side-effect-abort-guard.test.ts +1 -0
- package/src/tools/acp/list-agents.test.ts +3 -1
- package/src/tools/acp/spawn.test.ts +146 -11
- package/src/tools/acp/spawn.ts +21 -3
- package/src/tools/acp/status.test.ts +94 -0
- package/src/tools/acp/status.ts +40 -3
- package/src/tools/app-control/skill-proxy-bridge.ts +2 -1
- package/src/tools/browser/browser-execution.ts +1 -1
- package/src/tools/browser/cdp-client/accessibility-snapshot.ts +9 -3
- package/src/tools/browser/cdp-client/cdp-inspect/discovery.ts +2 -1
- package/src/tools/browser/cdp-client/extension-cdp-client.ts +3 -2
- package/src/tools/browser/network-recorder.ts +2 -1
- package/src/tools/capability-offer.test.ts +22 -2
- package/src/tools/capability-offer.ts +16 -1
- package/src/tools/computer-use/definitions.ts +121 -2
- package/src/tools/computer-use/skill-proxy-bridge.ts +2 -1
- package/src/tools/credentials/metadata-store.ts +100 -0
- package/src/tools/filesystem/search.ts +2 -1
- package/src/tools/host-filesystem/edit.test.ts +2 -1
- package/src/tools/host-filesystem/edit.ts +2 -2
- package/src/tools/host-filesystem/read.test.ts +2 -1
- package/src/tools/host-filesystem/read.ts +2 -2
- package/src/tools/host-filesystem/transfer.test.ts +2 -1
- package/src/tools/host-filesystem/transfer.ts +2 -2
- package/src/tools/host-filesystem/write.test.ts +2 -1
- package/src/tools/host-filesystem/write.ts +2 -2
- package/src/tools/host-terminal/host-shell.test.ts +16 -0
- package/src/tools/host-terminal/host-shell.ts +4 -20
- package/src/tools/network/web-search.ts +6 -1
- package/src/tools/policy-context.ts +6 -7
- package/src/tools/skills/scaffold-managed.ts +61 -3
- package/src/tools/subagent/spawn.ts +5 -8
- package/src/tools/terminal/__tests__/sanitized-bash.test.ts +57 -0
- package/src/tools/terminal/sanitized-bash.ts +105 -0
- package/src/tools/ui-surface/channel-variants.ts +10 -59
- package/src/tools/watch/watch-retro-report.ts +0 -8
- package/src/types/host-capabilities.ts +5 -3
- package/src/util/__tests__/language-subtag.test.ts +23 -1
- package/src/util/ca-bundle.ts +13 -0
- package/src/util/language-subtag.ts +16 -0
- package/src/util/platform.ts +8 -0
- package/src/util/unicode.ts +15 -1
- package/src/watch/watch-retro.ts +6 -8
- package/src/watch/watch-timeline.ts +2 -2
- package/src/workflows/run-manager.ts +2 -1
- package/src/workspace/git-porcelain.ts +66 -0
- package/src/workspace/git-service.ts +6 -55
- package/src/workspace/migrations/154-repair-retired-codex-gpt-5-4-model-ids.ts +258 -0
- package/src/workspace/migrations/155-move-front-model-config-to-voice.ts +78 -0
- package/src/workspace/migrations/156-extract-workspace-mcp-json.ts +214 -0
- package/src/workspace/migrations/__tests__/155-move-front-model-config-to-voice.test.ts +102 -0
- package/src/workspace/migrations/__tests__/156-extract-workspace-mcp-json.test.ts +199 -0
- package/src/workspace/migrations/registry.ts +6 -0
- package/src/__tests__/app-source-watcher.test.ts +0 -218
- package/src/__tests__/config-watcher-skill-reseed.test.ts +0 -359
- package/src/__tests__/speaker-identification.test.ts +0 -56
- package/src/calls/speaker-identification.ts +0 -233
- package/src/daemon/app-source-watcher.ts +0 -218
- package/src/messaging/providers/whatsapp/client.ts +0 -29
- package/src/runtime/routes/debug-bash-routes.ts +0 -173
- package/src/util/fs-watcher-error.ts +0 -36
- /package/src/{live-voice → calls}/progress-phrases.ts +0 -0
|
@@ -0,0 +1,730 @@
|
|
|
1
|
+
import {
|
|
2
|
+
mkdirSync,
|
|
3
|
+
mkdtempSync,
|
|
4
|
+
readFileSync,
|
|
5
|
+
rmSync,
|
|
6
|
+
writeFileSync,
|
|
7
|
+
} from "node:fs";
|
|
8
|
+
import { tmpdir } from "node:os";
|
|
9
|
+
import { join } from "node:path";
|
|
10
|
+
import { afterAll, describe, expect, test } from "bun:test";
|
|
11
|
+
|
|
12
|
+
import { waitFor } from "../__tests__/helpers/wait-for.js";
|
|
13
|
+
import { sleep } from "../util/retry.js";
|
|
14
|
+
import {
|
|
15
|
+
type FakeDesktopOptions,
|
|
16
|
+
KILL_GRACE_MS,
|
|
17
|
+
LINGER_MS,
|
|
18
|
+
newFakeDesktop,
|
|
19
|
+
newViewer,
|
|
20
|
+
settle,
|
|
21
|
+
} from "./__tests__/fake-desktop.js";
|
|
22
|
+
import {
|
|
23
|
+
DESKTOP_VNC_PORT,
|
|
24
|
+
type DesktopChildRole,
|
|
25
|
+
} from "./desktop-session-manager.js";
|
|
26
|
+
|
|
27
|
+
const BUSY = {
|
|
28
|
+
ok: false,
|
|
29
|
+
loss: { code: 4013, reason: "Desktop is in use by another viewer" },
|
|
30
|
+
} as const;
|
|
31
|
+
const SHUTTING_DOWN = {
|
|
32
|
+
ok: false,
|
|
33
|
+
loss: { code: 1001, reason: "The assistant is shutting down" },
|
|
34
|
+
} as const;
|
|
35
|
+
|
|
36
|
+
const profileDir = mkdtempSync(join(tmpdir(), "desktop-session-test-"));
|
|
37
|
+
const panelConfigDir = mkdtempSync(join(tmpdir(), "desktop-panel-test-"));
|
|
38
|
+
const managers: ReturnType<typeof newFakeDesktop>["manager"][] = [];
|
|
39
|
+
afterAll(async () => {
|
|
40
|
+
await Promise.all(managers.map((manager) => manager.destroy()));
|
|
41
|
+
rmSync(profileDir, { recursive: true, force: true });
|
|
42
|
+
rmSync(panelConfigDir, { recursive: true, force: true });
|
|
43
|
+
});
|
|
44
|
+
|
|
45
|
+
function newManager(
|
|
46
|
+
options: Omit<FakeDesktopOptions, "profileDir" | "panelConfigDir"> = {},
|
|
47
|
+
) {
|
|
48
|
+
const harness = newFakeDesktop({ profileDir, panelConfigDir, ...options });
|
|
49
|
+
managers.push(harness.manager);
|
|
50
|
+
return harness;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
describe("desktop wallpaper lifecycle", () => {
|
|
54
|
+
test("applies the rendered wallpaper and refreshes it on reconnect without restarting X", async () => {
|
|
55
|
+
let current = Buffer.from("first wallpaper");
|
|
56
|
+
const h = newManager({
|
|
57
|
+
renderWallpaper: async () => current,
|
|
58
|
+
exitOnTerm: true,
|
|
59
|
+
});
|
|
60
|
+
await h.manager.ensureDesktopRunning();
|
|
61
|
+
await settle();
|
|
62
|
+
const path = join(panelConfigDir, "wallpaper.png");
|
|
63
|
+
expect(readFileSync(path)).toEqual(current);
|
|
64
|
+
expect(h.child("wallpaper").request.cmd).toEqual([
|
|
65
|
+
"/usr/bin/feh",
|
|
66
|
+
"--no-fehbg",
|
|
67
|
+
"--bg-fill",
|
|
68
|
+
path,
|
|
69
|
+
]);
|
|
70
|
+
expect(h.child("wallpaper").request.env.DISPLAY).toBe(":99");
|
|
71
|
+
h.child("wallpaper").exit(0);
|
|
72
|
+
await settle();
|
|
73
|
+
current = Buffer.from("updated avatar wallpaper");
|
|
74
|
+
await h.manager.ensureDesktopRunning();
|
|
75
|
+
await settle();
|
|
76
|
+
expect(readFileSync(path)).toEqual(current);
|
|
77
|
+
expect(h.count("wallpaper")).toBe(2);
|
|
78
|
+
expect(h.count("x-server")).toBe(1);
|
|
79
|
+
await h.manager.destroy();
|
|
80
|
+
});
|
|
81
|
+
|
|
82
|
+
test.each(["success", "failure"] as const)(
|
|
83
|
+
"reconnects during a render queue the latest avatar after %s",
|
|
84
|
+
async (outcome) => {
|
|
85
|
+
let current = Buffer.from("first avatar");
|
|
86
|
+
const pending: { finish: () => void; fail: () => void }[] = [];
|
|
87
|
+
const h = newManager({
|
|
88
|
+
renderWallpaper: () => {
|
|
89
|
+
const snapshot = current;
|
|
90
|
+
return new Promise((resolve, reject) => {
|
|
91
|
+
pending.push({
|
|
92
|
+
finish: () => resolve(snapshot),
|
|
93
|
+
fail: () => reject(new Error("render failed")),
|
|
94
|
+
});
|
|
95
|
+
});
|
|
96
|
+
},
|
|
97
|
+
exitOnTerm: true,
|
|
98
|
+
});
|
|
99
|
+
try {
|
|
100
|
+
await h.manager.ensureDesktopRunning();
|
|
101
|
+
current = Buffer.from("second avatar");
|
|
102
|
+
await h.manager.ensureDesktopRunning();
|
|
103
|
+
current = Buffer.from("latest avatar");
|
|
104
|
+
await h.manager.ensureDesktopRunning();
|
|
105
|
+
expect(pending).toHaveLength(1);
|
|
106
|
+
|
|
107
|
+
if (outcome === "success") {
|
|
108
|
+
pending[0]!.finish();
|
|
109
|
+
} else {
|
|
110
|
+
pending[0]!.fail();
|
|
111
|
+
}
|
|
112
|
+
await settle();
|
|
113
|
+
expect(pending).toHaveLength(2);
|
|
114
|
+
expect(h.count("wallpaper")).toBe(0);
|
|
115
|
+
|
|
116
|
+
pending[1]!.finish();
|
|
117
|
+
await settle();
|
|
118
|
+
expect(readFileSync(join(panelConfigDir, "wallpaper.png"))).toEqual(
|
|
119
|
+
current,
|
|
120
|
+
);
|
|
121
|
+
expect(h.count("wallpaper")).toBe(1);
|
|
122
|
+
expect(h.count("x-server")).toBe(1);
|
|
123
|
+
expect(pending).toHaveLength(2);
|
|
124
|
+
} finally {
|
|
125
|
+
await h.manager.destroy();
|
|
126
|
+
}
|
|
127
|
+
},
|
|
128
|
+
);
|
|
129
|
+
|
|
130
|
+
test("pending and queued renders neither delay Chrome nor apply after shutdown", async () => {
|
|
131
|
+
let finish!: (png: Buffer) => void;
|
|
132
|
+
let renders = 0;
|
|
133
|
+
const h = newManager({
|
|
134
|
+
renderWallpaper: () => {
|
|
135
|
+
renders++;
|
|
136
|
+
return new Promise((resolve) => {
|
|
137
|
+
finish = resolve;
|
|
138
|
+
});
|
|
139
|
+
},
|
|
140
|
+
exitOnTerm: true,
|
|
141
|
+
});
|
|
142
|
+
await h.manager.ensureDesktopRunning();
|
|
143
|
+
await h.manager.ensureDesktopRunning();
|
|
144
|
+
await settle();
|
|
145
|
+
expect(h.count("browser")).toBe(1);
|
|
146
|
+
expect(renders).toBe(1);
|
|
147
|
+
await h.manager.destroy();
|
|
148
|
+
finish(Buffer.from("stale render"));
|
|
149
|
+
await settle();
|
|
150
|
+
expect(h.count("wallpaper")).toBe(0);
|
|
151
|
+
expect(renders).toBe(1);
|
|
152
|
+
});
|
|
153
|
+
|
|
154
|
+
test.each(["render", "spawn", "exit"] as const)(
|
|
155
|
+
"wallpaper %s failure leaves the viewer connected",
|
|
156
|
+
async (failure) => {
|
|
157
|
+
const h = newManager({
|
|
158
|
+
renderWallpaper: async () => {
|
|
159
|
+
if (failure === "render") {
|
|
160
|
+
throw new Error("render failed");
|
|
161
|
+
}
|
|
162
|
+
return Buffer.from("wallpaper");
|
|
163
|
+
},
|
|
164
|
+
failSpawn: failure === "spawn" ? ["wallpaper"] : [],
|
|
165
|
+
exitOnTerm: true,
|
|
166
|
+
});
|
|
167
|
+
const { viewer, lost } = newViewer();
|
|
168
|
+
h.manager.acquireViewerSlot(viewer);
|
|
169
|
+
await h.manager.ensureDesktopRunning();
|
|
170
|
+
await settle();
|
|
171
|
+
if (failure === "exit") {
|
|
172
|
+
h.child("wallpaper").exit(1);
|
|
173
|
+
await settle();
|
|
174
|
+
}
|
|
175
|
+
expect(lost).toEqual([]);
|
|
176
|
+
expect(h.count("browser")).toBe(1);
|
|
177
|
+
expect(h.terminated()).toEqual([]);
|
|
178
|
+
await h.manager.destroy();
|
|
179
|
+
},
|
|
180
|
+
);
|
|
181
|
+
});
|
|
182
|
+
|
|
183
|
+
describe("DesktopSessionManager process tree", () => {
|
|
184
|
+
test("concurrent callers share one start of the whole tree", async () => {
|
|
185
|
+
const h = newManager({
|
|
186
|
+
sourceEnv: {
|
|
187
|
+
PATH: "/usr/bin",
|
|
188
|
+
HOME: "/data",
|
|
189
|
+
LANG: "C.UTF-8",
|
|
190
|
+
// Neither the kata chroot overlay nor secrets reach the desktop.
|
|
191
|
+
LD_LIBRARY_PATH: "/data/system/usr/lib",
|
|
192
|
+
VELLUM_SANDBOX_RUNTIME: "kata",
|
|
193
|
+
OPENAI_API_KEY: "sk-secret",
|
|
194
|
+
},
|
|
195
|
+
});
|
|
196
|
+
await Promise.all([
|
|
197
|
+
h.manager.ensureDesktopRunning(),
|
|
198
|
+
h.manager.ensureDesktopRunning(),
|
|
199
|
+
]);
|
|
200
|
+
await settle();
|
|
201
|
+
|
|
202
|
+
// The dock waits on the Chromium path its launcher points at, so it comes
|
|
203
|
+
// up alongside the browser rather than with the rest of the tree.
|
|
204
|
+
expect(h.roles()).toEqual([
|
|
205
|
+
"x-server",
|
|
206
|
+
"window-manager",
|
|
207
|
+
"compositor",
|
|
208
|
+
"clipboard",
|
|
209
|
+
"panel",
|
|
210
|
+
"browser",
|
|
211
|
+
]);
|
|
212
|
+
|
|
213
|
+
const x = h.child("x-server").request.cmd;
|
|
214
|
+
expect(x.slice(0, 2)).toEqual(["/usr/bin/Xtigervnc", ":99"]);
|
|
215
|
+
expect(x).toContain("-localhost");
|
|
216
|
+
expect(x[x.indexOf("-SecurityTypes") + 1]).toBe("None");
|
|
217
|
+
expect(x[x.indexOf("-rfbport") + 1]).toBe(String(DESKTOP_VNC_PORT));
|
|
218
|
+
expect(x[x.indexOf("-geometry") + 1]).toBe("1600x900");
|
|
219
|
+
for (const role of [
|
|
220
|
+
"window-manager",
|
|
221
|
+
"compositor",
|
|
222
|
+
"clipboard",
|
|
223
|
+
"browser",
|
|
224
|
+
] as const) {
|
|
225
|
+
expect(h.child(role).request.env).toEqual({
|
|
226
|
+
PATH: "/usr/bin",
|
|
227
|
+
HOME: "/data",
|
|
228
|
+
LANG: "C.UTF-8",
|
|
229
|
+
DISPLAY: ":99",
|
|
230
|
+
});
|
|
231
|
+
}
|
|
232
|
+
expect(h.child("window-manager").request.cmd[0]).toBe("/usr/bin/python3");
|
|
233
|
+
expect(h.child("window-manager").request.cmd.slice(3)).toEqual([
|
|
234
|
+
"/usr/bin/openbox",
|
|
235
|
+
"--sm-disable",
|
|
236
|
+
"--config-file",
|
|
237
|
+
join(panelConfigDir, "openbox.xml"),
|
|
238
|
+
]);
|
|
239
|
+
// The compositor precedes the dock so it has an ARGB visual.
|
|
240
|
+
expect(h.child("compositor").request.cmd).toEqual(["/usr/bin/xcompmgr"]);
|
|
241
|
+
expect(h.child("panel").request.cmd).toEqual([
|
|
242
|
+
"/usr/bin/dbus-run-session",
|
|
243
|
+
"--",
|
|
244
|
+
"/usr/bin/plank",
|
|
245
|
+
]);
|
|
246
|
+
expect(h.child("panel").request.env).toEqual({
|
|
247
|
+
...h.child("browser").request.env,
|
|
248
|
+
XDG_CONFIG_HOME: panelConfigDir,
|
|
249
|
+
XDG_DATA_HOME: panelConfigDir,
|
|
250
|
+
GSETTINGS_BACKEND: "keyfile",
|
|
251
|
+
});
|
|
252
|
+
expect(h.child("clipboard").request.cmd).toEqual([
|
|
253
|
+
"/usr/bin/tigervncconfig",
|
|
254
|
+
"-nowin",
|
|
255
|
+
]);
|
|
256
|
+
const browser = h.child("browser").request.cmd;
|
|
257
|
+
expect(browser[0]).toBe("/fake/chromium");
|
|
258
|
+
expect(browser).toContain(`--user-data-dir=${profileDir}`);
|
|
259
|
+
|
|
260
|
+
// A running tree is reused rather than started again.
|
|
261
|
+
await h.manager.ensureDesktopRunning();
|
|
262
|
+
expect(h.count("x-server")).toBe(1);
|
|
263
|
+
});
|
|
264
|
+
|
|
265
|
+
test("falls back to vncconfig when tigervncconfig is absent", async () => {
|
|
266
|
+
const h = newManager({ missingBinaries: ["tigervncconfig"] });
|
|
267
|
+
await h.manager.ensureDesktopRunning();
|
|
268
|
+
expect(h.child("clipboard").request.cmd).toEqual([
|
|
269
|
+
"/usr/bin/vncconfig",
|
|
270
|
+
"-nowin",
|
|
271
|
+
]);
|
|
272
|
+
});
|
|
273
|
+
|
|
274
|
+
test("a missing binary fails the start before anything is spawned", async () => {
|
|
275
|
+
const h = newManager({
|
|
276
|
+
missingBinaries: [
|
|
277
|
+
"Xtigervnc",
|
|
278
|
+
"xcompmgr",
|
|
279
|
+
"plank",
|
|
280
|
+
"tigervncconfig",
|
|
281
|
+
"vncconfig",
|
|
282
|
+
"xterm",
|
|
283
|
+
],
|
|
284
|
+
});
|
|
285
|
+
await expect(h.manager.ensureDesktopRunning()).rejects.toThrow(
|
|
286
|
+
"Desktop component is missing: Xtigervnc",
|
|
287
|
+
);
|
|
288
|
+
expect(h.spawned).toEqual([]);
|
|
289
|
+
});
|
|
290
|
+
|
|
291
|
+
test("the dock is generated with the resolved Chrome and terminal", async () => {
|
|
292
|
+
const h = newManager();
|
|
293
|
+
await h.manager.ensureDesktopRunning();
|
|
294
|
+
await settle();
|
|
295
|
+
|
|
296
|
+
const chromium = readFileSync(
|
|
297
|
+
join(panelConfigDir, "applications", "google-chrome.desktop"),
|
|
298
|
+
"utf8",
|
|
299
|
+
);
|
|
300
|
+
expect(chromium).toContain(`Exec="/fake/chromium"`);
|
|
301
|
+
expect(chromium).toContain(`"--user-data-dir=${profileDir}"`);
|
|
302
|
+
expect(chromium).toContain("Icon=/fake/product_logo_64.png");
|
|
303
|
+
|
|
304
|
+
const terminal = readFileSync(
|
|
305
|
+
join(panelConfigDir, "applications", "xterm.desktop"),
|
|
306
|
+
"utf8",
|
|
307
|
+
);
|
|
308
|
+
expect(terminal).toContain(`Exec="/usr/bin/xterm"`);
|
|
309
|
+
expect(terminal).toContain(`Icon=${join(panelConfigDir, "terminal.png")}`);
|
|
310
|
+
|
|
311
|
+
const bytes = readFileSync(join(panelConfigDir, "terminal.png"));
|
|
312
|
+
expect([...bytes.subarray(0, 8)]).toEqual([
|
|
313
|
+
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
|
|
314
|
+
]);
|
|
315
|
+
// A complete IEND chunk catches a truncated icon.
|
|
316
|
+
expect([...bytes.subarray(-12)]).toEqual([
|
|
317
|
+
0, 0, 0, 0, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
|
|
318
|
+
]);
|
|
319
|
+
});
|
|
320
|
+
|
|
321
|
+
test("a VNC port that never opens fails the start and kills the X server, and a retry works", async () => {
|
|
322
|
+
const h = newManager();
|
|
323
|
+
h.setVncReady(false);
|
|
324
|
+
|
|
325
|
+
await expect(h.manager.ensureDesktopRunning()).rejects.toThrow(/not ready/);
|
|
326
|
+
expect(h.terminated()).toEqual([h.child("x-server")]);
|
|
327
|
+
|
|
328
|
+
h.setVncReady(true);
|
|
329
|
+
await h.manager.ensureDesktopRunning();
|
|
330
|
+
expect(h.count("x-server")).toBe(2);
|
|
331
|
+
});
|
|
332
|
+
|
|
333
|
+
test("a retry spawns its X server only after the failed one is gone", async () => {
|
|
334
|
+
const h = newManager();
|
|
335
|
+
h.setVncReady(false);
|
|
336
|
+
const { viewer, lost } = newViewer();
|
|
337
|
+
h.manager.acquireViewerSlot(viewer);
|
|
338
|
+
|
|
339
|
+
await expect(h.manager.ensureDesktopRunning()).rejects.toThrow(/not ready/);
|
|
340
|
+
// The viewer hears about it before the kill grace, not after.
|
|
341
|
+
expect(lost).toEqual([{ code: 4011, reason: "Desktop failed to start" }]);
|
|
342
|
+
const first = h.child("x-server");
|
|
343
|
+
expect(h.killed).toEqual([{ child: first, signal: "SIGTERM" }]);
|
|
344
|
+
|
|
345
|
+
// Reconnect while the first X server is still ignoring its SIGTERM.
|
|
346
|
+
h.setVncReady(true);
|
|
347
|
+
const retry = h.manager.ensureDesktopRunning();
|
|
348
|
+
await sleep(KILL_GRACE_MS / 2);
|
|
349
|
+
expect(h.count("x-server")).toBe(1);
|
|
350
|
+
|
|
351
|
+
// The SIGKILL alone does not free the display and port; the exit does.
|
|
352
|
+
await waitFor(() => h.killed.length === 2, { intervalMs: 1 });
|
|
353
|
+
expect(h.killed[1]).toEqual({ child: first, signal: "SIGKILL" });
|
|
354
|
+
expect(h.count("x-server")).toBe(1);
|
|
355
|
+
|
|
356
|
+
first.exit(0);
|
|
357
|
+
await retry;
|
|
358
|
+
expect(h.count("x-server")).toBe(2);
|
|
359
|
+
});
|
|
360
|
+
|
|
361
|
+
test("a retry stops waiting on an X server that survives SIGKILL", async () => {
|
|
362
|
+
const h = newManager();
|
|
363
|
+
h.setVncReady(false);
|
|
364
|
+
await expect(h.manager.ensureDesktopRunning()).rejects.toThrow(/not ready/);
|
|
365
|
+
|
|
366
|
+
h.setVncReady(true);
|
|
367
|
+
const started = Date.now();
|
|
368
|
+
await h.manager.ensureDesktopRunning();
|
|
369
|
+
expect(Date.now() - started).toBeGreaterThanOrEqual(KILL_GRACE_MS * 2 - 4);
|
|
370
|
+
expect(h.killed.map((k) => k.signal)).toEqual(["SIGTERM", "SIGKILL"]);
|
|
371
|
+
expect(h.count("x-server")).toBe(2);
|
|
372
|
+
});
|
|
373
|
+
|
|
374
|
+
test("a spawn that fails after the X server is up rolls the tree back, and a retry starts clean", async () => {
|
|
375
|
+
const failSpawn: DesktopChildRole[] = ["clipboard"];
|
|
376
|
+
const h = newManager({ failSpawn });
|
|
377
|
+
const { viewer, lost } = newViewer();
|
|
378
|
+
h.manager.acquireViewerSlot(viewer);
|
|
379
|
+
|
|
380
|
+
await expect(h.manager.ensureDesktopRunning()).rejects.toThrow(
|
|
381
|
+
"spawn clipboard failed",
|
|
382
|
+
);
|
|
383
|
+
expect(
|
|
384
|
+
h
|
|
385
|
+
.terminated()
|
|
386
|
+
.map((c) => c.role)
|
|
387
|
+
.sort(),
|
|
388
|
+
).toEqual(["compositor", "window-manager", "x-server"]);
|
|
389
|
+
expect(lost).toEqual([{ code: 4011, reason: "Desktop failed to start" }]);
|
|
390
|
+
|
|
391
|
+
failSpawn.length = 0;
|
|
392
|
+
await h.manager.ensureDesktopRunning();
|
|
393
|
+
await settle();
|
|
394
|
+
expect(h.roles().slice(3)).toEqual([
|
|
395
|
+
"x-server",
|
|
396
|
+
"window-manager",
|
|
397
|
+
"compositor",
|
|
398
|
+
"clipboard",
|
|
399
|
+
"panel",
|
|
400
|
+
"browser",
|
|
401
|
+
]);
|
|
402
|
+
expect(h.terminated()).toHaveLength(3);
|
|
403
|
+
});
|
|
404
|
+
|
|
405
|
+
test("a dock or compositor that will not spawn leaves the desktop up", async () => {
|
|
406
|
+
const h = newManager({ failSpawn: ["compositor", "panel"] });
|
|
407
|
+
const { viewer, lost } = newViewer();
|
|
408
|
+
h.manager.acquireViewerSlot(viewer);
|
|
409
|
+
|
|
410
|
+
await h.manager.ensureDesktopRunning();
|
|
411
|
+
await settle();
|
|
412
|
+
|
|
413
|
+
expect(lost).toEqual([]);
|
|
414
|
+
expect(h.killed).toEqual([]);
|
|
415
|
+
expect(h.roles()).toEqual([
|
|
416
|
+
"x-server",
|
|
417
|
+
"window-manager",
|
|
418
|
+
"clipboard",
|
|
419
|
+
"browser",
|
|
420
|
+
]);
|
|
421
|
+
});
|
|
422
|
+
|
|
423
|
+
test("an X server exit tears the tree down and tells the viewer", async () => {
|
|
424
|
+
const h = newManager();
|
|
425
|
+
const { viewer, lost } = newViewer();
|
|
426
|
+
expect(h.manager.acquireViewerSlot(viewer)).toEqual({ ok: true });
|
|
427
|
+
await h.manager.ensureDesktopRunning();
|
|
428
|
+
await settle();
|
|
429
|
+
|
|
430
|
+
h.child("x-server").exit(1);
|
|
431
|
+
await settle();
|
|
432
|
+
|
|
433
|
+
expect(lost).toEqual([
|
|
434
|
+
{ code: 4011, reason: "Desktop stopped: x-server exited" },
|
|
435
|
+
]);
|
|
436
|
+
expect(
|
|
437
|
+
h
|
|
438
|
+
.terminated()
|
|
439
|
+
.map((c) => c.role)
|
|
440
|
+
.sort(),
|
|
441
|
+
).toEqual([
|
|
442
|
+
"browser",
|
|
443
|
+
"clipboard",
|
|
444
|
+
"compositor",
|
|
445
|
+
"panel",
|
|
446
|
+
"window-manager",
|
|
447
|
+
]);
|
|
448
|
+
// The slot is free and the next start builds a fresh tree.
|
|
449
|
+
expect(h.manager.acquireViewerSlot(newViewer().viewer)).toEqual({
|
|
450
|
+
ok: true,
|
|
451
|
+
});
|
|
452
|
+
await h.manager.ensureDesktopRunning();
|
|
453
|
+
expect(h.count("x-server")).toBe(2);
|
|
454
|
+
});
|
|
455
|
+
|
|
456
|
+
test("restarts the dock without interrupting its applications or the viewer", async () => {
|
|
457
|
+
const h = newManager({ exitOnTerm: true, panelRestartDelayMs: 5 });
|
|
458
|
+
const { viewer, lost } = newViewer();
|
|
459
|
+
h.manager.acquireViewerSlot(viewer);
|
|
460
|
+
await h.manager.ensureDesktopRunning();
|
|
461
|
+
const firstPanel = h.child("panel");
|
|
462
|
+
firstPanel.exit(1);
|
|
463
|
+
await waitFor(() => h.count("panel") === 2);
|
|
464
|
+
|
|
465
|
+
expect(lost).toEqual([]);
|
|
466
|
+
expect(h.killed).toEqual([]);
|
|
467
|
+
expect(h.count("x-server")).toBe(1);
|
|
468
|
+
expect(h.count("browser")).toBe(1);
|
|
469
|
+
|
|
470
|
+
await h.manager.destroy();
|
|
471
|
+
for (const panel of [firstPanel, h.child("panel")]) {
|
|
472
|
+
expect(h.killed.filter((k) => k.child === panel)).toEqual([
|
|
473
|
+
{ child: panel, signal: "SIGTERM" },
|
|
474
|
+
{ child: panel, signal: "SIGKILL" },
|
|
475
|
+
]);
|
|
476
|
+
}
|
|
477
|
+
});
|
|
478
|
+
|
|
479
|
+
test("recovers from a transient dock startup failure", async () => {
|
|
480
|
+
const failSpawn: DesktopChildRole[] = ["panel"];
|
|
481
|
+
const h = newManager({ failSpawn, panelRestartDelayMs: 5 });
|
|
482
|
+
await h.manager.ensureDesktopRunning();
|
|
483
|
+
expect(h.count("panel")).toBe(0);
|
|
484
|
+
failSpawn.length = 0;
|
|
485
|
+
await waitFor(() => h.count("panel") === 1);
|
|
486
|
+
expect(h.count("browser")).toBe(1);
|
|
487
|
+
await h.manager.destroy();
|
|
488
|
+
});
|
|
489
|
+
|
|
490
|
+
test("bounds repeated dock failures without shutting down the desktop", async () => {
|
|
491
|
+
const h = newManager({ panelRestartDelayMs: 5 });
|
|
492
|
+
await h.manager.ensureDesktopRunning();
|
|
493
|
+
for (let count = 2; count <= 4; count += 1) {
|
|
494
|
+
h.child("panel").exit(1);
|
|
495
|
+
await waitFor(() => h.count("panel") === count);
|
|
496
|
+
}
|
|
497
|
+
h.child("panel").exit(1);
|
|
498
|
+
await sleep(30);
|
|
499
|
+
expect(h.count("panel")).toBe(4);
|
|
500
|
+
expect(h.killed).toEqual([]);
|
|
501
|
+
expect(h.count("x-server")).toBe(1);
|
|
502
|
+
await h.manager.destroy();
|
|
503
|
+
});
|
|
504
|
+
|
|
505
|
+
test("cancels a pending dock restart when the desktop shuts down", async () => {
|
|
506
|
+
const h = newManager({ panelRestartDelayMs: 30 });
|
|
507
|
+
await h.manager.ensureDesktopRunning();
|
|
508
|
+
h.child("panel").exit(1);
|
|
509
|
+
await settle();
|
|
510
|
+
await h.manager.destroy();
|
|
511
|
+
await sleep(40);
|
|
512
|
+
expect(h.count("panel")).toBe(1);
|
|
513
|
+
});
|
|
514
|
+
|
|
515
|
+
test("a browser closed without a viewer stays closed when a viewer connects", async () => {
|
|
516
|
+
const h = newManager({ exitOnTerm: true });
|
|
517
|
+
await h.manager.ensureDesktopRunning();
|
|
518
|
+
await settle();
|
|
519
|
+
|
|
520
|
+
h.child("browser").exit(0);
|
|
521
|
+
await settle();
|
|
522
|
+
expect(h.killed).toEqual([]);
|
|
523
|
+
expect(h.count("browser")).toBe(1);
|
|
524
|
+
|
|
525
|
+
h.manager.acquireViewerSlot(newViewer().viewer);
|
|
526
|
+
await h.manager.ensureDesktopRunning();
|
|
527
|
+
await settle();
|
|
528
|
+
expect(h.count("x-server")).toBe(1);
|
|
529
|
+
expect(h.count("browser")).toBe(1);
|
|
530
|
+
expect(h.killed).toEqual([]);
|
|
531
|
+
await h.manager.destroy();
|
|
532
|
+
});
|
|
533
|
+
|
|
534
|
+
test.each(["Default", "Profile 1"])(
|
|
535
|
+
"restores a crashed %s session but preserves a subsequent clean close",
|
|
536
|
+
async (profileName) => {
|
|
537
|
+
const dir = mkdtempSync(join(tmpdir(), "desktop-crash-test-"));
|
|
538
|
+
let h = newFakeDesktop({ profileDir: dir, exitOnTerm: true });
|
|
539
|
+
try {
|
|
540
|
+
mkdirSync(join(dir, profileName));
|
|
541
|
+
writeFileSync(
|
|
542
|
+
join(dir, "Local State"),
|
|
543
|
+
JSON.stringify({ profile: { last_used: profileName } }),
|
|
544
|
+
);
|
|
545
|
+
const preferences = join(dir, profileName, "Preferences");
|
|
546
|
+
const crashed = JSON.stringify({ profile: { exit_type: "Crashed" } });
|
|
547
|
+
writeFileSync(preferences, crashed);
|
|
548
|
+
h.manager.acquireViewerSlot(newViewer().viewer);
|
|
549
|
+
await h.manager.ensureDesktopRunning();
|
|
550
|
+
expect(h.child("browser").request.cmd).toContain(
|
|
551
|
+
"--restore-last-session",
|
|
552
|
+
);
|
|
553
|
+
expect(h.child("browser").request.cmd).toContain(
|
|
554
|
+
"--hide-crash-restore-bubble",
|
|
555
|
+
);
|
|
556
|
+
expect(readFileSync(preferences, "utf8")).toBe(crashed);
|
|
557
|
+
|
|
558
|
+
h.child("browser").exit(1);
|
|
559
|
+
await settle();
|
|
560
|
+
expect(h.count("browser")).toBe(1);
|
|
561
|
+
await h.manager.destroy();
|
|
562
|
+
h = newFakeDesktop({ profileDir: dir, exitOnTerm: true });
|
|
563
|
+
await h.manager.ensureDesktopRunning();
|
|
564
|
+
await settle();
|
|
565
|
+
expect(h.child("browser").request.cmd).toContain(
|
|
566
|
+
"--restore-last-session",
|
|
567
|
+
);
|
|
568
|
+
|
|
569
|
+
writeFileSync(
|
|
570
|
+
preferences,
|
|
571
|
+
JSON.stringify({ profile: { exit_type: "Normal" } }),
|
|
572
|
+
);
|
|
573
|
+
h.child("browser").exit(0);
|
|
574
|
+
await settle();
|
|
575
|
+
expect(h.count("browser")).toBe(1);
|
|
576
|
+
await h.manager.destroy();
|
|
577
|
+
h = newFakeDesktop({ profileDir: dir, exitOnTerm: true });
|
|
578
|
+
await h.manager.ensureDesktopRunning();
|
|
579
|
+
await settle();
|
|
580
|
+
expect(h.child("browser").request.cmd).not.toContain(
|
|
581
|
+
"--restore-last-session",
|
|
582
|
+
);
|
|
583
|
+
expect(h.child("browser").request.cmd).not.toContain(
|
|
584
|
+
"--hide-crash-restore-bubble",
|
|
585
|
+
);
|
|
586
|
+
} finally {
|
|
587
|
+
await h.manager.destroy();
|
|
588
|
+
rmSync(dir, { recursive: true, force: true });
|
|
589
|
+
}
|
|
590
|
+
},
|
|
591
|
+
);
|
|
592
|
+
|
|
593
|
+
test.each([0, 1])(
|
|
594
|
+
"a browser exit (%s) keeps the desktop usable and stays closed on reconnect",
|
|
595
|
+
async (exitCode) => {
|
|
596
|
+
const h = newManager({ exitOnTerm: true });
|
|
597
|
+
const { viewer, lost } = newViewer();
|
|
598
|
+
h.manager.acquireViewerSlot(viewer);
|
|
599
|
+
await h.manager.ensureDesktopRunning();
|
|
600
|
+
await settle();
|
|
601
|
+
|
|
602
|
+
h.child("browser").exit(exitCode);
|
|
603
|
+
await settle();
|
|
604
|
+
expect(h.count("browser")).toBe(1);
|
|
605
|
+
expect(lost).toEqual([]);
|
|
606
|
+
expect(h.killed).toEqual([]);
|
|
607
|
+
|
|
608
|
+
h.manager.releaseViewerSlot(viewer);
|
|
609
|
+
expect(h.manager.acquireViewerSlot(viewer)).toEqual({ ok: true });
|
|
610
|
+
await h.manager.ensureDesktopRunning();
|
|
611
|
+
await settle();
|
|
612
|
+
expect(h.count("browser")).toBe(1);
|
|
613
|
+
expect(h.count("x-server")).toBe(1);
|
|
614
|
+
expect(h.count("panel")).toBe(1);
|
|
615
|
+
expect(lost).toEqual([]);
|
|
616
|
+
expect(h.killed).toEqual([]);
|
|
617
|
+
await h.manager.destroy();
|
|
618
|
+
},
|
|
619
|
+
);
|
|
620
|
+
|
|
621
|
+
test("a browser that cannot be resolved takes the desktop down", async () => {
|
|
622
|
+
const h = newManager();
|
|
623
|
+
h.setChromiumPath(async () => {
|
|
624
|
+
throw new Error("playwright install failed");
|
|
625
|
+
});
|
|
626
|
+
const { viewer, lost } = newViewer();
|
|
627
|
+
h.manager.acquireViewerSlot(viewer);
|
|
628
|
+
await h.manager.ensureDesktopRunning();
|
|
629
|
+
await settle();
|
|
630
|
+
|
|
631
|
+
expect(lost).toEqual([
|
|
632
|
+
{ code: 4011, reason: "Desktop browser failed to start" },
|
|
633
|
+
]);
|
|
634
|
+
// The dock never got its Chromium path, so only the three fatal children
|
|
635
|
+
// and no panel are killed.
|
|
636
|
+
expect(
|
|
637
|
+
h
|
|
638
|
+
.terminated()
|
|
639
|
+
.map((c) => c.role)
|
|
640
|
+
.sort(),
|
|
641
|
+
).toEqual(["clipboard", "compositor", "window-manager", "x-server"]);
|
|
642
|
+
});
|
|
643
|
+
|
|
644
|
+
test("destroy terminates, hard-kills stragglers after the grace, and refuses what comes after", async () => {
|
|
645
|
+
const h = newManager({ exitOnKill: true });
|
|
646
|
+
const { viewer, lost } = newViewer();
|
|
647
|
+
h.manager.acquireViewerSlot(viewer);
|
|
648
|
+
await h.manager.ensureDesktopRunning();
|
|
649
|
+
await settle();
|
|
650
|
+
|
|
651
|
+
const started = Date.now();
|
|
652
|
+
await Promise.all([h.manager.destroy(), h.manager.destroy()]);
|
|
653
|
+
|
|
654
|
+
expect(Date.now() - started).toBeGreaterThanOrEqual(KILL_GRACE_MS - 2);
|
|
655
|
+
expect(lost).toEqual([
|
|
656
|
+
{ code: 1001, reason: "The assistant is shutting down" },
|
|
657
|
+
]);
|
|
658
|
+
expect(h.killed.map((k) => k.signal)).toEqual([
|
|
659
|
+
...Array(6).fill("SIGTERM"),
|
|
660
|
+
...Array(6).fill("SIGKILL"),
|
|
661
|
+
]);
|
|
662
|
+
expect(h.manager.acquireViewerSlot(newViewer().viewer)).toEqual(
|
|
663
|
+
SHUTTING_DOWN,
|
|
664
|
+
);
|
|
665
|
+
await expect(h.manager.ensureDesktopRunning()).rejects.toMatchObject({
|
|
666
|
+
loss: SHUTTING_DOWN.loss,
|
|
667
|
+
});
|
|
668
|
+
});
|
|
669
|
+
|
|
670
|
+
test("destroy still clears dock descendants when every direct child exits on SIGTERM", async () => {
|
|
671
|
+
const h = newManager({ exitOnTerm: true });
|
|
672
|
+
await h.manager.ensureDesktopRunning();
|
|
673
|
+
await settle();
|
|
674
|
+
|
|
675
|
+
await h.manager.destroy();
|
|
676
|
+
expect(h.killed.filter((k) => k.signal === "SIGTERM")).toHaveLength(6);
|
|
677
|
+
expect(h.killed.filter((k) => k.signal === "SIGKILL")).toEqual([
|
|
678
|
+
{ child: h.child("panel"), signal: "SIGKILL" },
|
|
679
|
+
]);
|
|
680
|
+
});
|
|
681
|
+
});
|
|
682
|
+
|
|
683
|
+
describe("DesktopSessionManager viewer slot", () => {
|
|
684
|
+
test("holds one viewer and only the holder can release it", () => {
|
|
685
|
+
const h = newManager();
|
|
686
|
+
const first = newViewer().viewer;
|
|
687
|
+
const second = newViewer().viewer;
|
|
688
|
+
|
|
689
|
+
expect(h.manager.acquireViewerSlot(first)).toEqual({ ok: true });
|
|
690
|
+
expect(h.manager.acquireViewerSlot(second)).toEqual(BUSY);
|
|
691
|
+
|
|
692
|
+
h.manager.releaseViewerSlot(second);
|
|
693
|
+
expect(h.manager.acquireViewerSlot(second)).toEqual(BUSY);
|
|
694
|
+
|
|
695
|
+
h.manager.releaseViewerSlot(first);
|
|
696
|
+
expect(h.manager.acquireViewerSlot(second)).toEqual({ ok: true });
|
|
697
|
+
});
|
|
698
|
+
|
|
699
|
+
test("the tree lingers after the last viewer leaves, then is torn down", async () => {
|
|
700
|
+
const h = newManager();
|
|
701
|
+
const { viewer } = newViewer();
|
|
702
|
+
h.manager.acquireViewerSlot(viewer);
|
|
703
|
+
await h.manager.ensureDesktopRunning();
|
|
704
|
+
await settle();
|
|
705
|
+
|
|
706
|
+
h.manager.releaseViewerSlot(viewer);
|
|
707
|
+
expect(h.killed).toEqual([]);
|
|
708
|
+
|
|
709
|
+
await sleep(LINGER_MS * 2);
|
|
710
|
+
expect(h.terminated()).toHaveLength(6);
|
|
711
|
+
await h.manager.ensureDesktopRunning();
|
|
712
|
+
expect(h.count("x-server")).toBe(2);
|
|
713
|
+
});
|
|
714
|
+
|
|
715
|
+
test("a viewer returning inside the linger window keeps the tree", async () => {
|
|
716
|
+
const h = newManager();
|
|
717
|
+
const { viewer } = newViewer();
|
|
718
|
+
h.manager.acquireViewerSlot(viewer);
|
|
719
|
+
await h.manager.ensureDesktopRunning();
|
|
720
|
+
await settle();
|
|
721
|
+
|
|
722
|
+
h.manager.releaseViewerSlot(viewer);
|
|
723
|
+
h.manager.acquireViewerSlot(viewer);
|
|
724
|
+
await sleep(LINGER_MS * 2);
|
|
725
|
+
|
|
726
|
+
expect(h.killed).toEqual([]);
|
|
727
|
+
await h.manager.ensureDesktopRunning();
|
|
728
|
+
expect(h.count("x-server")).toBe(1);
|
|
729
|
+
});
|
|
730
|
+
});
|