@vellumai/assistant 0.12.0 → 0.12.1-dev.202609141913.5e16607
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 +5 -1
- package/ARCHITECTURE.md +11 -12
- package/docs/architecture/turn-actor.md +15 -8
- package/docs/guardian-request-flow.md +16 -0
- package/openapi.yaml +292 -50
- package/package.json +1 -1
- package/scripts/smoke-desktop-window-theme.ts +186 -0
- package/src/__tests__/always-loaded-tools-guard.test.ts +18 -10
- 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__/computer-use-skill-proxy-bridge.test.ts +5 -2
- package/src/__tests__/computer-use-tools.test.ts +17 -5
- 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__/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-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__/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__/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 +13 -0
- package/src/__tests__/resolve-app.test.ts +135 -0
- 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__/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__/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 +94 -9
- 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/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/index.ts +6 -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/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/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/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 +2 -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/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-process.ts +35 -64
- package/src/daemon/conversation-skill-tools.ts +13 -31
- package/src/daemon/conversation-store.ts +1 -1
- package/src/daemon/conversation-surfaces.ts +10 -8
- package/src/daemon/conversation-tool-setup.ts +37 -43
- package/src/daemon/conversation.ts +0 -3
- package/src/daemon/host-bash-proxy.ts +8 -12
- package/src/daemon/host-browser-proxy.ts +15 -1
- package/src/daemon/host-file-proxy.ts +8 -10
- 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/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 +119 -0
- package/src/desktop/desktop-chrome-policy.test.ts +71 -0
- package/src/desktop/desktop-chrome-policy.ts +42 -0
- package/src/desktop/desktop-dependencies.test.ts +102 -0
- package/src/desktop/desktop-dependencies.ts +306 -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 +627 -0
- package/src/desktop/desktop-session-manager.ts +814 -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-theme.ts +170 -0
- 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-vad.test.ts +2 -2
- package/src/live-voice/__tests__/runtime-websocket-shell.test.ts +13 -69
- 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/__tests__/seed-providers-managed.test.ts +54 -0
- package/src/oauth/byo-connection.test.ts +45 -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/seed-providers.ts +165 -0
- 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-title-placeholders.ts +23 -0
- package/src/persistence/conversation-title-service.ts +9 -26
- 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-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/graph/capability-seed.ts +4 -6
- 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/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-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 +6 -1
- package/src/plugins/defaults/memory/substrate/__tests__/skill-content.test.ts +7 -9
- package/src/plugins/defaults/memory/substrate/skill-content.ts +2 -2
- package/src/plugins/defaults/memory/v3/__tests__/pool-select.test.ts +89 -0
- 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/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/auth.ts +2 -3
- package/src/providers/inference/connection-availability.ts +27 -8
- 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-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 +192 -78
- package/src/providers/openai/codex-models.ts +0 -4
- package/src/providers/openai/google-thought-signature.ts +320 -0
- package/src/runtime/AGENTS.md +2 -0
- 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__/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/auth/same-actor.ts +38 -3
- package/src/runtime/channel-send.ts +316 -0
- 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/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 +55 -3
- 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/platform-routes.ts +18 -15
- 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/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/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/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/capability-offer.test.ts +22 -2
- package/src/tools/capability-offer.ts +16 -1
- package/src/tools/computer-use/definitions.ts +4 -2
- package/src/tools/computer-use/skill-proxy-bridge.ts +2 -1
- package/src/tools/credentials/metadata-store.ts +100 -0
- 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/policy-context.ts +6 -7
- package/src/tools/subagent/spawn.ts +5 -8
- package/src/tools/terminal/__tests__/safe-env.test.ts +6 -6
- package/src/tools/terminal/__tests__/sanitized-bash.test.ts +57 -0
- package/src/tools/terminal/safe-env.ts +23 -3
- package/src/tools/terminal/sanitized-bash.ts +105 -0
- package/src/tools/watch/watch-retro-report.ts +0 -8
- 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/workspace/git-porcelain.ts +66 -0
- package/src/workspace/git-service.ts +5 -54
- 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,258 @@
|
|
|
1
|
+
import { existsSync, readFileSync, renameSync, writeFileSync } from "node:fs";
|
|
2
|
+
import { join } from "node:path";
|
|
3
|
+
import { Database } from "bun:sqlite";
|
|
4
|
+
|
|
5
|
+
import type { WorkspaceMigration } from "./types.js";
|
|
6
|
+
|
|
7
|
+
/**
|
|
8
|
+
* Repair `gpt-5.4` and `gpt-5.4-mini` pins on fragments that dispatch
|
|
9
|
+
* through the ChatGPT subscription.
|
|
10
|
+
*
|
|
11
|
+
* OpenAI serves neither model under ChatGPT sign-in: the Codex endpoint
|
|
12
|
+
* rejects them with HTTP 400 ("not supported when using Codex with a
|
|
13
|
+
* ChatGPT account"), so both are out of `CODEX_SUBSCRIPTION_MODEL_IDS`.
|
|
14
|
+
* API-key access is unaffected, so a fragment on any other route keeps
|
|
15
|
+
* its model.
|
|
16
|
+
*
|
|
17
|
+
* Two stored shapes dispatch through the subscription. The `chatgpt`
|
|
18
|
+
* routing identity fails `LLMSchema.superRefine` once the allowlist drops
|
|
19
|
+
* the model, and the loader's per-section salvage then resets the whole
|
|
20
|
+
* `llm` section, losing every profile and call-site tuning: this is the
|
|
21
|
+
* repair that prevents data loss. A profile bound to the subscription row
|
|
22
|
+
* (row kind `chatgpt`, or an `oauth_subscription` auth on the
|
|
23
|
+
* pre-DB-migration-366 row shape) bypasses the auto-resolution compat
|
|
24
|
+
* gate and 400s on every request; the row is named by the legacy
|
|
25
|
+
* `provider_connection` binding when present (dispatch honors it first,
|
|
26
|
+
* and the name is only ever a row name), otherwise by an entry-name
|
|
27
|
+
* `provider`. Both shapes are swept in `llm.default`, `llm.callSites.*`,
|
|
28
|
+
* and `llm.profiles.*`; call-site fragments carry no binding (the schema
|
|
29
|
+
* strips a raw `provider_connection`), so only their declared provider
|
|
30
|
+
* counts.
|
|
31
|
+
*
|
|
32
|
+
* A providerless call-site pin is deliberately left alone. It overlays
|
|
33
|
+
* whichever profile wins the site for a turn: on an API-key or managed
|
|
34
|
+
* winner it still serves the model, and on a subscription winner the
|
|
35
|
+
* request already fails upstream and keeps failing, with no config loss
|
|
36
|
+
* either way. Rewriting such pins would change API-key users' model and
|
|
37
|
+
* price to cover a winner that may never be selected.
|
|
38
|
+
*
|
|
39
|
+
* Replacements: `gpt-5.4` becomes `gpt-5.5` (its successor) and
|
|
40
|
+
* `gpt-5.4-mini` becomes `gpt-5.6-luna` (the subscription's Balanced model;
|
|
41
|
+
* on the subscription every model bills the same).
|
|
42
|
+
*/
|
|
43
|
+
export const repairRetiredCodexGpt54ModelIdsMigration: WorkspaceMigration = {
|
|
44
|
+
id: "154-repair-retired-codex-gpt-5-4-model-ids",
|
|
45
|
+
description:
|
|
46
|
+
"Repair gpt-5.4 and gpt-5.4-mini pins on ChatGPT-subscription LLM fragments in workspace config",
|
|
47
|
+
run(workspaceDir: string): void {
|
|
48
|
+
const configPath = join(workspaceDir, "config.json");
|
|
49
|
+
if (!existsSync(configPath)) {
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
// Read outside the parse catch: a transient filesystem error (EIO,
|
|
54
|
+
// EACCES) must reach the runner so the migration retries, while
|
|
55
|
+
// malformed JSON is a permanent state this migration cannot repair.
|
|
56
|
+
const rawText = readFileSync(configPath, "utf-8");
|
|
57
|
+
|
|
58
|
+
let config: Record<string, unknown>;
|
|
59
|
+
try {
|
|
60
|
+
const raw = JSON.parse(rawText);
|
|
61
|
+
if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
config = raw as Record<string, unknown>;
|
|
65
|
+
} catch {
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
const llm = readObject(config.llm);
|
|
70
|
+
if (llm === null) {
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
// Entry rows load lazily: only a stale fragment naming a row needs
|
|
75
|
+
// them. An unreadable DB then fails the run (retried next boot) rather
|
|
76
|
+
// than checkpointing a pass that skips entry-bound profiles.
|
|
77
|
+
let rows: Map<string, boolean> | null | undefined;
|
|
78
|
+
const isSubscriptionRow = (name: unknown): boolean => {
|
|
79
|
+
if (typeof name !== "string" || name.length === 0) {
|
|
80
|
+
return false;
|
|
81
|
+
}
|
|
82
|
+
if (rows === undefined) {
|
|
83
|
+
rows = readConnectionRows(workspaceDir);
|
|
84
|
+
}
|
|
85
|
+
if (rows === null) {
|
|
86
|
+
throw new Error(
|
|
87
|
+
"provider_connections is not readable; retrying the model-ID repair on the next run",
|
|
88
|
+
);
|
|
89
|
+
}
|
|
90
|
+
return rows.get(name) === true;
|
|
91
|
+
};
|
|
92
|
+
// A `provider` value: the identity dispatches to the subscription, a
|
|
93
|
+
// known vendor never does, and any other value is an entry name.
|
|
94
|
+
const isSubscriptionProvider = (provider: unknown): boolean =>
|
|
95
|
+
provider === CHATGPT_IDENTITY ||
|
|
96
|
+
(typeof provider === "string" &&
|
|
97
|
+
!KNOWN_PROVIDERS.has(provider) &&
|
|
98
|
+
isSubscriptionRow(provider));
|
|
99
|
+
// The binding is authoritative when present, since dispatch honors it
|
|
100
|
+
// ahead of the declared provider; the identity is repaired regardless
|
|
101
|
+
// (the schema rejects the pair whatever the binding).
|
|
102
|
+
const isBound = (fragment: Record<string, unknown>): boolean => {
|
|
103
|
+
if (fragment.provider === CHATGPT_IDENTITY) {
|
|
104
|
+
return true;
|
|
105
|
+
}
|
|
106
|
+
const binding = fragment.provider_connection;
|
|
107
|
+
return typeof binding === "string" && binding.length > 0
|
|
108
|
+
? isSubscriptionRow(binding)
|
|
109
|
+
: isSubscriptionProvider(fragment.provider);
|
|
110
|
+
};
|
|
111
|
+
const isProviderBound = (fragment: Record<string, unknown>): boolean =>
|
|
112
|
+
isSubscriptionProvider(fragment.provider);
|
|
113
|
+
|
|
114
|
+
let changed = false;
|
|
115
|
+
|
|
116
|
+
changed = repairFragment(readObject(llm.default), isBound) || changed;
|
|
117
|
+
|
|
118
|
+
const callSites = readObject(llm.callSites);
|
|
119
|
+
if (callSites !== null) {
|
|
120
|
+
for (const rawConfig of Object.values(callSites)) {
|
|
121
|
+
changed =
|
|
122
|
+
repairFragment(readObject(rawConfig), isProviderBound) || changed;
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
const profiles = readObject(llm.profiles);
|
|
127
|
+
if (profiles !== null) {
|
|
128
|
+
for (const rawProfile of Object.values(profiles)) {
|
|
129
|
+
changed = repairFragment(readObject(rawProfile), isBound) || changed;
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
if (!changed) {
|
|
134
|
+
return;
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
// Write-then-rename so an interrupted write cannot leave config.json
|
|
138
|
+
// truncated: a torn in-place write would parse as invalid JSON on the
|
|
139
|
+
// retry, which the catch above treats as "nothing to do", letting the
|
|
140
|
+
// runner checkpoint the migration as completed against a corrupt file.
|
|
141
|
+
const tmpPath = `${configPath}.migration-154.tmp`;
|
|
142
|
+
writeFileSync(tmpPath, JSON.stringify(config, null, 2) + "\n");
|
|
143
|
+
renameSync(tmpPath, configPath);
|
|
144
|
+
},
|
|
145
|
+
// The exact-match rewrite is idempotent, so a transient failure (full
|
|
146
|
+
// disk, I/O error) is safe to retry on later startups.
|
|
147
|
+
retryFailedCheckpoint: true,
|
|
148
|
+
down(_workspaceDir: string): void {
|
|
149
|
+
// Forward-only: reintroducing the retired model IDs would fail schema
|
|
150
|
+
// validation once the allowlist no longer carries them.
|
|
151
|
+
},
|
|
152
|
+
};
|
|
153
|
+
|
|
154
|
+
// ---------------------------------------------------------------------------
|
|
155
|
+
// Helpers: self-contained per workspace migrations AGENTS.md
|
|
156
|
+
// ---------------------------------------------------------------------------
|
|
157
|
+
|
|
158
|
+
const CHATGPT_IDENTITY = "chatgpt";
|
|
159
|
+
|
|
160
|
+
// Frozen snapshot of `KNOWN_LLM_PROVIDERS`: the vendor and identity values
|
|
161
|
+
// that dispatch without a connection row, so none of them is an entry name.
|
|
162
|
+
const KNOWN_PROVIDERS = new Set([
|
|
163
|
+
"anthropic",
|
|
164
|
+
"openai",
|
|
165
|
+
"gemini",
|
|
166
|
+
"ollama",
|
|
167
|
+
"fireworks",
|
|
168
|
+
"openrouter",
|
|
169
|
+
"vercel-ai-gateway",
|
|
170
|
+
"openai-compatible",
|
|
171
|
+
"minimax",
|
|
172
|
+
"atlascloud",
|
|
173
|
+
"together",
|
|
174
|
+
"litellm",
|
|
175
|
+
"opencode",
|
|
176
|
+
"baseten",
|
|
177
|
+
"poolside",
|
|
178
|
+
"vellum",
|
|
179
|
+
"chatgpt",
|
|
180
|
+
]);
|
|
181
|
+
|
|
182
|
+
const REPLACEMENTS: ReadonlyMap<string, string> = new Map([
|
|
183
|
+
["gpt-5.4", "gpt-5.5"],
|
|
184
|
+
["gpt-5.4-mini", "gpt-5.6-luna"],
|
|
185
|
+
]);
|
|
186
|
+
|
|
187
|
+
function repairFragment(
|
|
188
|
+
fragment: Record<string, unknown> | null,
|
|
189
|
+
isSubscriptionRouted: (fragment: Record<string, unknown>) => boolean,
|
|
190
|
+
): boolean {
|
|
191
|
+
if (fragment === null || typeof fragment.model !== "string") {
|
|
192
|
+
return false;
|
|
193
|
+
}
|
|
194
|
+
const replacement = REPLACEMENTS.get(fragment.model);
|
|
195
|
+
if (replacement === undefined) {
|
|
196
|
+
return false;
|
|
197
|
+
}
|
|
198
|
+
if (!isSubscriptionRouted(fragment)) {
|
|
199
|
+
return false;
|
|
200
|
+
}
|
|
201
|
+
fragment.model = replacement;
|
|
202
|
+
return true;
|
|
203
|
+
}
|
|
204
|
+
|
|
205
|
+
/**
|
|
206
|
+
* `provider_connections` row name to whether the row dispatches to the
|
|
207
|
+
* ChatGPT subscription, or null when the DB or table is not readable. The
|
|
208
|
+
* caller fails the run on null: entry-name providers must be judged against
|
|
209
|
+
* real rows, never guessed. An absent DB file is a real state (no rows, so
|
|
210
|
+
* every entry name is dangling).
|
|
211
|
+
*/
|
|
212
|
+
function readConnectionRows(workspaceDir: string): Map<string, boolean> | null {
|
|
213
|
+
const dbPath = join(workspaceDir, "data", "db", "assistant.db");
|
|
214
|
+
if (!existsSync(dbPath)) {
|
|
215
|
+
return new Map();
|
|
216
|
+
}
|
|
217
|
+
let db: Database;
|
|
218
|
+
try {
|
|
219
|
+
db = new Database(dbPath, { readonly: true });
|
|
220
|
+
} catch {
|
|
221
|
+
return null;
|
|
222
|
+
}
|
|
223
|
+
try {
|
|
224
|
+
const rows = db
|
|
225
|
+
.query(`SELECT name, provider, auth FROM provider_connections`)
|
|
226
|
+
.all() as Array<{ name: string; provider: string; auth: string }>;
|
|
227
|
+
return new Map(
|
|
228
|
+
rows.map((row) => [
|
|
229
|
+
row.name,
|
|
230
|
+
row.provider === CHATGPT_IDENTITY || isSubscriptionAuth(row.auth),
|
|
231
|
+
]),
|
|
232
|
+
);
|
|
233
|
+
} catch {
|
|
234
|
+
return null;
|
|
235
|
+
} finally {
|
|
236
|
+
db.close();
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
|
|
240
|
+
function isSubscriptionAuth(auth: string): boolean {
|
|
241
|
+
try {
|
|
242
|
+
const parsed: unknown = JSON.parse(auth);
|
|
243
|
+
return (
|
|
244
|
+
parsed !== null &&
|
|
245
|
+
typeof parsed === "object" &&
|
|
246
|
+
(parsed as { type?: unknown }).type === "oauth_subscription"
|
|
247
|
+
);
|
|
248
|
+
} catch {
|
|
249
|
+
return false;
|
|
250
|
+
}
|
|
251
|
+
}
|
|
252
|
+
|
|
253
|
+
function readObject(value: unknown): Record<string, unknown> | null {
|
|
254
|
+
if (value === null || typeof value !== "object" || Array.isArray(value)) {
|
|
255
|
+
return null;
|
|
256
|
+
}
|
|
257
|
+
return value as Record<string, unknown>;
|
|
258
|
+
}
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
import { existsSync, readFileSync, renameSync, writeFileSync } from "node:fs";
|
|
2
|
+
import { join } from "node:path";
|
|
3
|
+
|
|
4
|
+
import { getLogger } from "../../util/logger.js";
|
|
5
|
+
import type { WorkspaceMigration } from "./types.js";
|
|
6
|
+
|
|
7
|
+
const log = getLogger("workspace-migration-155");
|
|
8
|
+
|
|
9
|
+
/**
|
|
10
|
+
* Move `liveVoice.frontModel` to `voice.frontModel` in `config.json`.
|
|
11
|
+
*
|
|
12
|
+
* The front-door tuning (endpointing budgets and progress narration cadence)
|
|
13
|
+
* is read by phone calls as well as live voice, so it lives under a
|
|
14
|
+
* transport-agnostic key. A `voice.frontModel` already present wins field by
|
|
15
|
+
* field; the `liveVoice` block is removed either way so raw-config saves do
|
|
16
|
+
* not write it back.
|
|
17
|
+
*/
|
|
18
|
+
export const moveFrontModelConfigToVoiceMigration: WorkspaceMigration = {
|
|
19
|
+
id: "155-move-front-model-config-to-voice",
|
|
20
|
+
description: "Move liveVoice.frontModel to voice.frontModel in config.json",
|
|
21
|
+
run(workspaceDir: string): void {
|
|
22
|
+
const configPath = join(workspaceDir, "config.json");
|
|
23
|
+
if (!existsSync(configPath)) {
|
|
24
|
+
return;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
let config: Record<string, unknown>;
|
|
28
|
+
try {
|
|
29
|
+
const raw = JSON.parse(readFileSync(configPath, "utf-8"));
|
|
30
|
+
if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
33
|
+
config = raw as Record<string, unknown>;
|
|
34
|
+
} catch {
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
const liveVoice = readObject(config.liveVoice);
|
|
39
|
+
if (liveVoice === null || !Object.hasOwn(liveVoice, "frontModel")) {
|
|
40
|
+
return;
|
|
41
|
+
}
|
|
42
|
+
const legacy = readObject(liveVoice.frontModel);
|
|
43
|
+
delete liveVoice.frontModel;
|
|
44
|
+
|
|
45
|
+
if (legacy !== null) {
|
|
46
|
+
const voice = readObject(config.voice) ?? {};
|
|
47
|
+
const current = readObject(voice.frontModel) ?? {};
|
|
48
|
+
const legacyProgress = readObject(legacy.progress) ?? {};
|
|
49
|
+
const currentProgress = readObject(current.progress) ?? {};
|
|
50
|
+
const merged: Record<string, unknown> = { ...legacy, ...current };
|
|
51
|
+
if (
|
|
52
|
+
Object.keys(legacyProgress).length > 0 ||
|
|
53
|
+
Object.keys(currentProgress).length > 0
|
|
54
|
+
) {
|
|
55
|
+
merged.progress = { ...legacyProgress, ...currentProgress };
|
|
56
|
+
}
|
|
57
|
+
voice.frontModel = merged;
|
|
58
|
+
config.voice = voice;
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
const tmpPath = `${configPath}.migration-155.tmp`;
|
|
62
|
+
writeFileSync(tmpPath, JSON.stringify(config, null, 2) + "\n");
|
|
63
|
+
renameSync(tmpPath, configPath);
|
|
64
|
+
log.info("Moved liveVoice.frontModel to voice.frontModel in config.json");
|
|
65
|
+
},
|
|
66
|
+
retryFailedCheckpoint: true,
|
|
67
|
+
down(_workspaceDir: string): void {
|
|
68
|
+
// Forward-only: the schema reads voice.frontModel and strips unknown
|
|
69
|
+
// liveVoice keys, so a block moved back is dropped on the next load.
|
|
70
|
+
},
|
|
71
|
+
};
|
|
72
|
+
|
|
73
|
+
function readObject(value: unknown): Record<string, unknown> | null {
|
|
74
|
+
if (value === null || typeof value !== "object" || Array.isArray(value)) {
|
|
75
|
+
return null;
|
|
76
|
+
}
|
|
77
|
+
return value as Record<string, unknown>;
|
|
78
|
+
}
|
|
@@ -0,0 +1,214 @@
|
|
|
1
|
+
import { existsSync, readFileSync, renameSync, writeFileSync } from "node:fs";
|
|
2
|
+
import { join } from "node:path";
|
|
3
|
+
|
|
4
|
+
import { getLogger } from "../../util/logger.js";
|
|
5
|
+
import type { WorkspaceMigration } from "./types.js";
|
|
6
|
+
|
|
7
|
+
const WORKSPACE_MCP_FILENAME = "mcp.json";
|
|
8
|
+
|
|
9
|
+
// Inlined Agent Plugins 1.0.0 schema URL so this migration stays
|
|
10
|
+
// self-contained if the production constant later changes or moves.
|
|
11
|
+
const AGENT_PLUGINS_MCP_SCHEMA_URL =
|
|
12
|
+
"https://agent-plugins.org/schemas/1.0.0/mcp.schema.json";
|
|
13
|
+
|
|
14
|
+
const log = getLogger("workspace-migration-156");
|
|
15
|
+
|
|
16
|
+
/**
|
|
17
|
+
* Move user-owned MCP servers from `config.json` into a spec-pure
|
|
18
|
+
* `/workspace/mcp.json`. Presence of a server is what starts it. Headers
|
|
19
|
+
* that were still on a transport are copied onto the spec entry so the
|
|
20
|
+
* credential-store migration can lift them on the next MCP reload.
|
|
21
|
+
*/
|
|
22
|
+
export const extractWorkspaceMcpJsonMigration: WorkspaceMigration = {
|
|
23
|
+
id: "156-extract-workspace-mcp-json",
|
|
24
|
+
description:
|
|
25
|
+
"Extract workspace MCP servers from config.json into a spec-pure mcp.json",
|
|
26
|
+
run(workspaceDir: string): void {
|
|
27
|
+
const configPath = join(workspaceDir, "config.json");
|
|
28
|
+
if (!existsSync(configPath)) {
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
const config = readJsonObject(configPath);
|
|
33
|
+
if (config === null) {
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
if (!Object.hasOwn(config, "mcp")) {
|
|
38
|
+
return;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
const extracted = extractSpecServers(config.mcp);
|
|
42
|
+
const mcpPath = join(workspaceDir, WORKSPACE_MCP_FILENAME);
|
|
43
|
+
const existing = readExistingMcpServers(mcpPath);
|
|
44
|
+
const merged: Record<string, unknown> = {
|
|
45
|
+
...extracted,
|
|
46
|
+
...existing.servers,
|
|
47
|
+
};
|
|
48
|
+
|
|
49
|
+
if (Object.keys(merged).length > 0 || existing.present) {
|
|
50
|
+
const document = {
|
|
51
|
+
$schema: existing.schema ?? AGENT_PLUGINS_MCP_SCHEMA_URL,
|
|
52
|
+
mcpServers: merged,
|
|
53
|
+
};
|
|
54
|
+
atomicWrite(mcpPath, document);
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
delete config.mcp;
|
|
58
|
+
atomicWrite(configPath, config);
|
|
59
|
+
log.info("Extracted workspace MCP servers into mcp.json");
|
|
60
|
+
},
|
|
61
|
+
retryFailedCheckpoint: true,
|
|
62
|
+
down(_workspaceDir: string): void {
|
|
63
|
+
// Forward-only: mcp.json is the store. Putting servers back under
|
|
64
|
+
// config.json would just be extracted again on the next load.
|
|
65
|
+
},
|
|
66
|
+
};
|
|
67
|
+
|
|
68
|
+
function extractSpecServers(mcp: unknown): Record<string, unknown> {
|
|
69
|
+
const block = readObject(mcp);
|
|
70
|
+
if (block === null) {
|
|
71
|
+
return {};
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
const servers: Record<string, unknown> = {};
|
|
75
|
+
const rawServers = block.servers;
|
|
76
|
+
if (Array.isArray(rawServers)) {
|
|
77
|
+
for (const entry of rawServers) {
|
|
78
|
+
const object = readObject(entry);
|
|
79
|
+
if (object === null) {
|
|
80
|
+
continue;
|
|
81
|
+
}
|
|
82
|
+
const name = object.name;
|
|
83
|
+
if (typeof name !== "string" || name.trim().length === 0) {
|
|
84
|
+
continue;
|
|
85
|
+
}
|
|
86
|
+
const spec = toSpecServer(object);
|
|
87
|
+
if (spec !== null) {
|
|
88
|
+
servers[name] = spec;
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
return servers;
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
const serverMap = readObject(rawServers);
|
|
95
|
+
if (serverMap === null) {
|
|
96
|
+
return {};
|
|
97
|
+
}
|
|
98
|
+
for (const [id, entry] of Object.entries(serverMap)) {
|
|
99
|
+
if (id.trim().length === 0) {
|
|
100
|
+
continue;
|
|
101
|
+
}
|
|
102
|
+
const object = readObject(entry);
|
|
103
|
+
if (object === null) {
|
|
104
|
+
continue;
|
|
105
|
+
}
|
|
106
|
+
const spec = toSpecServer(object);
|
|
107
|
+
if (spec !== null) {
|
|
108
|
+
servers[id] = spec;
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
return servers;
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
function toSpecServer(entry: Record<string, unknown>): Record<string, unknown> | null {
|
|
115
|
+
const transport = readObject(entry.transport);
|
|
116
|
+
if (transport === null) {
|
|
117
|
+
return null;
|
|
118
|
+
}
|
|
119
|
+
const type = transport.type;
|
|
120
|
+
if (type === "stdio") {
|
|
121
|
+
if (typeof transport.command !== "string" || transport.command.length === 0) {
|
|
122
|
+
return null;
|
|
123
|
+
}
|
|
124
|
+
const spec: Record<string, unknown> = {
|
|
125
|
+
type: "stdio",
|
|
126
|
+
command: transport.command,
|
|
127
|
+
};
|
|
128
|
+
if (
|
|
129
|
+
Array.isArray(transport.args) &&
|
|
130
|
+
transport.args.length > 0 &&
|
|
131
|
+
transport.args.every((arg) => typeof arg === "string")
|
|
132
|
+
) {
|
|
133
|
+
spec.args = transport.args;
|
|
134
|
+
}
|
|
135
|
+
const env = readStringRecord(transport.env);
|
|
136
|
+
if (env !== null) {
|
|
137
|
+
spec.env = env;
|
|
138
|
+
}
|
|
139
|
+
return spec;
|
|
140
|
+
}
|
|
141
|
+
if (type === "sse" || type === "streamable-http" || type === "http") {
|
|
142
|
+
if (typeof transport.url !== "string" || transport.url.length === 0) {
|
|
143
|
+
return null;
|
|
144
|
+
}
|
|
145
|
+
const spec: Record<string, unknown> = {
|
|
146
|
+
type: type === "http" ? "streamable-http" : type,
|
|
147
|
+
url: transport.url,
|
|
148
|
+
};
|
|
149
|
+
const headers = readStringRecord(transport.headers);
|
|
150
|
+
if (headers !== null) {
|
|
151
|
+
spec.headers = headers;
|
|
152
|
+
}
|
|
153
|
+
return spec;
|
|
154
|
+
}
|
|
155
|
+
return null;
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
function readExistingMcpServers(path: string): {
|
|
159
|
+
present: boolean;
|
|
160
|
+
schema?: string;
|
|
161
|
+
servers: Record<string, unknown>;
|
|
162
|
+
} {
|
|
163
|
+
if (!existsSync(path)) {
|
|
164
|
+
return { present: false, servers: {} };
|
|
165
|
+
}
|
|
166
|
+
const document = readJsonObject(path);
|
|
167
|
+
if (document === null) {
|
|
168
|
+
return { present: true, servers: {} };
|
|
169
|
+
}
|
|
170
|
+
const servers = readObject(document.mcpServers);
|
|
171
|
+
return {
|
|
172
|
+
present: true,
|
|
173
|
+
schema:
|
|
174
|
+
typeof document.$schema === "string" ? document.$schema : undefined,
|
|
175
|
+
servers: servers ?? {},
|
|
176
|
+
};
|
|
177
|
+
}
|
|
178
|
+
|
|
179
|
+
function readJsonObject(path: string): Record<string, unknown> | null {
|
|
180
|
+
try {
|
|
181
|
+
const raw = JSON.parse(readFileSync(path, "utf-8"));
|
|
182
|
+
return readObject(raw);
|
|
183
|
+
} catch {
|
|
184
|
+
return null;
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
function atomicWrite(path: string, value: unknown): void {
|
|
189
|
+
const tmpPath = `${path}.migration-156.tmp`;
|
|
190
|
+
writeFileSync(tmpPath, JSON.stringify(value, null, 2) + "\n");
|
|
191
|
+
renameSync(tmpPath, path);
|
|
192
|
+
}
|
|
193
|
+
|
|
194
|
+
function readObject(value: unknown): Record<string, unknown> | null {
|
|
195
|
+
if (value === null || typeof value !== "object" || Array.isArray(value)) {
|
|
196
|
+
return null;
|
|
197
|
+
}
|
|
198
|
+
return value as Record<string, unknown>;
|
|
199
|
+
}
|
|
200
|
+
|
|
201
|
+
function readStringRecord(value: unknown): Record<string, string> | null {
|
|
202
|
+
const object = readObject(value);
|
|
203
|
+
if (object === null) {
|
|
204
|
+
return null;
|
|
205
|
+
}
|
|
206
|
+
const result: Record<string, string> = {};
|
|
207
|
+
for (const [key, entry] of Object.entries(object)) {
|
|
208
|
+
if (typeof entry !== "string") {
|
|
209
|
+
return null;
|
|
210
|
+
}
|
|
211
|
+
result[key] = entry;
|
|
212
|
+
}
|
|
213
|
+
return Object.keys(result).length > 0 ? result : null;
|
|
214
|
+
}
|
|
@@ -0,0 +1,102 @@
|
|
|
1
|
+
import { mkdtempSync, readFileSync, writeFileSync } from "node:fs";
|
|
2
|
+
import { tmpdir } from "node:os";
|
|
3
|
+
import { join } from "node:path";
|
|
4
|
+
import { describe, expect, test } from "bun:test";
|
|
5
|
+
|
|
6
|
+
import { moveFrontModelConfigToVoiceMigration } from "../155-move-front-model-config-to-voice.js";
|
|
7
|
+
|
|
8
|
+
function workspaceWith(config: unknown): string {
|
|
9
|
+
const dir = mkdtempSync(join(tmpdir(), "move-front-model-"));
|
|
10
|
+
writeFileSync(join(dir, "config.json"), JSON.stringify(config, null, 2));
|
|
11
|
+
return dir;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
function readConfig(dir: string): Record<string, unknown> {
|
|
15
|
+
return JSON.parse(readFileSync(join(dir, "config.json"), "utf8")) as Record<
|
|
16
|
+
string,
|
|
17
|
+
unknown
|
|
18
|
+
>;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
describe("155-move-front-model-config-to-voice", () => {
|
|
22
|
+
test("moves liveVoice.frontModel under voice and leaves the rest of liveVoice", () => {
|
|
23
|
+
const dir = workspaceWith({
|
|
24
|
+
liveVoice: {
|
|
25
|
+
vad: { silenceThresholdMs: 900 },
|
|
26
|
+
frontModel: {
|
|
27
|
+
endpointDecisionTimeoutMs: 300,
|
|
28
|
+
progress: { idleIntervalMs: 4_000 },
|
|
29
|
+
},
|
|
30
|
+
},
|
|
31
|
+
});
|
|
32
|
+
|
|
33
|
+
moveFrontModelConfigToVoiceMigration.run(dir);
|
|
34
|
+
|
|
35
|
+
expect(readConfig(dir)).toEqual({
|
|
36
|
+
liveVoice: { vad: { silenceThresholdMs: 900 } },
|
|
37
|
+
voice: {
|
|
38
|
+
frontModel: {
|
|
39
|
+
endpointDecisionTimeoutMs: 300,
|
|
40
|
+
progress: { idleIntervalMs: 4_000 },
|
|
41
|
+
},
|
|
42
|
+
},
|
|
43
|
+
});
|
|
44
|
+
});
|
|
45
|
+
|
|
46
|
+
test("an existing voice.frontModel wins field by field", () => {
|
|
47
|
+
const dir = workspaceWith({
|
|
48
|
+
liveVoice: {
|
|
49
|
+
frontModel: {
|
|
50
|
+
endpointDecisionTimeoutMs: 300,
|
|
51
|
+
endpointMaxExtensions: 1,
|
|
52
|
+
progress: { idleIntervalMs: 4_000, minGapMs: 2_000 },
|
|
53
|
+
},
|
|
54
|
+
},
|
|
55
|
+
voice: {
|
|
56
|
+
frontModel: {
|
|
57
|
+
endpointDecisionTimeoutMs: 800,
|
|
58
|
+
progress: { idleIntervalMs: 7_000 },
|
|
59
|
+
},
|
|
60
|
+
},
|
|
61
|
+
});
|
|
62
|
+
|
|
63
|
+
moveFrontModelConfigToVoiceMigration.run(dir);
|
|
64
|
+
|
|
65
|
+
expect(readConfig(dir)).toEqual({
|
|
66
|
+
liveVoice: {},
|
|
67
|
+
voice: {
|
|
68
|
+
frontModel: {
|
|
69
|
+
endpointDecisionTimeoutMs: 800,
|
|
70
|
+
endpointMaxExtensions: 1,
|
|
71
|
+
progress: { idleIntervalMs: 7_000, minGapMs: 2_000 },
|
|
72
|
+
},
|
|
73
|
+
},
|
|
74
|
+
});
|
|
75
|
+
});
|
|
76
|
+
|
|
77
|
+
test("a config without the old key is left untouched", () => {
|
|
78
|
+
const dir = workspaceWith({ liveVoice: { archiveAudio: true } });
|
|
79
|
+
const before = readFileSync(join(dir, "config.json"), "utf8");
|
|
80
|
+
|
|
81
|
+
moveFrontModelConfigToVoiceMigration.run(dir);
|
|
82
|
+
|
|
83
|
+
expect(readFileSync(join(dir, "config.json"), "utf8")).toBe(before);
|
|
84
|
+
});
|
|
85
|
+
|
|
86
|
+
test("is idempotent", () => {
|
|
87
|
+
const dir = workspaceWith({
|
|
88
|
+
liveVoice: { frontModel: { endpointExtensionMs: 2_000 } },
|
|
89
|
+
});
|
|
90
|
+
|
|
91
|
+
moveFrontModelConfigToVoiceMigration.run(dir);
|
|
92
|
+
const once = readConfig(dir);
|
|
93
|
+
moveFrontModelConfigToVoiceMigration.run(dir);
|
|
94
|
+
|
|
95
|
+
expect(readConfig(dir)).toEqual(once);
|
|
96
|
+
});
|
|
97
|
+
|
|
98
|
+
test("a missing config file is a no-op", () => {
|
|
99
|
+
const dir = mkdtempSync(join(tmpdir(), "move-front-model-empty-"));
|
|
100
|
+
expect(() => moveFrontModelConfigToVoiceMigration.run(dir)).not.toThrow();
|
|
101
|
+
});
|
|
102
|
+
});
|