@vellumai/assistant 0.12.1 → 0.12.2-staging.1
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/openapi.yaml +327 -52
- 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-skill-tools.test.ts +27 -0
- package/src/__tests__/conversation-surfaces-app-control.test.ts +8 -3
- 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 +212 -3
- package/src/__tests__/credential-security-invariants.test.ts +4 -2
- package/src/__tests__/cu-unified-flow.test.ts +8 -2
- 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 +539 -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 +113 -0
- package/src/__tests__/oauth-provider-profiles.test.ts +18 -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__/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 +19 -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__/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__/agent-process.test.ts +258 -4
- package/src/acp/__tests__/auth-required.test.ts +96 -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__/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/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/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/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 +58 -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 +37 -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 +53 -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 +59 -46
- package/src/calls/voice-triage-escalate.ts +175 -56
- 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/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 +20 -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 +24 -12
- package/src/config/loader.ts +1 -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 +8 -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 +2 -1
- package/src/daemon/conversation-skill-tools.ts +13 -31
- package/src/daemon/conversation-store.ts +1 -1
- package/src/daemon/conversation-surfaces.ts +15 -9
- package/src/daemon/conversation-tool-setup.ts +37 -43
- 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 +186 -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-metrics.test.ts +0 -3
- package/src/live-voice/__tests__/live-voice-progress.test.ts +15 -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__/runtime-websocket-shell.test.ts +13 -69
- package/src/live-voice/live-voice-photo.ts +25 -6
- package/src/live-voice/live-voice-session.ts +213 -693
- package/src/live-voice/protocol.ts +0 -2
- 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 +54 -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 +73 -0
- package/src/oauth/connection-resolver.ts +95 -2
- package/src/oauth/scope-utils.ts +24 -0
- package/src/oauth/seed-providers.ts +204 -25
- 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-routes.test.ts +159 -4
- package/src/runtime/routes/__tests__/apps-refresh-route.test.ts +205 -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-routes.test.ts +15 -0
- package/src/runtime/routes/acp-routes.ts +72 -9
- package/src/runtime/routes/app-management-routes.ts +73 -0
- 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 +19 -10
- 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 +36 -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/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-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,230 @@
|
|
|
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 { fileURLToPath } from "node:url";
|
|
11
|
+
import { afterEach, expect, test } from "bun:test";
|
|
12
|
+
|
|
13
|
+
import { DOMParser } from "@xmldom/xmldom";
|
|
14
|
+
|
|
15
|
+
import { writeDesktopWindowManagerConfig } from "./desktop-window-manager-config.js";
|
|
16
|
+
import { writeDesktopWindowTheme } from "./desktop-window-theme.js";
|
|
17
|
+
|
|
18
|
+
const roots: string[] = [];
|
|
19
|
+
afterEach(() => {
|
|
20
|
+
for (const root of roots.splice(0)) {
|
|
21
|
+
rmSync(root, { recursive: true, force: true });
|
|
22
|
+
}
|
|
23
|
+
});
|
|
24
|
+
|
|
25
|
+
test("adapts existing settings without removing window controls, application menus or originals", () => {
|
|
26
|
+
const home = mkdtempSync(join(tmpdir(), "desktop-window-config-"));
|
|
27
|
+
roots.push(home);
|
|
28
|
+
const sourceDir = join(home, ".config", "openbox");
|
|
29
|
+
mkdirSync(sourceDir, { recursive: true });
|
|
30
|
+
const source = `<openbox_config xmlns="http://openbox.org/3.4/rc">
|
|
31
|
+
<theme><name>Custom theme</name><titleLayout>NLIMC</titleLayout></theme>
|
|
32
|
+
<desktops><number>4</number><firstdesk>3</firstdesk></desktops>
|
|
33
|
+
<keyboard>
|
|
34
|
+
<keybind key="A-Tab"><action name="NextWindow"/></keybind>
|
|
35
|
+
<keybind key="C-A-Right"><action name="GoToDesktop"><to>right</to></action></keybind>
|
|
36
|
+
<keybind key="W-d"><action name="ShowDesktop"/></keybind>
|
|
37
|
+
</keyboard>
|
|
38
|
+
<mouse><context name="Desktop">
|
|
39
|
+
<mousebind button="Up" action="Click"><action name="GoToDesktop"><to>previous</to></action></mousebind>
|
|
40
|
+
<mousebind button="Middle" action="Press"><action name="ShowMenu"><menu>client-list-combined-menu</menu></action></mousebind>
|
|
41
|
+
<mousebind button="Right" action="Press"><action name="ShowMenu"><menu>root-menu</menu></action></mousebind>
|
|
42
|
+
</context><context name="Titlebar">
|
|
43
|
+
<mousebind button="Left" action="Drag"><action name="Move"/></mousebind>
|
|
44
|
+
</context></mouse>
|
|
45
|
+
<menu><file>menu.xml</file><file>/missing/optional-menu.xml</file></menu>
|
|
46
|
+
<applications><application class="XTerm"><desktop>4</desktop><maximized>yes</maximized></application></applications>
|
|
47
|
+
</openbox_config>`;
|
|
48
|
+
const menu = `<openbox_menu xmlns="http://openbox.org/3.4/menu"><menu id="root-menu" label="Menu">
|
|
49
|
+
<item label="Terminal"><action name="Execute"><command>xterm</command></action></item>
|
|
50
|
+
<menu id="client-list-menu" label="Desktops"/>
|
|
51
|
+
</menu></openbox_menu>`;
|
|
52
|
+
writeFileSync(join(sourceDir, "rc.xml"), source);
|
|
53
|
+
writeFileSync(join(sourceDir, "menu.xml"), menu);
|
|
54
|
+
const configDir = join(home, "generated");
|
|
55
|
+
const path = writeDesktopWindowManagerConfig(configDir, home);
|
|
56
|
+
const first = readFileSync(path, "utf8");
|
|
57
|
+
const parsed = new DOMParser().parseFromString(first, "application/xml");
|
|
58
|
+
const actions = Array.from(parsed.getElementsByTagName("action"));
|
|
59
|
+
expect(actions.map((action) => action.getAttribute("name"))).toEqual([
|
|
60
|
+
"NextWindow",
|
|
61
|
+
"ShowDesktop",
|
|
62
|
+
"ShowMenu",
|
|
63
|
+
"Move",
|
|
64
|
+
]);
|
|
65
|
+
expect(actions[2]?.textContent).toBe("root-menu");
|
|
66
|
+
expect(parsed.getElementsByTagName("theme")[0]?.textContent).toBe(
|
|
67
|
+
"Custom themeNLIMC",
|
|
68
|
+
);
|
|
69
|
+
const rules = Array.from(parsed.getElementsByTagName("application"));
|
|
70
|
+
expect(rules[0]?.getElementsByTagName("maximized")[0]?.textContent).toBe(
|
|
71
|
+
"yes",
|
|
72
|
+
);
|
|
73
|
+
expect(rules.at(-1)?.getAttribute("class")).toBe("*");
|
|
74
|
+
expect(rules.at(-1)?.getElementsByTagName("desktop")[0]?.textContent).toBe(
|
|
75
|
+
"1",
|
|
76
|
+
);
|
|
77
|
+
const generatedMenu = readFileSync(
|
|
78
|
+
parsed.getElementsByTagName("file")[0]!.textContent!,
|
|
79
|
+
"utf8",
|
|
80
|
+
);
|
|
81
|
+
expect(parsed.getElementsByTagName("file")[1]?.textContent).toBe(
|
|
82
|
+
"/missing/optional-menu.xml",
|
|
83
|
+
);
|
|
84
|
+
expect(generatedMenu).toContain('label="Terminal"');
|
|
85
|
+
expect(generatedMenu).not.toContain('id="client-list-menu"');
|
|
86
|
+
expect(readFileSync(join(sourceDir, "rc.xml"), "utf8")).toBe(source);
|
|
87
|
+
expect(readFileSync(join(sourceDir, "menu.xml"), "utf8")).toBe(menu);
|
|
88
|
+
writeDesktopWindowManagerConfig(configDir, home);
|
|
89
|
+
expect(readFileSync(path, "utf8")).toBe(first);
|
|
90
|
+
const themed = writeDesktopWindowTheme(configDir, home);
|
|
91
|
+
writeDesktopWindowManagerConfig(configDir, home, themed);
|
|
92
|
+
const composed = new DOMParser().parseFromString(
|
|
93
|
+
readFileSync(path, "utf8"),
|
|
94
|
+
"application/xml",
|
|
95
|
+
);
|
|
96
|
+
expect(
|
|
97
|
+
composed.getElementsByTagName("theme")[0]?.getElementsByTagName("name")[0]
|
|
98
|
+
?.textContent,
|
|
99
|
+
).toBe(join(configDir, "window-theme"));
|
|
100
|
+
expect(composed.documentElement?.getAttribute("xml:base")).toContain(
|
|
101
|
+
"/.config/openbox/rc.xml",
|
|
102
|
+
);
|
|
103
|
+
expect(composed.getElementsByTagName("action").length).toBe(actions.length);
|
|
104
|
+
expect(readFileSync(join(sourceDir, "rc.xml"), "utf8")).toBe(source);
|
|
105
|
+
});
|
|
106
|
+
|
|
107
|
+
test("adapts nested XIncludes while preserving window actions, lookup bases and source files", () => {
|
|
108
|
+
const home = mkdtempSync(join(tmpdir(), "desktop-window-includes-"));
|
|
109
|
+
roots.push(home);
|
|
110
|
+
const sourceDir = join(home, ".config", "openbox");
|
|
111
|
+
mkdirSync(join(sourceDir, "bindings", "nested"), { recursive: true });
|
|
112
|
+
const sources = {
|
|
113
|
+
"rc.xml": `<openbox_config xmlns="http://openbox.org/3.4/rc" xmlns:xi="http://www.w3.org/2001/XInclude">
|
|
114
|
+
<theme><name>Custom</name></theme>
|
|
115
|
+
<xi:include href="bindings/keyboard.xml"/>
|
|
116
|
+
<xi:include href="sections.xml" xpointer="xpointer(/sections/*)"/>
|
|
117
|
+
<menu><file>menu.xml</file></menu>
|
|
118
|
+
</openbox_config>`,
|
|
119
|
+
"sections.xml": `<sections>
|
|
120
|
+
<desktops><number>4</number><firstdesk>3</firstdesk></desktops>
|
|
121
|
+
<mouse><screenEdgeWarpTime>400</screenEdgeWarpTime></mouse>
|
|
122
|
+
<menu><manageDesktops>yes</manageDesktops><file>menu.xml</file></menu>
|
|
123
|
+
<applications><application class="XTerm"><desktop>4</desktop><maximized>yes</maximized></application></applications>
|
|
124
|
+
</sections>`,
|
|
125
|
+
"bindings/keyboard.xml": `<keyboard xmlns="http://openbox.org/3.4/rc" xmlns:xi="http://www.w3.org/2001/XInclude" xml:base="nested/">
|
|
126
|
+
<keybind key="A-Tab"><action name="NextWindow"/></keybind>
|
|
127
|
+
<keybind key="C-A-Right"><action name="GoToDesktop"/></keybind>
|
|
128
|
+
<xi:include href="more.xml" xpointer="xpointer(/bindings/keybind)"/>
|
|
129
|
+
</keyboard>`,
|
|
130
|
+
"bindings/nested/more.xml": `<bindings>
|
|
131
|
+
<keybind key="A-F4"><action name="Close"/></keybind>
|
|
132
|
+
<keybind key="C-A-Plus"><action name="AddDesktopLast"/></keybind>
|
|
133
|
+
</bindings>`,
|
|
134
|
+
"menu.xml": `<openbox_menu xmlns:xi="http://www.w3.org/2001/XInclude">
|
|
135
|
+
<menu id="root-menu"><xi:include href="menu-items.xml"/></menu>
|
|
136
|
+
</openbox_menu>`,
|
|
137
|
+
"menu-items.xml": `<menu id="apps">
|
|
138
|
+
<item label="Terminal"><action name="Execute"><command>xterm</command></action></item>
|
|
139
|
+
<item label="Workspaces"><action name="ShowMenu"><menu>client-list-menu</menu></action></item>
|
|
140
|
+
</menu>`,
|
|
141
|
+
};
|
|
142
|
+
for (const [name, contents] of Object.entries(sources)) {
|
|
143
|
+
writeFileSync(join(sourceDir, name), contents);
|
|
144
|
+
}
|
|
145
|
+
const configDir = join(home, "generated");
|
|
146
|
+
const readXml = (path: string) =>
|
|
147
|
+
new DOMParser().parseFromString(
|
|
148
|
+
readFileSync(path, "utf8"),
|
|
149
|
+
"application/xml",
|
|
150
|
+
);
|
|
151
|
+
const config = readXml(
|
|
152
|
+
writeDesktopWindowManagerConfig(
|
|
153
|
+
configDir,
|
|
154
|
+
home,
|
|
155
|
+
writeDesktopWindowTheme(configDir, home),
|
|
156
|
+
),
|
|
157
|
+
);
|
|
158
|
+
const include = (document: ReturnType<typeof readXml>) =>
|
|
159
|
+
document.getElementsByTagNameNS(
|
|
160
|
+
"http://www.w3.org/2001/XInclude",
|
|
161
|
+
"include",
|
|
162
|
+
)[0]!;
|
|
163
|
+
const sections = readXml(
|
|
164
|
+
fileURLToPath(
|
|
165
|
+
config
|
|
166
|
+
.getElementsByTagNameNS(
|
|
167
|
+
"http://www.w3.org/2001/XInclude",
|
|
168
|
+
"include",
|
|
169
|
+
)[1]!
|
|
170
|
+
.getAttribute("href")!,
|
|
171
|
+
),
|
|
172
|
+
);
|
|
173
|
+
expect(sections.getElementsByTagName("number")[0]!.textContent).toBe("1");
|
|
174
|
+
expect(sections.getElementsByTagName("firstdesk")[0]!.textContent).toBe("1");
|
|
175
|
+
expect(
|
|
176
|
+
sections.getElementsByTagName("screenEdgeWarpTime")[0]!.textContent,
|
|
177
|
+
).toBe("0");
|
|
178
|
+
expect(sections.getElementsByTagName("manageDesktops")[0]!.textContent).toBe(
|
|
179
|
+
"no",
|
|
180
|
+
);
|
|
181
|
+
const rules = Array.from(sections.getElementsByTagName("application"));
|
|
182
|
+
expect(rules[0]!.getElementsByTagName("maximized")[0]!.textContent).toBe(
|
|
183
|
+
"yes",
|
|
184
|
+
);
|
|
185
|
+
expect(rules.at(-1)!.getAttribute("class")).toBe("*");
|
|
186
|
+
expect(rules.at(-1)!.getElementsByTagName("desktop")[0]!.textContent).toBe(
|
|
187
|
+
"1",
|
|
188
|
+
);
|
|
189
|
+
const keyboard = readXml(
|
|
190
|
+
fileURLToPath(include(config).getAttribute("href")!),
|
|
191
|
+
);
|
|
192
|
+
expect(keyboard.toString()).toContain('name="NextWindow"');
|
|
193
|
+
expect(keyboard.toString()).not.toContain('name="GoToDesktop"');
|
|
194
|
+
expect(include(keyboard).getAttribute("xpointer")).toBe(
|
|
195
|
+
"xpointer(/bindings/keybind)",
|
|
196
|
+
);
|
|
197
|
+
const nested = readXml(
|
|
198
|
+
fileURLToPath(include(keyboard).getAttribute("href")!),
|
|
199
|
+
);
|
|
200
|
+
expect(nested.toString()).toContain('name="Close"');
|
|
201
|
+
expect(nested.toString()).not.toContain('name="AddDesktopLast"');
|
|
202
|
+
const menu = readXml(config.getElementsByTagName("file")[0]!.textContent!);
|
|
203
|
+
const items = readXml(fileURLToPath(include(menu).getAttribute("href")!));
|
|
204
|
+
expect(items.toString()).toContain("xterm");
|
|
205
|
+
expect(items.toString()).not.toContain("client-list-menu");
|
|
206
|
+
for (const [name, contents] of Object.entries(sources)) {
|
|
207
|
+
expect(readFileSync(join(sourceDir, name), "utf8")).toBe(contents);
|
|
208
|
+
}
|
|
209
|
+
});
|
|
210
|
+
|
|
211
|
+
for (const entityLocation of ["config", "menu"] as const) {
|
|
212
|
+
test(`preserves valid ${entityLocation} DTD entities for Openbox when adaptation is unsupported`, () => {
|
|
213
|
+
const home = mkdtempSync(join(tmpdir(), "desktop-window-entities-"));
|
|
214
|
+
roots.push(home);
|
|
215
|
+
const sourceDir = join(home, ".config", "openbox");
|
|
216
|
+
mkdirSync(sourceDir, { recursive: true });
|
|
217
|
+
const configPath = join(sourceDir, "rc.xml");
|
|
218
|
+
const config =
|
|
219
|
+
entityLocation === "config"
|
|
220
|
+
? `<!DOCTYPE openbox_config [<!ENTITY theme "Custom">]><openbox_config><theme><name>&theme;</name></theme></openbox_config>`
|
|
221
|
+
: `<openbox_config><menu><file>menu.xml</file></menu></openbox_config>`;
|
|
222
|
+
const menu = `<!DOCTYPE openbox_menu [<!ENTITY terminal "xterm">]><openbox_menu><menu id="root-menu"><item label="Terminal"><action name="Execute"><command>&terminal;</command></action></item></menu></openbox_menu>`;
|
|
223
|
+
writeFileSync(configPath, config);
|
|
224
|
+
writeFileSync(join(sourceDir, "menu.xml"), menu);
|
|
225
|
+
const path = writeDesktopWindowManagerConfig(join(home, "generated"), home);
|
|
226
|
+
expect(path).toBe(configPath);
|
|
227
|
+
expect(readFileSync(path, "utf8")).toBe(config);
|
|
228
|
+
expect(readFileSync(join(sourceDir, "menu.xml"), "utf8")).toBe(menu);
|
|
229
|
+
});
|
|
230
|
+
}
|
|
@@ -0,0 +1,238 @@
|
|
|
1
|
+
import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
|
|
2
|
+
import { homedir } from "node:os";
|
|
3
|
+
import { isAbsolute, join } from "node:path";
|
|
4
|
+
import { fileURLToPath, pathToFileURL } from "node:url";
|
|
5
|
+
|
|
6
|
+
import {
|
|
7
|
+
type Document,
|
|
8
|
+
DOMParser,
|
|
9
|
+
type Element,
|
|
10
|
+
XMLSerializer,
|
|
11
|
+
} from "@xmldom/xmldom";
|
|
12
|
+
|
|
13
|
+
import { getLogger } from "../util/logger.js";
|
|
14
|
+
|
|
15
|
+
const log = getLogger("desktop-window-config");
|
|
16
|
+
|
|
17
|
+
const XML_NAMESPACE = "http://www.w3.org/XML/1998/namespace";
|
|
18
|
+
const XINCLUDE_NAMESPACE = "http://www.w3.org/2001/XInclude";
|
|
19
|
+
|
|
20
|
+
const WORKSPACE_MENUS = new Set([
|
|
21
|
+
"client-list-menu",
|
|
22
|
+
"client-list-combined-menu",
|
|
23
|
+
]);
|
|
24
|
+
const WORKSPACE_ACTION =
|
|
25
|
+
/^(GoToDesktop|SendToDesktop.*|AddDesktop.*|RemoveDesktop.*|Desktop(?:Next|Previous|Left|Right|Up|Down|Last)?|ToggleOmnipresent)$/i;
|
|
26
|
+
|
|
27
|
+
export function writeDesktopWindowManagerConfig(
|
|
28
|
+
configDir: string,
|
|
29
|
+
home = homedir(),
|
|
30
|
+
sourcePath?: string,
|
|
31
|
+
): string {
|
|
32
|
+
const searchDirs = [join(home, ".config", "openbox"), "/etc/xdg/openbox"];
|
|
33
|
+
const source = readConfig(sourcePath ?? "rc.xml", searchDirs);
|
|
34
|
+
if (!source) {
|
|
35
|
+
throw new Error("Desktop window manager config is missing: rc.xml");
|
|
36
|
+
}
|
|
37
|
+
try {
|
|
38
|
+
return writeManagedConfig(configDir, home, searchDirs, source);
|
|
39
|
+
} catch (err) {
|
|
40
|
+
log.warn(
|
|
41
|
+
{ err },
|
|
42
|
+
"Desktop workspace config could not be adapted; preserving the existing Openbox config",
|
|
43
|
+
);
|
|
44
|
+
return source.path;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
function writeManagedConfig(
|
|
49
|
+
configDir: string,
|
|
50
|
+
home: string,
|
|
51
|
+
searchDirs: string[],
|
|
52
|
+
source: { path: string; contents: string },
|
|
53
|
+
): string {
|
|
54
|
+
const config = parseXml(source.contents, source.path);
|
|
55
|
+
const root = config.documentElement!;
|
|
56
|
+
for (const section of ["desktops", "mouse", "menu", "applications"]) {
|
|
57
|
+
child(root, section);
|
|
58
|
+
}
|
|
59
|
+
mkdirSync(configDir, { recursive: true });
|
|
60
|
+
const copies = new Map<string, string>();
|
|
61
|
+
function copyConfig(source: { path: string; contents: string }): string {
|
|
62
|
+
const existing = copies.get(source.path);
|
|
63
|
+
if (existing) {
|
|
64
|
+
return existing;
|
|
65
|
+
}
|
|
66
|
+
const path = join(configDir, `openbox-include-${copies.size}.xml`);
|
|
67
|
+
copies.set(source.path, path);
|
|
68
|
+
const document = parseXml(source.contents, source.path);
|
|
69
|
+
adaptReferences(document);
|
|
70
|
+
writeFileSync(path, new XMLSerializer().serializeToString(document));
|
|
71
|
+
return path;
|
|
72
|
+
}
|
|
73
|
+
function adaptReferences(document: Document): void {
|
|
74
|
+
removeWorkspaceControls(document);
|
|
75
|
+
configureWorkspaceSections(document);
|
|
76
|
+
for (const include of Array.from(
|
|
77
|
+
document.getElementsByTagNameNS(XINCLUDE_NAMESPACE, "include"),
|
|
78
|
+
)) {
|
|
79
|
+
if (include.getAttribute("parse") === "text") {
|
|
80
|
+
continue;
|
|
81
|
+
}
|
|
82
|
+
const url = new URL(include.getAttribute("href") ?? "", xmlBase(include));
|
|
83
|
+
const included = readConfig(fileURLToPath(url), []);
|
|
84
|
+
if (included) {
|
|
85
|
+
include.setAttribute("href", pathToFileURL(copyConfig(included)).href);
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
for (const file of Array.from(
|
|
89
|
+
document.getElementsByTagNameNS("*", "file"),
|
|
90
|
+
)) {
|
|
91
|
+
if ((file.parentNode as Element | null)?.localName !== "menu") {
|
|
92
|
+
continue;
|
|
93
|
+
}
|
|
94
|
+
const name = file.textContent?.trim();
|
|
95
|
+
if (!name) {
|
|
96
|
+
continue;
|
|
97
|
+
}
|
|
98
|
+
const menuSource = readConfig(
|
|
99
|
+
name.startsWith("~/") ? join(home, name.slice(2)) : name,
|
|
100
|
+
searchDirs,
|
|
101
|
+
);
|
|
102
|
+
if (menuSource) {
|
|
103
|
+
file.textContent = copyConfig(menuSource);
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
adaptReferences(config);
|
|
108
|
+
const path = join(configDir, "openbox.xml");
|
|
109
|
+
writeFileSync(path, new XMLSerializer().serializeToString(config));
|
|
110
|
+
return path;
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
function configureWorkspaceSections(document: Document): void {
|
|
114
|
+
for (const desktops of Array.from(
|
|
115
|
+
document.getElementsByTagNameNS("*", "desktops"),
|
|
116
|
+
)) {
|
|
117
|
+
child(desktops, "number").textContent = "1";
|
|
118
|
+
child(desktops, "firstdesk").textContent = "1";
|
|
119
|
+
child(desktops, "popupTime").textContent = "0";
|
|
120
|
+
}
|
|
121
|
+
for (const mouse of Array.from(
|
|
122
|
+
document.getElementsByTagNameNS("*", "mouse"),
|
|
123
|
+
)) {
|
|
124
|
+
child(mouse, "screenEdgeWarpTime").textContent = "0";
|
|
125
|
+
}
|
|
126
|
+
for (const menu of Array.from(document.getElementsByTagNameNS("*", "menu"))) {
|
|
127
|
+
if (
|
|
128
|
+
!menu.hasAttribute("id") &&
|
|
129
|
+
(menu.parentNode as Element | null)?.localName !== "action"
|
|
130
|
+
) {
|
|
131
|
+
child(menu, "manageDesktops").textContent = "no";
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
for (const applications of Array.from(
|
|
135
|
+
document.getElementsByTagNameNS("*", "applications"),
|
|
136
|
+
)) {
|
|
137
|
+
// The last matching rule also covers windows restored with stale assignments.
|
|
138
|
+
const application = document.createElementNS(
|
|
139
|
+
applications.namespaceURI,
|
|
140
|
+
"application",
|
|
141
|
+
);
|
|
142
|
+
application.setAttribute("class", "*");
|
|
143
|
+
child(application, "desktop").textContent = "1";
|
|
144
|
+
applications.appendChild(application);
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
|
|
148
|
+
function readConfig(name: string, directories: string[]) {
|
|
149
|
+
for (const path of isAbsolute(name)
|
|
150
|
+
? [name]
|
|
151
|
+
: directories.map((dir) => join(dir, name))) {
|
|
152
|
+
try {
|
|
153
|
+
return { path, contents: readFileSync(path, "utf8") };
|
|
154
|
+
} catch (err) {
|
|
155
|
+
if ((err as NodeJS.ErrnoException).code !== "ENOENT") {
|
|
156
|
+
throw err;
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
return null;
|
|
161
|
+
}
|
|
162
|
+
|
|
163
|
+
function parseXml(contents: string, sourcePath: string): Document {
|
|
164
|
+
const document = new DOMParser({
|
|
165
|
+
onError: (level, message) => {
|
|
166
|
+
if (level !== "warning") {
|
|
167
|
+
throw new Error(message);
|
|
168
|
+
}
|
|
169
|
+
},
|
|
170
|
+
}).parseFromString(contents, "application/xml");
|
|
171
|
+
const root = document.documentElement!;
|
|
172
|
+
root.setAttributeNS(
|
|
173
|
+
XML_NAMESPACE,
|
|
174
|
+
"xml:base",
|
|
175
|
+
new URL(
|
|
176
|
+
root.getAttributeNS(XML_NAMESPACE, "base") ?? "",
|
|
177
|
+
pathToFileURL(sourcePath),
|
|
178
|
+
).href,
|
|
179
|
+
);
|
|
180
|
+
return document;
|
|
181
|
+
}
|
|
182
|
+
|
|
183
|
+
function xmlBase(element: Element): string {
|
|
184
|
+
const ancestors: Element[] = [];
|
|
185
|
+
for (
|
|
186
|
+
let node: Element | null = element;
|
|
187
|
+
node;
|
|
188
|
+
node = node.parentNode?.nodeType === 1 ? (node.parentNode as Element) : null
|
|
189
|
+
) {
|
|
190
|
+
ancestors.unshift(node);
|
|
191
|
+
}
|
|
192
|
+
let base = "";
|
|
193
|
+
for (const ancestor of ancestors) {
|
|
194
|
+
const value = ancestor.getAttributeNS(XML_NAMESPACE, "base");
|
|
195
|
+
if (value) {
|
|
196
|
+
base = base ? new URL(value, base).href : value;
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
return base;
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
function child(parent: Element, name: string): Element {
|
|
203
|
+
const existing = Array.from(parent.childNodes).find(
|
|
204
|
+
(node): node is Element =>
|
|
205
|
+
node.nodeType === 1 && (node as Element).localName === name,
|
|
206
|
+
);
|
|
207
|
+
if (existing) {
|
|
208
|
+
return existing;
|
|
209
|
+
}
|
|
210
|
+
const element = parent.ownerDocument!.createElementNS(
|
|
211
|
+
parent.namespaceURI,
|
|
212
|
+
name,
|
|
213
|
+
);
|
|
214
|
+
parent.appendChild(element);
|
|
215
|
+
return element;
|
|
216
|
+
}
|
|
217
|
+
|
|
218
|
+
function removeWorkspaceControls(document: Document): void {
|
|
219
|
+
for (const menu of Array.from(document.getElementsByTagNameNS("*", "menu"))) {
|
|
220
|
+
if (WORKSPACE_MENUS.has(menu.getAttribute("id") ?? "")) {
|
|
221
|
+
menu.parentNode?.removeChild(menu);
|
|
222
|
+
}
|
|
223
|
+
}
|
|
224
|
+
for (const action of Array.from(
|
|
225
|
+
document.getElementsByTagNameNS("*", "action"),
|
|
226
|
+
)) {
|
|
227
|
+
const name = action.getAttribute("name") ?? "";
|
|
228
|
+
const menu = action
|
|
229
|
+
.getElementsByTagNameNS("*", "menu")[0]
|
|
230
|
+
?.textContent?.trim();
|
|
231
|
+
if (
|
|
232
|
+
WORKSPACE_ACTION.test(name) ||
|
|
233
|
+
(name.toLowerCase() === "showmenu" && menu && WORKSPACE_MENUS.has(menu))
|
|
234
|
+
) {
|
|
235
|
+
action.parentNode?.removeChild(action);
|
|
236
|
+
}
|
|
237
|
+
}
|
|
238
|
+
}
|
|
@@ -0,0 +1,170 @@
|
|
|
1
|
+
import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
|
|
2
|
+
import { join } from "node:path";
|
|
3
|
+
import { pathToFileURL } from "node:url";
|
|
4
|
+
|
|
5
|
+
import { escapeXmlAttr, escapeXmlContent } from "../util/xml.js";
|
|
6
|
+
|
|
7
|
+
const BUTTON_MASKS = {
|
|
8
|
+
close: [0x201, 0x102, 0x084, 0x048, 0x030, 0x030, 0x048, 0x084, 0x102, 0x201],
|
|
9
|
+
max: [0x3ff, 0x201, 0x201, 0x201, 0x201, 0x201, 0x201, 0x201, 0x201, 0x3ff],
|
|
10
|
+
max_toggled: [
|
|
11
|
+
0x3fc, 0x204, 0x27f, 0x241, 0x241, 0x241, 0x3c1, 0x041, 0x041, 0x07f,
|
|
12
|
+
],
|
|
13
|
+
iconify: [0, 0, 0, 0, 0x3ff, 0x3ff, 0, 0, 0, 0],
|
|
14
|
+
};
|
|
15
|
+
|
|
16
|
+
function windowTheme(accentHex: string | null): string {
|
|
17
|
+
const tint = (base: string, amount: number): string => {
|
|
18
|
+
if (!accentHex || !/^#[\da-f]{6}$/i.test(accentHex)) {
|
|
19
|
+
return base;
|
|
20
|
+
}
|
|
21
|
+
return (
|
|
22
|
+
"#" +
|
|
23
|
+
[1, 3, 5]
|
|
24
|
+
.map((offset) => {
|
|
25
|
+
const from = parseInt(base.slice(offset, offset + 2), 16);
|
|
26
|
+
const to = parseInt(accentHex.slice(offset, offset + 2), 16);
|
|
27
|
+
return Math.round(from + (to - from) * amount)
|
|
28
|
+
.toString(16)
|
|
29
|
+
.padStart(2, "0");
|
|
30
|
+
})
|
|
31
|
+
.join("")
|
|
32
|
+
);
|
|
33
|
+
};
|
|
34
|
+
return `
|
|
35
|
+
border.width: 1
|
|
36
|
+
padding.width: 8
|
|
37
|
+
padding.height: 7
|
|
38
|
+
window.client.padding.width: 0
|
|
39
|
+
window.client.padding.height: 0
|
|
40
|
+
window.handle.width: 3
|
|
41
|
+
window.label.text.justify: Center
|
|
42
|
+
window.*.label.text.font: shadow=n
|
|
43
|
+
window.*.title.bg: Flat Solid
|
|
44
|
+
window.*.label.bg: Parentrelative
|
|
45
|
+
window.*.handle.bg: Flat Solid
|
|
46
|
+
window.*.grip.bg: Flat Solid
|
|
47
|
+
window.*.button.*.bg: Parentrelative
|
|
48
|
+
window.*.button.*.hover.bg: Flat Solid
|
|
49
|
+
window.*.button.*.pressed.bg: Flat Solid
|
|
50
|
+
window.active.title.bg: Flat Gradient Horizontal
|
|
51
|
+
window.active.title.bg.color: ${tint("#292930", 0.28)}
|
|
52
|
+
window.active.title.bg.colorTo: #292930
|
|
53
|
+
window.active.border.color: #4a4a54
|
|
54
|
+
window.active.title.separator.color: #202026
|
|
55
|
+
window.active.label.text.color: #f0f0f4
|
|
56
|
+
window.active.handle.bg.color: #292930
|
|
57
|
+
window.active.grip.bg.color: #292930
|
|
58
|
+
window.active.button.*.image.color: #d4d4dc
|
|
59
|
+
window.active.button.*.hover.bg.color: ${tint("#45454f", 0.22)}
|
|
60
|
+
window.active.button.*.pressed.bg.color: ${tint("#555561", 0.18)}
|
|
61
|
+
window.active.button.*.disabled.image.color: #62626e
|
|
62
|
+
window.active.button.close.hover.bg.color: #b64150
|
|
63
|
+
window.active.button.close.pressed.bg.color: #963442
|
|
64
|
+
window.inactive.title.bg.color: #232329
|
|
65
|
+
window.inactive.border.color: #36363f
|
|
66
|
+
window.inactive.title.separator.color: #202026
|
|
67
|
+
window.inactive.label.text.color: #a6a6b2
|
|
68
|
+
window.inactive.handle.bg.color: #232329
|
|
69
|
+
window.inactive.grip.bg.color: #232329
|
|
70
|
+
window.inactive.button.*.image.color: #858592
|
|
71
|
+
window.inactive.button.*.hover.bg.color: #3b3b45
|
|
72
|
+
window.inactive.button.*.pressed.bg.color: #4a4a54
|
|
73
|
+
window.inactive.button.*.disabled.image.color: #565660
|
|
74
|
+
menu.border.width: 1
|
|
75
|
+
menu.border.color: #4a4a54
|
|
76
|
+
menu.title.bg: Flat Solid
|
|
77
|
+
menu.title.bg.color: #292930
|
|
78
|
+
menu.title.text.color: #f0f0f4
|
|
79
|
+
menu.title.text.font: shadow=n
|
|
80
|
+
menu.items.bg: Flat Solid
|
|
81
|
+
menu.items.bg.color: #232329
|
|
82
|
+
menu.items.text.color: #e6e6ee
|
|
83
|
+
menu.items.disabled.text.color: #858592
|
|
84
|
+
menu.items.active.bg: Flat Solid
|
|
85
|
+
menu.items.active.bg.color: #45454f
|
|
86
|
+
menu.items.active.text.color: #ffffff
|
|
87
|
+
menu.items.active.disabled.text.color: #a6a6b2
|
|
88
|
+
menu.separator.color: #45454f
|
|
89
|
+
osd.bg: Flat Solid
|
|
90
|
+
osd.bg.color: #292930
|
|
91
|
+
osd.border.color: #4a4a54
|
|
92
|
+
osd.label.text.color: #f0f0f4
|
|
93
|
+
`;
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
/** Keep Openbox bindings and placement rules while styling its decorations. */
|
|
97
|
+
export function writeDesktopWindowTheme(
|
|
98
|
+
configDir: string,
|
|
99
|
+
home?: string,
|
|
100
|
+
accentHex: string | null = null,
|
|
101
|
+
): string {
|
|
102
|
+
let source: string | undefined;
|
|
103
|
+
let sourcePath = "";
|
|
104
|
+
const candidates = [
|
|
105
|
+
...(home ? [join(home, ".config", "openbox", "rc.xml")] : []),
|
|
106
|
+
"/etc/xdg/openbox/rc.xml",
|
|
107
|
+
];
|
|
108
|
+
for (const path of candidates) {
|
|
109
|
+
try {
|
|
110
|
+
source = readFileSync(path, "utf8");
|
|
111
|
+
sourcePath = path;
|
|
112
|
+
break;
|
|
113
|
+
} catch (err) {
|
|
114
|
+
if ((err as NodeJS.ErrnoException).code !== "ENOENT") {
|
|
115
|
+
throw err;
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
if (!source || !/<theme>[^]*?<\/theme>/.test(source)) {
|
|
120
|
+
throw new Error("Openbox theme configuration is unavailable");
|
|
121
|
+
}
|
|
122
|
+
const root = source.match(/<openbox_config\b[^>]*>/)?.[0];
|
|
123
|
+
if (!root || /\bxml:base\s*=/.test(root)) {
|
|
124
|
+
throw new Error("Openbox configuration requires its original base URI");
|
|
125
|
+
}
|
|
126
|
+
// Relative XIncludes keep resolving beside the source configuration.
|
|
127
|
+
source = source.replace(root, () =>
|
|
128
|
+
root.replace(
|
|
129
|
+
"<openbox_config",
|
|
130
|
+
`<openbox_config xml:base="${escapeXmlAttr(pathToFileURL(sourcePath).href)}"`,
|
|
131
|
+
),
|
|
132
|
+
);
|
|
133
|
+
const themeDir = join(configDir, "window-theme");
|
|
134
|
+
mkdirSync(join(themeDir, "openbox-3"), { recursive: true });
|
|
135
|
+
writeFileSync(
|
|
136
|
+
join(themeDir, "openbox-3", "themerc"),
|
|
137
|
+
windowTheme(accentHex).trimStart(),
|
|
138
|
+
);
|
|
139
|
+
for (const [name, rows] of Object.entries(BUTTON_MASKS)) {
|
|
140
|
+
const bytes = rows.flatMap((row) => [row & 0xff, row >> 8]);
|
|
141
|
+
writeFileSync(
|
|
142
|
+
join(themeDir, "openbox-3", `${name}.xbm`),
|
|
143
|
+
`#define button_width 10\n#define button_height 10\nstatic unsigned char button_bits[] = {\n${bytes.map((byte) => `0x${byte.toString(16)}`).join(",")}};\n`,
|
|
144
|
+
);
|
|
145
|
+
}
|
|
146
|
+
const fonts = [
|
|
147
|
+
"ActiveWindow",
|
|
148
|
+
"InactiveWindow",
|
|
149
|
+
"MenuHeader",
|
|
150
|
+
"MenuItem",
|
|
151
|
+
"ActiveOnScreenDisplay",
|
|
152
|
+
"InactiveOnScreenDisplay",
|
|
153
|
+
].map(
|
|
154
|
+
(place) =>
|
|
155
|
+
`<font place="${place}"><name>sans</name><size>10</size><weight>normal</weight><slant>normal</slant></font>`,
|
|
156
|
+
);
|
|
157
|
+
const theme = `<theme>
|
|
158
|
+
<name>${escapeXmlContent(themeDir)}</name>
|
|
159
|
+
<titleLayout>LIMC</titleLayout>
|
|
160
|
+
<keepBorder>yes</keepBorder>
|
|
161
|
+
<animateIconify>yes</animateIconify>
|
|
162
|
+
${fonts.join("\n ")}
|
|
163
|
+
</theme>`;
|
|
164
|
+
const configPath = join(configDir, "window-manager.xml");
|
|
165
|
+
writeFileSync(
|
|
166
|
+
configPath,
|
|
167
|
+
source.replace(/<theme>[^]*?<\/theme>/, () => theme),
|
|
168
|
+
);
|
|
169
|
+
return configPath;
|
|
170
|
+
}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { existsSync, readFileSync, writeFileSync } from "node:fs";
|
|
2
2
|
import { join } from "node:path";
|
|
3
3
|
|
|
4
|
+
import { channelForBotProvider } from "@vellumai/service-contracts/channels";
|
|
5
|
+
|
|
4
6
|
import type { HeartbeatAlertEvent } from "../api/events/heartbeat-alert.js";
|
|
5
7
|
import { getConfig } from "../config/loader.js";
|
|
6
8
|
import type { HeartbeatConfig } from "../config/schemas/heartbeat.js";
|
|
@@ -55,6 +57,19 @@ const DEFAULT_CHECKLIST = `- Check in with yourself. Read NOW.md. Is it still ac
|
|
|
55
57
|
const EARLY_HEARTBEAT_THRESHOLD = 3;
|
|
56
58
|
const REENGAGEMENT_COOLDOWN_MS = 18 * 60 * 60 * 1000; // 18 hours
|
|
57
59
|
|
|
60
|
+
/**
|
|
61
|
+
* A provider key named by the identity it carries. The keys alone do not say
|
|
62
|
+
* which is which (`slack` is the integration acting as the connected person,
|
|
63
|
+
* `slack_channel` is the assistant's own bot), and a heartbeat told to avoid
|
|
64
|
+
* "slack" would otherwise stop posting through a bot whose credential is fine.
|
|
65
|
+
*/
|
|
66
|
+
function describeUnhealthyProvider(providerKey: string): string {
|
|
67
|
+
const channel = channelForBotProvider(providerKey);
|
|
68
|
+
return channel
|
|
69
|
+
? `${providerKey} (the ${channel} channel bot)`
|
|
70
|
+
: `${providerKey} (integration, acts as the connected person)`;
|
|
71
|
+
}
|
|
72
|
+
|
|
58
73
|
// Stripped-comment form of the guardian persona scaffold. Computed
|
|
59
74
|
// once at module load because stripping comment lines is deterministic
|
|
60
75
|
// and the template itself is a compile-time constant.
|
|
@@ -945,10 +960,13 @@ ${checklist}
|
|
|
945
960
|
</heartbeat-checklist>`;
|
|
946
961
|
|
|
947
962
|
if (unhealthyProviders.length > 0) {
|
|
948
|
-
const providers = unhealthyProviders
|
|
963
|
+
const providers = unhealthyProviders
|
|
964
|
+
.map(describeUnhealthyProvider)
|
|
965
|
+
.join(", ");
|
|
949
966
|
prompt += `\n\n<credential-status>
|
|
950
|
-
The following
|
|
951
|
-
Do NOT attempt to use tools for these providers
|
|
967
|
+
The following credentials are broken or expired: ${providers}.
|
|
968
|
+
Do NOT attempt to use tools for these providers, they will fail. Skip any checklist items that depend on them and note the outage in your summary.
|
|
969
|
+
A channel bot is the assistant's own identity on a channel and a separate credential from the integration of the same name; it is affected only when listed here as a channel bot.
|
|
952
970
|
</credential-status>`;
|
|
953
971
|
}
|
|
954
972
|
|