agent-tower 0.7.2-beta.7 → 0.7.2-beta.8
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/dist/app.d.ts.map +1 -1
- package/dist/app.js +4 -1
- package/dist/app.js.map +1 -1
- package/dist/app.test.js +80 -1
- package/dist/app.test.js.map +1 -1
- package/dist/cli.js +4 -10
- package/dist/cli.js.map +1 -1
- package/dist/core/container.d.ts +8 -0
- package/dist/core/container.d.ts.map +1 -1
- package/dist/core/container.js +42 -0
- package/dist/core/container.js.map +1 -1
- package/dist/core/event-bus.d.ts +2 -0
- package/dist/core/event-bus.d.ts.map +1 -1
- package/dist/core/event-bus.js.map +1 -1
- package/dist/executors/__tests__/image-utils.test.d.ts +2 -0
- package/dist/executors/__tests__/image-utils.test.d.ts.map +1 -0
- package/dist/executors/__tests__/image-utils.test.js +25 -0
- package/dist/executors/__tests__/image-utils.test.js.map +1 -0
- package/dist/executors/base.executor.d.ts +2 -0
- package/dist/executors/base.executor.d.ts.map +1 -1
- package/dist/executors/base.executor.js +6 -0
- package/dist/executors/base.executor.js.map +1 -1
- package/dist/executors/image-utils.d.ts.map +1 -1
- package/dist/executors/image-utils.js +10 -8
- package/dist/executors/image-utils.js.map +1 -1
- package/dist/git/git-cli.d.ts +2 -0
- package/dist/git/git-cli.d.ts.map +1 -1
- package/dist/git/git-cli.js +2 -0
- package/dist/git/git-cli.js.map +1 -1
- package/dist/git/worktree.manager.d.ts +2 -1
- package/dist/git/worktree.manager.d.ts.map +1 -1
- package/dist/git/worktree.manager.js +18 -12
- package/dist/git/worktree.manager.js.map +1 -1
- package/dist/index.js +16 -31
- package/dist/index.js.map +1 -1
- package/dist/mcp/http-client.d.ts +1 -0
- package/dist/mcp/http-client.d.ts.map +1 -1
- package/dist/mcp/http-client.js +3 -0
- package/dist/mcp/http-client.js.map +1 -1
- package/dist/mcp/server.d.ts.map +1 -1
- package/dist/mcp/server.js +15 -0
- package/dist/mcp/server.js.map +1 -1
- package/dist/mcp/tools/sessions.js +2 -2
- package/dist/mcp/tools/sessions.js.map +1 -1
- package/dist/mcp/tools/workspaces.d.ts.map +1 -1
- package/dist/mcp/tools/workspaces.js +2 -1
- package/dist/mcp/tools/workspaces.js.map +1 -1
- package/dist/middleware/access-auth.d.ts +1 -0
- package/dist/middleware/access-auth.d.ts.map +1 -1
- package/dist/middleware/access-auth.js +1 -1
- package/dist/middleware/access-auth.js.map +1 -1
- package/dist/output/__tests__/text-block-lifecycle.test.d.ts +2 -0
- package/dist/output/__tests__/text-block-lifecycle.test.d.ts.map +1 -0
- package/dist/output/__tests__/text-block-lifecycle.test.js +241 -0
- package/dist/output/__tests__/text-block-lifecycle.test.js.map +1 -0
- package/dist/output/claude-code-parser.d.ts +3 -0
- package/dist/output/claude-code-parser.d.ts.map +1 -1
- package/dist/output/claude-code-parser.js +58 -7
- package/dist/output/claude-code-parser.js.map +1 -1
- package/dist/output/codex-parser.d.ts.map +1 -1
- package/dist/output/codex-parser.js +4 -6
- package/dist/output/codex-parser.js.map +1 -1
- package/dist/output/cursor-agent-parser.d.ts.map +1 -1
- package/dist/output/cursor-agent-parser.js +4 -0
- package/dist/output/cursor-agent-parser.js.map +1 -1
- package/dist/output/gemini-parser.d.ts +18 -0
- package/dist/output/gemini-parser.d.ts.map +1 -0
- package/dist/output/gemini-parser.js +91 -0
- package/dist/output/gemini-parser.js.map +1 -0
- package/dist/output/msg-store.d.ts +6 -0
- package/dist/output/msg-store.d.ts.map +1 -1
- package/dist/output/msg-store.js +17 -0
- package/dist/output/msg-store.js.map +1 -1
- package/dist/output/text-block-tracker.d.ts +29 -0
- package/dist/output/text-block-tracker.d.ts.map +1 -0
- package/dist/output/text-block-tracker.js +149 -0
- package/dist/output/text-block-tracker.js.map +1 -0
- package/dist/output/types.d.ts +9 -0
- package/dist/output/types.d.ts.map +1 -1
- package/dist/output/types.js +0 -4
- package/dist/output/types.js.map +1 -1
- package/dist/routes/__tests__/sessions-runtime.test.js +3 -0
- package/dist/routes/__tests__/sessions-runtime.test.js.map +1 -1
- package/dist/routes/__tests__/team-run-translations.test.d.ts +2 -0
- package/dist/routes/__tests__/team-run-translations.test.d.ts.map +1 -0
- package/dist/routes/__tests__/team-run-translations.test.js +418 -0
- package/dist/routes/__tests__/team-run-translations.test.js.map +1 -0
- package/dist/routes/__tests__/translations.test.d.ts +2 -0
- package/dist/routes/__tests__/translations.test.d.ts.map +1 -0
- package/dist/routes/__tests__/translations.test.js +286 -0
- package/dist/routes/__tests__/translations.test.js.map +1 -0
- package/dist/routes/__tests__/workspaces.test.js +140 -0
- package/dist/routes/__tests__/workspaces.test.js.map +1 -1
- package/dist/routes/conversations.d.ts.map +1 -1
- package/dist/routes/conversations.js +19 -2
- package/dist/routes/conversations.js.map +1 -1
- package/dist/routes/index.d.ts.map +1 -1
- package/dist/routes/index.js +2 -0
- package/dist/routes/index.js.map +1 -1
- package/dist/routes/sessions.d.ts.map +1 -1
- package/dist/routes/sessions.js +32 -3
- package/dist/routes/sessions.js.map +1 -1
- package/dist/routes/team-runs.d.ts.map +1 -1
- package/dist/routes/team-runs.js +84 -15
- package/dist/routes/team-runs.js.map +1 -1
- package/dist/routes/translations.d.ts +4 -0
- package/dist/routes/translations.d.ts.map +1 -0
- package/dist/routes/translations.js +148 -0
- package/dist/routes/translations.js.map +1 -0
- package/dist/routes/user-input-origin.d.ts +4 -0
- package/dist/routes/user-input-origin.d.ts.map +1 -0
- package/dist/routes/user-input-origin.js +7 -0
- package/dist/routes/user-input-origin.js.map +1 -0
- package/dist/routes/workspaces.d.ts.map +1 -1
- package/dist/routes/workspaces.js +32 -2
- package/dist/routes/workspaces.js.map +1 -1
- package/dist/runtime/__tests__/acp-driver-lifecycle.test.js +2 -2
- package/dist/runtime/__tests__/acp-driver-lifecycle.test.js.map +1 -1
- package/dist/runtime/__tests__/acp-driver-submission.test.d.ts +2 -0
- package/dist/runtime/__tests__/acp-driver-submission.test.d.ts.map +1 -0
- package/dist/runtime/__tests__/acp-driver-submission.test.js +88 -0
- package/dist/runtime/__tests__/acp-driver-submission.test.js.map +1 -0
- package/dist/runtime/__tests__/acp-history-reconciler.test.js +244 -0
- package/dist/runtime/__tests__/acp-history-reconciler.test.js.map +1 -1
- package/dist/runtime/__tests__/acp-projector.test.js +36 -0
- package/dist/runtime/__tests__/acp-projector.test.js.map +1 -1
- package/dist/runtime/__tests__/claude-cli-control.test.js +20 -0
- package/dist/runtime/__tests__/claude-cli-control.test.js.map +1 -1
- package/dist/runtime/__tests__/cli-driver-submission.test.d.ts +2 -0
- package/dist/runtime/__tests__/cli-driver-submission.test.d.ts.map +1 -0
- package/dist/runtime/__tests__/cli-driver-submission.test.js +61 -0
- package/dist/runtime/__tests__/cli-driver-submission.test.js.map +1 -0
- package/dist/runtime/__tests__/codex-cli-control.test.js +25 -0
- package/dist/runtime/__tests__/codex-cli-control.test.js.map +1 -1
- package/dist/runtime/acp/acp-driver.js +38 -1
- package/dist/runtime/acp/acp-driver.js.map +1 -1
- package/dist/runtime/acp/history-reconciler.d.ts.map +1 -1
- package/dist/runtime/acp/history-reconciler.js +95 -36
- package/dist/runtime/acp/history-reconciler.js.map +1 -1
- package/dist/runtime/acp/projector.d.ts +5 -2
- package/dist/runtime/acp/projector.d.ts.map +1 -1
- package/dist/runtime/acp/projector.js +50 -23
- package/dist/runtime/acp/projector.js.map +1 -1
- package/dist/runtime/claude-cli-control.d.ts +4 -1
- package/dist/runtime/claude-cli-control.d.ts.map +1 -1
- package/dist/runtime/claude-cli-control.js +3 -1
- package/dist/runtime/claude-cli-control.js.map +1 -1
- package/dist/runtime/cli-driver.js +21 -7
- package/dist/runtime/cli-driver.js.map +1 -1
- package/dist/runtime/cli-parser.d.ts.map +1 -1
- package/dist/runtime/cli-parser.js +3 -0
- package/dist/runtime/cli-parser.js.map +1 -1
- package/dist/runtime/codex-cli-control.d.ts +4 -1
- package/dist/runtime/codex-cli-control.d.ts.map +1 -1
- package/dist/runtime/codex-cli-control.js +9 -6
- package/dist/runtime/codex-cli-control.js.map +1 -1
- package/dist/runtime/codex-cli-projector.d.ts +1 -1
- package/dist/runtime/codex-cli-projector.d.ts.map +1 -1
- package/dist/runtime/codex-cli-projector.js +4 -2
- package/dist/runtime/codex-cli-projector.js.map +1 -1
- package/dist/runtime/contracts.d.ts +15 -2
- package/dist/runtime/contracts.d.ts.map +1 -1
- package/dist/runtime/runtime-coordinator.d.ts.map +1 -1
- package/dist/runtime/runtime-coordinator.js +34 -1
- package/dist/runtime/runtime-coordinator.js.map +1 -1
- package/dist/services/__tests__/conflict-admission.test.d.ts +2 -0
- package/dist/services/__tests__/conflict-admission.test.d.ts.map +1 -0
- package/dist/services/__tests__/conflict-admission.test.js +37 -0
- package/dist/services/__tests__/conflict-admission.test.js.map +1 -0
- package/dist/services/__tests__/conflict-recovery-key.test.d.ts +2 -0
- package/dist/services/__tests__/conflict-recovery-key.test.d.ts.map +1 -0
- package/dist/services/__tests__/conflict-recovery-key.test.js +143 -0
- package/dist/services/__tests__/conflict-recovery-key.test.js.map +1 -0
- package/dist/services/__tests__/message-delivery.integration.test.d.ts +2 -0
- package/dist/services/__tests__/message-delivery.integration.test.d.ts.map +1 -0
- package/dist/services/__tests__/message-delivery.integration.test.js +1137 -0
- package/dist/services/__tests__/message-delivery.integration.test.js.map +1 -0
- package/dist/services/__tests__/review-team-user-counterexamples.test.d.ts +2 -0
- package/dist/services/__tests__/review-team-user-counterexamples.test.d.ts.map +1 -0
- package/dist/services/__tests__/review-team-user-counterexamples.test.js +200 -0
- package/dist/services/__tests__/review-team-user-counterexamples.test.js.map +1 -0
- package/dist/services/__tests__/session-manager.lifecycle.test.js +37 -0
- package/dist/services/__tests__/session-manager.lifecycle.test.js.map +1 -1
- package/dist/services/__tests__/session-manager.team-run.test.js +19 -2
- package/dist/services/__tests__/session-manager.team-run.test.js.map +1 -1
- package/dist/services/__tests__/team-initial-delivery.integration.test.d.ts +2 -0
- package/dist/services/__tests__/team-initial-delivery.integration.test.d.ts.map +1 -0
- package/dist/services/__tests__/team-initial-delivery.integration.test.js +469 -0
- package/dist/services/__tests__/team-initial-delivery.integration.test.js.map +1 -0
- package/dist/services/__tests__/team-reconciler.service.test.js +102 -101
- package/dist/services/__tests__/team-reconciler.service.test.js.map +1 -1
- package/dist/services/__tests__/team-room-delivery.test.d.ts +2 -0
- package/dist/services/__tests__/team-room-delivery.test.d.ts.map +1 -0
- package/dist/services/__tests__/team-room-delivery.test.js +670 -0
- package/dist/services/__tests__/team-room-delivery.test.js.map +1 -0
- package/dist/services/__tests__/team-user-delivery.integration.test.d.ts +2 -0
- package/dist/services/__tests__/team-user-delivery.integration.test.d.ts.map +1 -0
- package/dist/services/__tests__/team-user-delivery.integration.test.js +622 -0
- package/dist/services/__tests__/team-user-delivery.integration.test.js.map +1 -0
- package/dist/services/__tests__/translation-client.test.d.ts +2 -0
- package/dist/services/__tests__/translation-client.test.d.ts.map +1 -0
- package/dist/services/__tests__/translation-client.test.js +240 -0
- package/dist/services/__tests__/translation-client.test.js.map +1 -0
- package/dist/services/__tests__/translation-protection.test.d.ts +2 -0
- package/dist/services/__tests__/translation-protection.test.d.ts.map +1 -0
- package/dist/services/__tests__/translation-protection.test.js +156 -0
- package/dist/services/__tests__/translation-protection.test.js.map +1 -0
- package/dist/services/__tests__/translation-queue.test.d.ts +2 -0
- package/dist/services/__tests__/translation-queue.test.d.ts.map +1 -0
- package/dist/services/__tests__/translation-queue.test.js +277 -0
- package/dist/services/__tests__/translation-queue.test.js.map +1 -0
- package/dist/services/__tests__/translation-room-admission.test.d.ts +2 -0
- package/dist/services/__tests__/translation-room-admission.test.d.ts.map +1 -0
- package/dist/services/__tests__/translation-room-admission.test.js +371 -0
- package/dist/services/__tests__/translation-room-admission.test.js.map +1 -0
- package/dist/services/__tests__/translation-session-blocks.test.d.ts +2 -0
- package/dist/services/__tests__/translation-session-blocks.test.d.ts.map +1 -0
- package/dist/services/__tests__/translation-session-blocks.test.js +367 -0
- package/dist/services/__tests__/translation-session-blocks.test.js.map +1 -0
- package/dist/services/__tests__/translation-settings.service.test.d.ts +2 -0
- package/dist/services/__tests__/translation-settings.service.test.d.ts.map +1 -0
- package/dist/services/__tests__/translation-settings.service.test.js +154 -0
- package/dist/services/__tests__/translation-settings.service.test.js.map +1 -0
- package/dist/services/__tests__/translation.service.test.d.ts +2 -0
- package/dist/services/__tests__/translation.service.test.d.ts.map +1 -0
- package/dist/services/__tests__/translation.service.test.js +480 -0
- package/dist/services/__tests__/translation.service.test.js.map +1 -0
- package/dist/services/access-auth.service.d.ts +1 -0
- package/dist/services/access-auth.service.d.ts.map +1 -1
- package/dist/services/access-auth.service.js +8 -0
- package/dist/services/access-auth.service.js.map +1 -1
- package/dist/services/attachment-context.d.ts +7 -1
- package/dist/services/attachment-context.d.ts.map +1 -1
- package/dist/services/attachment-context.js +23 -2
- package/dist/services/attachment-context.js.map +1 -1
- package/dist/services/conflict-admission.d.ts +37 -0
- package/dist/services/conflict-admission.d.ts.map +1 -0
- package/dist/services/conflict-admission.js +97 -0
- package/dist/services/conflict-admission.js.map +1 -0
- package/dist/services/conflict-resolution-context.d.ts +33 -0
- package/dist/services/conflict-resolution-context.d.ts.map +1 -0
- package/dist/services/conflict-resolution-context.js +434 -0
- package/dist/services/conflict-resolution-context.js.map +1 -0
- package/dist/services/message-delivery.service.d.ts +195 -0
- package/dist/services/message-delivery.service.d.ts.map +1 -0
- package/dist/services/message-delivery.service.js +956 -0
- package/dist/services/message-delivery.service.js.map +1 -0
- package/dist/services/project.service.d.ts +1 -1
- package/dist/services/session-manager.d.ts +94 -74
- package/dist/services/session-manager.d.ts.map +1 -1
- package/dist/services/session-manager.js +91 -17
- package/dist/services/session-manager.js.map +1 -1
- package/dist/services/task.service.d.ts +26 -20
- package/dist/services/task.service.d.ts.map +1 -1
- package/dist/services/task.service.js +9 -26
- package/dist/services/task.service.js.map +1 -1
- package/dist/services/team-room-delivery.d.ts +541 -0
- package/dist/services/team-room-delivery.d.ts.map +1 -0
- package/dist/services/team-room-delivery.js +123 -0
- package/dist/services/team-room-delivery.js.map +1 -0
- package/dist/services/team-run.service.d.ts +83 -0
- package/dist/services/team-run.service.d.ts.map +1 -1
- package/dist/services/team-run.service.js +207 -18
- package/dist/services/team-run.service.js.map +1 -1
- package/dist/services/team-scheduler.service.d.ts +3 -0
- package/dist/services/team-scheduler.service.d.ts.map +1 -1
- package/dist/services/team-scheduler.service.js +65 -11
- package/dist/services/team-scheduler.service.js.map +1 -1
- package/dist/services/team-task-input.d.ts +37 -0
- package/dist/services/team-task-input.d.ts.map +1 -0
- package/dist/services/team-task-input.js +98 -0
- package/dist/services/team-task-input.js.map +1 -0
- package/dist/services/team-task-input.service.d.ts +72 -0
- package/dist/services/team-task-input.service.d.ts.map +1 -0
- package/dist/services/team-task-input.service.js +205 -0
- package/dist/services/team-task-input.service.js.map +1 -0
- package/dist/services/translation-client.d.ts +31 -0
- package/dist/services/translation-client.d.ts.map +1 -0
- package/dist/services/translation-client.js +169 -0
- package/dist/services/translation-client.js.map +1 -0
- package/dist/services/translation-errors.d.ts +14 -0
- package/dist/services/translation-errors.d.ts.map +1 -0
- package/dist/services/translation-errors.js +16 -0
- package/dist/services/translation-errors.js.map +1 -0
- package/dist/services/translation-protection.d.ts +27 -0
- package/dist/services/translation-protection.d.ts.map +1 -0
- package/dist/services/translation-protection.js +547 -0
- package/dist/services/translation-protection.js.map +1 -0
- package/dist/services/translation-queue.d.ts +49 -0
- package/dist/services/translation-queue.d.ts.map +1 -0
- package/dist/services/translation-queue.js +211 -0
- package/dist/services/translation-queue.js.map +1 -0
- package/dist/services/translation-settings.service.d.ts +152 -0
- package/dist/services/translation-settings.service.d.ts.map +1 -0
- package/dist/services/translation-settings.service.js +174 -0
- package/dist/services/translation-settings.service.js.map +1 -0
- package/dist/services/translation.service.d.ts +168 -0
- package/dist/services/translation.service.d.ts.map +1 -0
- package/dist/services/translation.service.js +861 -0
- package/dist/services/translation.service.js.map +1 -0
- package/dist/services/workspace.service.d.ts +84 -93
- package/dist/services/workspace.service.d.ts.map +1 -1
- package/dist/services/workspace.service.js +69 -5
- package/dist/services/workspace.service.js.map +1 -1
- package/dist/socket/__tests__/socket-gateway.test.js +131 -1
- package/dist/socket/__tests__/socket-gateway.test.js.map +1 -1
- package/dist/socket/socket-gateway.d.ts +6 -0
- package/dist/socket/socket-gateway.d.ts.map +1 -1
- package/dist/socket/socket-gateway.js +312 -6
- package/dist/socket/socket-gateway.js.map +1 -1
- package/dist/utils/database-schema.d.ts +9 -0
- package/dist/utils/database-schema.d.ts.map +1 -0
- package/dist/utils/database-schema.js +434 -0
- package/dist/utils/database-schema.js.map +1 -0
- package/dist/utils/database-schema.test.d.ts +2 -0
- package/dist/utils/database-schema.test.d.ts.map +1 -0
- package/dist/utils/database-schema.test.js +359 -0
- package/dist/utils/database-schema.test.js.map +1 -0
- package/dist/utils/database-team-foundation.test.d.ts +2 -0
- package/dist/utils/database-team-foundation.test.d.ts.map +1 -0
- package/dist/utils/database-team-foundation.test.js +467 -0
- package/dist/utils/database-team-foundation.test.js.map +1 -0
- package/dist/utils/owned-child-process.test.js +6 -3
- package/dist/utils/owned-child-process.test.js.map +1 -1
- package/dist/utils/text-preview.d.ts +4 -0
- package/dist/utils/text-preview.d.ts.map +1 -0
- package/dist/utils/text-preview.js +21 -0
- package/dist/utils/text-preview.js.map +1 -0
- package/dist/web/assets/AgentDemoPage-CtCYXopw.js +1 -0
- package/dist/web/assets/{AgentEnvironmentSettingsPage-SnxiaHvN.js → AgentEnvironmentSettingsPage-DSWN546Y.js} +1 -1
- package/dist/web/assets/AttachmentPreview-DRG5_cfN.js +2 -0
- package/dist/web/assets/BranchSelect-Dxs7HnMM.js +1 -0
- package/dist/web/assets/BrandLogo-Ilm880Xs.js +1 -0
- package/dist/web/assets/ConversationPage-B55Bj_ft.js +1 -0
- package/dist/web/assets/CreateTaskInput-CxWPeToI.js +1 -0
- package/dist/web/assets/{DemoPage-BHbnnZFF.js → DemoPage-Dyn-U9JO.js} +3 -3
- package/dist/web/assets/DesignSystemPage-BxypsRUZ.js +12 -0
- package/dist/web/assets/EditableTaskTitle-Dh-SmvFW.js +70 -0
- package/dist/web/assets/{ExecutionPermissionSelector-DcC4IBOF.js → ExecutionPermissionSelector-CQ_GNxR0.js} +1 -1
- package/dist/web/assets/GeneralSettingsPage-CzoejPZP.js +1 -0
- package/dist/web/assets/{LoadingPreviewPage-dE_jyl19.js → LoadingPreviewPage-BlW2PJhI.js} +1 -1
- package/dist/web/assets/{McpSettingsPage-CIuQ4bvy.js → McpSettingsPage-DD7EqD4L.js} +1 -1
- package/dist/web/assets/{MemberAvatar-BG0VDZKf.js → MemberAvatar-B2pAdWUi.js} +1 -1
- package/dist/web/assets/MobileTaskDetail-CvmNW0BQ.js +3 -0
- package/dist/web/assets/NotificationSettingsPage-BIqldIRf.js +1 -0
- package/dist/web/assets/ProfileSettingsPage-DMxpHmF1.js +3 -0
- package/dist/web/assets/ProjectKanbanPage-CHW79td4.js +12 -0
- package/dist/web/assets/ProjectSettingsPage-DKiEUkoa.js +2 -0
- package/dist/web/assets/{ProviderSettingsPage-DLq-GBxp.js → ProviderSettingsPage-DZT7wyE2.js} +2 -2
- package/dist/web/assets/{SettingsMasterDetail-UfyoKAum.js → SettingsMasterDetail-DnF0lsV1.js} +1 -1
- package/dist/web/assets/TaskDetail-D_970BDY.js +1 -0
- package/dist/web/assets/TeamSettingsPage-BJIEZ7xL.js +1 -0
- package/dist/web/assets/TranslationSettingsPage-D3mazqEW.js +1 -0
- package/dist/web/assets/arc-hUh7ykl8.js +1 -0
- package/dist/web/assets/{architectureDiagram-3BPJPVTR-BCNj6ZWE.js → architectureDiagram-3BPJPVTR-CcV9CLkm.js} +1 -1
- package/dist/web/assets/{at-sign-C4VhWike.js → at-sign-B-nhoGyH.js} +1 -1
- package/dist/web/assets/{blockDiagram-GPEHLZMM-D1kmB9gz.js → blockDiagram-GPEHLZMM-5q3Y9y0e.js} +1 -1
- package/dist/web/assets/{c4Diagram-AAUBKEIU-DbWKTkSe.js → c4Diagram-AAUBKEIU-CorBXi06.js} +1 -1
- package/dist/web/assets/channel-By24WpLg.js +1 -0
- package/dist/web/assets/check-DqPSoX0r.js +1 -0
- package/dist/web/assets/chevron-down-CPnvItQw.js +1 -0
- package/dist/web/assets/{chevron-up-DOkDFvIc.js → chevron-up-B8PE5N0G.js} +1 -1
- package/dist/web/assets/{chunk-2J33WTMH-B3TA0-LD.js → chunk-2J33WTMH-BUf5B4z4.js} +1 -1
- package/dist/web/assets/{chunk-4BX2VUAB-CvPTiBSV.js → chunk-4BX2VUAB-CdnOHkro.js} +1 -1
- package/dist/web/assets/{chunk-55IACEB6-xGe9Fu9Z.js → chunk-55IACEB6-U7edZDpP.js} +1 -1
- package/dist/web/assets/{chunk-727SXJPM-H8pz3amK.js → chunk-727SXJPM-B64Tuhla.js} +1 -1
- package/dist/web/assets/{chunk-AQP2D5EJ-BmYYNxcL.js → chunk-AQP2D5EJ-dXfe56jB.js} +1 -1
- package/dist/web/assets/{chunk-FMBD7UC4-BmOEsLTE.js → chunk-FMBD7UC4-DDYbxc1Q.js} +1 -1
- package/dist/web/assets/{chunk-ND2GUHAM-C5MfA0xc.js → chunk-ND2GUHAM-BQDGMv0R.js} +1 -1
- package/dist/web/assets/{chunk-QZHKN3VN-BcrGYZ7V.js → chunk-QZHKN3VN-DB8q4xAj.js} +1 -1
- package/dist/web/assets/classDiagram-4FO5ZUOK-DxHoimtR.js +1 -0
- package/dist/web/assets/classDiagram-v2-Q7XG4LA2-DxHoimtR.js +1 -0
- package/dist/web/assets/code-block-OCS4YCEC-BSdICyOa.js +2 -0
- package/dist/web/assets/confirm-dialog-DxEBZEbV.js +1 -0
- package/dist/web/assets/content-CMUL3HGx.js +2 -0
- package/dist/web/assets/{copy-CdzVE3kf.js → copy-DyxlXxiU.js} +1 -1
- package/dist/web/assets/{cose-bilkent-S5V4N54A-CLQ-m71G.js → cose-bilkent-S5V4N54A-Dx6eMnll.js} +1 -1
- package/dist/web/assets/cssMode-ZnNWfjZ6.js +1 -0
- package/dist/web/assets/{dagre-BM42HDAG-CmDqxOfn.js → dagre-BM42HDAG-Cxe8pLgD.js} +1 -1
- package/dist/web/assets/{diagram-2AECGRRQ-D-fSbEll.js → diagram-2AECGRRQ-RMsswEBe.js} +1 -1
- package/dist/web/assets/{diagram-5GNKFQAL-HPywThAf.js → diagram-5GNKFQAL-Bi4E0hzx.js} +1 -1
- package/dist/web/assets/{diagram-KO2AKTUF-DAzLhllz.js → diagram-KO2AKTUF-Mv6CDCyn.js} +1 -1
- package/dist/web/assets/{diagram-LMA3HP47-DXYB9h8L.js → diagram-LMA3HP47-CJ3qKNzK.js} +1 -1
- package/dist/web/assets/{diagram-OG6HWLK6-vv4kz4Zo.js → diagram-OG6HWLK6-D8SBY4ft.js} +1 -1
- package/dist/web/assets/dialog-BYdeYC2Y.js +5 -0
- package/dist/web/assets/{erDiagram-TEJ5UH35-Cu6aVKAa.js → erDiagram-TEJ5UH35-DwVSCU6X.js} +1 -1
- package/dist/web/assets/{flowDiagram-I6XJVG4X-BKDe8WSQ.js → flowDiagram-I6XJVG4X-CyipYAWd.js} +1 -1
- package/dist/web/assets/{freemarker2-DI2giuAo.js → freemarker2-DbH_yMCO.js} +2 -2
- package/dist/web/assets/{ganttDiagram-6RSMTGT7-DMVLzmAE.js → ganttDiagram-6RSMTGT7-CsC6Wjt4.js} +1 -1
- package/dist/web/assets/{gitGraphDiagram-PVQCEYII-vogzYdKn.js → gitGraphDiagram-PVQCEYII-E5jNbqlq.js} +1 -1
- package/dist/web/assets/{globe-Rnn-nKw-.js → globe-B2rgTPH3.js} +1 -1
- package/dist/web/assets/handlebars-C5VY_S-z.js +1 -0
- package/dist/web/assets/hooks-Ct0srfV-.js +1 -0
- package/dist/web/assets/html-e5uLnAgN.js +1 -0
- package/dist/web/assets/htmlMode-BeNiGozX.js +1 -0
- package/dist/web/assets/{icon-button-CuSuXgr_.js → icon-button-BEMJj_6T.js} +1 -1
- package/dist/web/assets/index-0XPZayUU.css +1 -0
- package/dist/web/assets/index-BYPOXP6w.js +1 -0
- package/dist/web/assets/{index-B88xAivn.js → index-C-M0QDqc.js} +5 -5
- package/dist/web/assets/index-CAjqC8pT.js +41 -0
- package/dist/web/assets/index-CPGzLjEC.js +1 -0
- package/dist/web/assets/index-Cm6snkmR.js +122 -0
- package/dist/web/assets/index-DNdMmXBr.js +1 -0
- package/dist/web/assets/{index-CMjLMilU.js → index-DppwrK2G.js} +1 -1
- package/dist/web/assets/index-IMdA08Ok.js +1 -0
- package/dist/web/assets/index-kr6U6_pi.js +1 -0
- package/dist/web/assets/{infoDiagram-5YYISTIA-CEfSHkNq.js → infoDiagram-5YYISTIA-5_0wrRXl.js} +1 -1
- package/dist/web/assets/{ishikawaDiagram-YF4QCWOH-BXKZuWtD.js → ishikawaDiagram-YF4QCWOH-aQujIFZw.js} +5 -5
- package/dist/web/assets/javascript-D7QVj9jR.js +1 -0
- package/dist/web/assets/{journeyDiagram-JHISSGLW-wsOUYlu7.js → journeyDiagram-JHISSGLW-ClMzHdqI.js} +1 -1
- package/dist/web/assets/jsonMode-nHmLVf-n.js +7 -0
- package/dist/web/assets/{kanban-definition-UN3LZRKU-DNsuvOrU.js → kanban-definition-UN3LZRKU-BFVlt0tz.js} +1 -1
- package/dist/web/assets/{kbd-B3m64lRd.js → kbd-Bfq5K6Ux.js} +1 -1
- package/dist/web/assets/{key-round-DpYSyeDH.js → key-round-BqsaQdce.js} +1 -1
- package/dist/web/assets/{layers-CxqMQVmH.js → layers-DI4vFJ4F.js} +1 -1
- package/dist/web/assets/{linear-BmmCZdOQ.js → linear-DZ-6PAPS.js} +1 -1
- package/dist/web/assets/{link-DbSpzB1w.js → link-BU4PN723.js} +1 -1
- package/dist/web/assets/liquid-BPIyogoj.js +1 -0
- package/dist/web/assets/{lspLanguageFeatures-WhdC7zdf.js → lspLanguageFeatures-DH4Z8jiM.js} +1 -1
- package/dist/web/assets/mdx-CI8yO2pV.js +1 -0
- package/dist/web/assets/menu-C3uB3M7p.js +1 -0
- package/dist/web/assets/{mermaid-NOHMQCX5-DmKVQY9m.js → mermaid-NOHMQCX5-BqeX1osS.js} +71 -71
- package/dist/web/assets/{message-square-CfNb-MTd.js → message-square-E5K8E3A-.js} +1 -1
- package/dist/web/assets/{mindmap-definition-RKZ34NQL-0RzXjZ9G.js → mindmap-definition-RKZ34NQL-C7dea0db.js} +1 -1
- package/dist/web/assets/{modal-Kpqn-nDO.js → modal-Cz1iIVeD.js} +1 -1
- package/dist/web/assets/{monaco-I1fXAMIt.js → monaco-DM3DuGN5.js} +3 -3
- package/dist/web/assets/{paperclip-BBrzKZQC.js → paperclip-COXNce_v.js} +1 -1
- package/dist/web/assets/{pencil-pzVKblxj.js → pencil-BFc4n44f.js} +1 -1
- package/dist/web/assets/{people-C6b3eeLq.js → people-BaCetIqh.js} +1 -1
- package/dist/web/assets/{pieDiagram-4H26LBE5-Bcvzb8TW.js → pieDiagram-4H26LBE5-2q5medug.js} +2 -2
- package/dist/web/assets/popover-CJCQLoGu.js +1 -0
- package/dist/web/assets/python-CSxVPG9p.js +1 -0
- package/dist/web/assets/{quadrantDiagram-W4KKPZXB-DwNhxMxj.js → quadrantDiagram-W4KKPZXB-DHPEM56s.js} +1 -1
- package/dist/web/assets/razor-CVoIieeS.js +1 -0
- package/dist/web/assets/{requirementDiagram-4Y6WPE33-D2wSGYn2.js → requirementDiagram-4Y6WPE33-B_KyH7PP.js} +1 -1
- package/dist/web/assets/{sankeyDiagram-5OEKKPKP-l3LLF--T.js → sankeyDiagram-5OEKKPKP-CrqkZAYW.js} +1 -1
- package/dist/web/assets/search-CkiBPir_.js +1 -0
- package/dist/web/assets/search-field-CbM2P2KE.js +1 -0
- package/dist/web/assets/{select-DGwKE4l0.js → select-Br0TAs7A.js} +1 -1
- package/dist/web/assets/select-DJsEG0jq.js +1 -0
- package/dist/web/assets/{sequenceDiagram-3UESZ5HK-BAGsbTS_.js → sequenceDiagram-3UESZ5HK-BRTm1WQA.js} +1 -1
- package/dist/web/assets/{server-BIPZ9Ka-.js → server-DYeSE1wn.js} +1 -1
- package/dist/web/assets/stateDiagram-AJRCARHV-qN49iyR2.js +1 -0
- package/dist/web/assets/stateDiagram-v2-BHNVJYJU-B1clBPkJ.js +1 -0
- package/dist/web/assets/{textarea-Bnfq7adW.js → textarea-B7vtoRE3.js} +1 -1
- package/dist/web/assets/{timeline-definition-PNZ67QCA-Dt-DcRrG.js → timeline-definition-PNZ67QCA-BzarcDi3.js} +1 -1
- package/dist/web/assets/toggles-jo27o0AH.js +1 -0
- package/dist/web/assets/tooltip-DbVtCXcO.js +1 -0
- package/dist/web/assets/{track-B_K578io.js → track-C0vxnITw.js} +1 -1
- package/dist/web/assets/{trash-2-ALAYDudv.js → trash-2-CUM-XX8B.js} +1 -1
- package/dist/web/assets/tsMode-7D3gqep6.js +11 -0
- package/dist/web/assets/typescript-CbOVEQNg.js +1 -0
- package/dist/web/assets/{upload-D7hKT2VA.js → upload-CJ6jVmte.js} +1 -1
- package/dist/web/assets/{use-profiles-Ncqxdw7S.js → use-profiles-B0xXAf7Z.js} +1 -1
- package/dist/web/assets/{use-projects-Dwy9AfAG.js → use-projects-BlTwWxkY.js} +1 -1
- package/dist/web/assets/{use-providers-BRyZjuBG.js → use-providers-FMSfyTD1.js} +1 -1
- package/dist/web/assets/use-translation-settings-BOlszecX.js +1 -0
- package/dist/web/assets/use-workspaces-DYrEp0Lw.js +1 -0
- package/dist/web/assets/useNormalizedLogs-D0N8MJdH.js +1 -0
- package/dist/web/assets/useTokenUsage-WB3ZQ25v.js +1 -0
- package/dist/web/assets/{vennDiagram-CIIHVFJN-Cr55FtiY.js → vennDiagram-CIIHVFJN-B6oZetvf.js} +1 -1
- package/dist/web/assets/{wardley-L42UT6IY-CtwMk9MJ.js → wardley-L42UT6IY-Bzuhm76f.js} +1 -1
- package/dist/web/assets/{wardleyDiagram-YWT4CUSO-BeyHmTu3.js → wardleyDiagram-YWT4CUSO-DaC-FUf5.js} +1 -1
- package/dist/web/assets/xml-Cfa9tkdT.js +1 -0
- package/dist/web/assets/{xychartDiagram-2RQKCTM6-9g34Lq8E.js → xychartDiagram-2RQKCTM6-CCvRIJRL.js} +1 -1
- package/dist/web/assets/yaml-C86f7VLL.js +1 -0
- package/dist/web/index.html +2 -2
- package/node_modules/@agent-tower/shared/dist/index.d.ts +1 -0
- package/node_modules/@agent-tower/shared/dist/index.d.ts.map +1 -1
- package/node_modules/@agent-tower/shared/dist/index.js +1 -0
- package/node_modules/@agent-tower/shared/dist/index.js.map +1 -1
- package/node_modules/@agent-tower/shared/dist/log-adapter.d.ts +11 -0
- package/node_modules/@agent-tower/shared/dist/log-adapter.d.ts.map +1 -1
- package/node_modules/@agent-tower/shared/dist/log-adapter.js +2 -0
- package/node_modules/@agent-tower/shared/dist/log-adapter.js.map +1 -1
- package/node_modules/@agent-tower/shared/dist/socket/events.d.ts +5 -2
- package/node_modules/@agent-tower/shared/dist/socket/events.d.ts.map +1 -1
- package/node_modules/@agent-tower/shared/dist/socket/events.js +2 -0
- package/node_modules/@agent-tower/shared/dist/socket/events.js.map +1 -1
- package/node_modules/@agent-tower/shared/dist/translation.d.ts +306 -0
- package/node_modules/@agent-tower/shared/dist/translation.d.ts.map +1 -0
- package/node_modules/@agent-tower/shared/dist/translation.js +8 -0
- package/node_modules/@agent-tower/shared/dist/translation.js.map +1 -0
- package/node_modules/@agent-tower/shared/dist/types.d.ts +23 -0
- package/node_modules/@agent-tower/shared/dist/types.d.ts.map +1 -1
- package/node_modules/@agent-tower/shared/dist/types.js.map +1 -1
- package/package.json +1 -1
- package/prisma/migrations/20261016000000_add_translation_foundation/migration.sql +104 -0
- package/prisma/migrations/20261016010000_add_message_deliveries/migration.sql +158 -0
- package/prisma/migrations/20261019000000_add_room_translation_eligibility/migration.sql +3 -0
- package/prisma/migrations/20261019100000_add_team_delivery_foundation/migration.sql +217 -0
- package/prisma/schema.prisma +224 -0
- package/dist/web/assets/AgentDemoPage-CaR_Yk9_.js +0 -1
- package/dist/web/assets/BranchSelect-D-kqavDG.js +0 -1
- package/dist/web/assets/BrandLogo-CC1alVsd.js +0 -1
- package/dist/web/assets/ConversationPage-RWKLxe1j.js +0 -3
- package/dist/web/assets/CreateTaskInput-SHJ1YpRe.js +0 -1
- package/dist/web/assets/DesignSystemPage-ChCrzeKT.js +0 -12
- package/dist/web/assets/EditableTaskTitle-CGVeZUSt.js +0 -70
- package/dist/web/assets/GeneralSettingsPage-C_tkwpmF.js +0 -1
- package/dist/web/assets/MobileTaskDetail-DxE6ZDAS.js +0 -5
- package/dist/web/assets/NotificationSettingsPage-B-Ot2OMg.js +0 -1
- package/dist/web/assets/ProfileSettingsPage-Dn1lrjJr.js +0 -3
- package/dist/web/assets/ProjectKanbanPage-jcW8sA7x.js +0 -12
- package/dist/web/assets/ProjectSettingsPage-BFPty2eA.js +0 -2
- package/dist/web/assets/TaskDetail-a1jalILy.js +0 -3
- package/dist/web/assets/TeamSettingsPage-BxGc4W7K.js +0 -1
- package/dist/web/assets/arc-dhk0OSs5.js +0 -1
- package/dist/web/assets/channel-K0AG6Tl1.js +0 -1
- package/dist/web/assets/check-DYlb0A_N.js +0 -1
- package/dist/web/assets/classDiagram-4FO5ZUOK-BTJ44hwx.js +0 -1
- package/dist/web/assets/classDiagram-v2-Q7XG4LA2-BTJ44hwx.js +0 -1
- package/dist/web/assets/code-block-OCS4YCEC-DLPrDBDy.js +0 -2
- package/dist/web/assets/confirm-dialog-BRkrtULz.js +0 -1
- package/dist/web/assets/content-DPCGELMz.js +0 -2
- package/dist/web/assets/cssMode-ChMyv9Nj.js +0 -1
- package/dist/web/assets/dialog-B_vC5R4B.js +0 -5
- package/dist/web/assets/handlebars-B9tmKQPV.js +0 -1
- package/dist/web/assets/hooks-DK4m7-FN.js +0 -1
- package/dist/web/assets/html-B_E2U0g5.js +0 -1
- package/dist/web/assets/htmlMode-DRHM_Cwq.js +0 -1
- package/dist/web/assets/index-B6Lvy5Sr.js +0 -1
- package/dist/web/assets/index-BCV57B4O.js +0 -41
- package/dist/web/assets/index-CTG-4w90.js +0 -1
- package/dist/web/assets/index-Cz73HpYH.js +0 -122
- package/dist/web/assets/index-CzvAGoau.css +0 -1
- package/dist/web/assets/index-DENY_U7o.js +0 -1
- package/dist/web/assets/index-ZO2tqdha.js +0 -1
- package/dist/web/assets/javascript-ClWqjgn3.js +0 -1
- package/dist/web/assets/jsonMode-DVAoDfae.js +0 -7
- package/dist/web/assets/liquid-CZf3xdoq.js +0 -1
- package/dist/web/assets/mdx-xzVEPP01.js +0 -1
- package/dist/web/assets/menu-0A0v_lRV.js +0 -1
- package/dist/web/assets/popover-BYz89aiY.js +0 -1
- package/dist/web/assets/python-DL05HvW4.js +0 -1
- package/dist/web/assets/razor-BCZ3_uDf.js +0 -1
- package/dist/web/assets/search-field-B5czD2Pl.js +0 -1
- package/dist/web/assets/select-yem-xN9Z.js +0 -1
- package/dist/web/assets/stateDiagram-AJRCARHV-C0BHmXYX.js +0 -1
- package/dist/web/assets/stateDiagram-v2-BHNVJYJU-Be3UCkeQ.js +0 -1
- package/dist/web/assets/toggles-DxNDJZsN.js +0 -1
- package/dist/web/assets/tooltip-CHOgkFbE.js +0 -1
- package/dist/web/assets/tsMode-kXxq-Lw7.js +0 -11
- package/dist/web/assets/typescript-E3_QcT_u.js +0 -1
- package/dist/web/assets/use-attachments-CK7y5KsN.js +0 -2
- package/dist/web/assets/use-workspaces-BBbahdwU.js +0 -1
- package/dist/web/assets/useNormalizedLogs-CRHRedwp.js +0 -1
- package/dist/web/assets/useTokenUsage-YwiF0xnT.js +0 -1
- package/dist/web/assets/xml-DxKND8qX.js +0 -1
- package/dist/web/assets/yaml-BqpCqTY6.js +0 -1
|
@@ -0,0 +1,480 @@
|
|
|
1
|
+
import { execFileSync } from 'node:child_process';
|
|
2
|
+
import fs from 'node:fs';
|
|
3
|
+
import os from 'node:os';
|
|
4
|
+
import path from 'node:path';
|
|
5
|
+
import { fileURLToPath } from 'node:url';
|
|
6
|
+
import { PrismaClient } from '@prisma/client';
|
|
7
|
+
import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it } from 'vitest';
|
|
8
|
+
import { DEFAULT_TRANSLATION_PROMPT_TEMPLATE } from '@agent-tower/shared';
|
|
9
|
+
import { TranslationSettingsService } from '../translation-settings.service.js';
|
|
10
|
+
import { TranslationService } from '../translation.service.js';
|
|
11
|
+
import { TranslationClient } from '../translation-client.js';
|
|
12
|
+
const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../..');
|
|
13
|
+
const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'tower-translation-'));
|
|
14
|
+
const db = new PrismaClient({ datasources: { db: { url: `file:${path.join(dir, 'test.db')}` } } });
|
|
15
|
+
const draft = { enabled: true, apiBaseUrl: 'https://translator.test/v1', model: 'first-model', apiKey: { action: 'replace', value: 'translation-secret' }, sendTargetLanguage: 'English', displayTargetLanguage: '简体中文', promptTemplate: '{{target_language}}\n{{text}}', maxConcurrency: 2 };
|
|
16
|
+
const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
|
|
17
|
+
async function until(read, check) {
|
|
18
|
+
const deadline = Date.now() + 5_000;
|
|
19
|
+
while (true) {
|
|
20
|
+
const value = await read();
|
|
21
|
+
if (check(value))
|
|
22
|
+
return value;
|
|
23
|
+
if (Date.now() > deadline)
|
|
24
|
+
throw new Error('Timed out waiting for translation state');
|
|
25
|
+
await sleep(5);
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
function response(content) { return new Response(JSON.stringify({ choices: [{ finish_reason: 'stop', message: { content } }] })); }
|
|
29
|
+
function source(sessionId, text = 'Hello world', blockId = 'block') {
|
|
30
|
+
return { kind: 'SESSION_BLOCK', sessionId, turnId: 'turn', blockId, semanticType: 'assistant_message', text, state: 'SEALED' };
|
|
31
|
+
}
|
|
32
|
+
describe('TranslationService isolated SQLite behavior', () => {
|
|
33
|
+
let settings;
|
|
34
|
+
let sessionId;
|
|
35
|
+
let services;
|
|
36
|
+
beforeAll(() => {
|
|
37
|
+
execFileSync('pnpm', ['exec', 'prisma', 'db', 'push', '--skip-generate', `--schema=${path.join(root, 'prisma/schema.prisma')}`], { cwd: root, env: { ...process.env, AGENT_TOWER_DATABASE_URL: `file:${path.join(dir, 'test.db')}` }, stdio: 'pipe' });
|
|
38
|
+
});
|
|
39
|
+
beforeEach(async () => {
|
|
40
|
+
await db.translationAttempt.deleteMany();
|
|
41
|
+
await db.translationSource.deleteMany();
|
|
42
|
+
await db.translationSettings.deleteMany();
|
|
43
|
+
await db.conversation.deleteMany();
|
|
44
|
+
const conversation = await db.conversation.create({ data: { title: 'Test', directoryName: 'test', workingDir: dir } });
|
|
45
|
+
const session = await db.session.create({ data: { conversationId: conversation.id, context: 'CONVERSATION', agentType: 'CODEX', prompt: 'Original prompt' } });
|
|
46
|
+
sessionId = session.id;
|
|
47
|
+
settings = new TranslationSettingsService(db);
|
|
48
|
+
services = [];
|
|
49
|
+
});
|
|
50
|
+
afterEach(async () => { for (const service of services)
|
|
51
|
+
await service.shutdown(); });
|
|
52
|
+
afterAll(async () => { await db.$disconnect(); fs.rmSync(dir, { recursive: true, force: true }); });
|
|
53
|
+
function make(fetchImpl = async (_url, init) => {
|
|
54
|
+
const body = JSON.parse(String(init?.body));
|
|
55
|
+
return response(body.messages.at(-1).content.split('\n').slice(1).join('\n').replace(/Hello/g, '你好'));
|
|
56
|
+
}, limits = {}) {
|
|
57
|
+
// A fetch transport settles its own request when AbortSignal closes it, as Node fetch does.
|
|
58
|
+
const transport = (url, init) => new Promise((resolve, reject) => {
|
|
59
|
+
const abort = () => reject(new DOMException('Aborted', 'AbortError'));
|
|
60
|
+
init?.signal?.addEventListener('abort', abort, { once: true });
|
|
61
|
+
void fetchImpl(url, init).then(resolve, reject).finally(() => init?.signal?.removeEventListener('abort', abort));
|
|
62
|
+
});
|
|
63
|
+
const service = new TranslationService(db, settings, { client: new TranslationClient({ fetchImpl: transport, timeoutMs: 300 }), limits: { tickMs: 10, retryDelays: [20, 30], ...limits } });
|
|
64
|
+
services.push(service);
|
|
65
|
+
return service;
|
|
66
|
+
}
|
|
67
|
+
async function enable(changes = {}) {
|
|
68
|
+
const current = await settings.getPublic();
|
|
69
|
+
return settings.save({ ...draft, ...changes, expectedRevision: current.revision });
|
|
70
|
+
}
|
|
71
|
+
const row = (id) => db.translationSource.findUniqueOrThrow({ where: { id } });
|
|
72
|
+
it('is off by default; enabling does not replay paused sources, and OPEN/thinking never leave the process', async () => {
|
|
73
|
+
let calls = 0;
|
|
74
|
+
const service = make(async () => { calls++; return response('translated'); });
|
|
75
|
+
await service.start();
|
|
76
|
+
const paused = await service.registerSource(source(sessionId));
|
|
77
|
+
expect(paused.jobState).toBe('PAUSED_DISABLED');
|
|
78
|
+
expect((await settings.getPublic()).enabled).toBe(false);
|
|
79
|
+
await enable();
|
|
80
|
+
const open = await service.registerSource({ ...source(sessionId, 'Open prose', 'open'), state: 'OPEN' });
|
|
81
|
+
await expect(service.registerSource({ ...source(sessionId), semanticType: 'thinking' })).rejects.toMatchObject({ code: 'INELIGIBLE_SOURCE' });
|
|
82
|
+
await sleep(40);
|
|
83
|
+
expect(calls).toBe(0);
|
|
84
|
+
expect((await row(open.id)).jobState).toBe('OPEN');
|
|
85
|
+
await service.retry(paused.id, paused.sourceRevision);
|
|
86
|
+
await until(() => row(paused.id), r => r.jobState === 'SUCCESS');
|
|
87
|
+
expect(calls).toBe(1);
|
|
88
|
+
});
|
|
89
|
+
it('sends only the protected body with a frozen configuration; saves do not revoke an in-flight result', async () => {
|
|
90
|
+
let release;
|
|
91
|
+
let payload;
|
|
92
|
+
let headers;
|
|
93
|
+
const gate = new Promise(resolve => { release = resolve; });
|
|
94
|
+
const service = make(async (_url, init) => {
|
|
95
|
+
payload = JSON.parse(String(init?.body));
|
|
96
|
+
headers = init?.headers;
|
|
97
|
+
await gate;
|
|
98
|
+
return response(payload.messages.at(-1).content.split('\n').slice(1).join('\n').replace('Hello', '你好'));
|
|
99
|
+
});
|
|
100
|
+
await enable();
|
|
101
|
+
await service.start();
|
|
102
|
+
const original = 'Hello world `secret_code()` with [guide](https://private.test/a)';
|
|
103
|
+
const registered = await service.registerSource(source(sessionId, original));
|
|
104
|
+
await until(async () => payload, Boolean);
|
|
105
|
+
await enable({ model: 'new-model', apiKey: { action: 'replace', value: 'new-secret' } });
|
|
106
|
+
release();
|
|
107
|
+
const done = await until(() => row(registered.id), r => r.jobState === 'SUCCESS');
|
|
108
|
+
const attempt = await db.translationAttempt.findUniqueOrThrow({ where: { id: done.effectiveAttemptId } });
|
|
109
|
+
expect(payload.model).toBe('first-model');
|
|
110
|
+
expect(payload.stream).toBe(false);
|
|
111
|
+
expect(JSON.stringify(payload)).not.toContain('secret_code');
|
|
112
|
+
expect(JSON.stringify(payload)).not.toContain('private.test');
|
|
113
|
+
expect(JSON.stringify(payload)).not.toContain('Original prompt');
|
|
114
|
+
expect(JSON.stringify(headers)).toContain('translation-secret');
|
|
115
|
+
expect(attempt.resultText).toContain('`secret_code()`');
|
|
116
|
+
expect(attempt.resultText).toContain('(https://private.test/a)');
|
|
117
|
+
expect(attempt.resultText).toContain('你好');
|
|
118
|
+
expect(attempt.sanitizedConfigSnapshot).not.toContain('translation-secret');
|
|
119
|
+
expect((await row(registered.id)).originalText).toBe(original);
|
|
120
|
+
});
|
|
121
|
+
it('isolates out-of-order source revisions and independent sources with identical text', async () => {
|
|
122
|
+
const pending = [];
|
|
123
|
+
const service = make(async (_url, init) => new Promise(resolve => { pending.push({ text: JSON.parse(String(init?.body)).messages.at(-1).content.split('\n').slice(1).join('\n'), resolve }); }));
|
|
124
|
+
await enable();
|
|
125
|
+
await service.start();
|
|
126
|
+
const first = await service.registerSource(source(sessionId, 'Hello old'));
|
|
127
|
+
await until(async () => pending.length, n => n === 1);
|
|
128
|
+
await service.registerSource(source(sessionId, 'Hello new'));
|
|
129
|
+
// The closed transport cannot publish its late response into the newer source generation.
|
|
130
|
+
await until(async () => pending.length, n => n === 2);
|
|
131
|
+
pending[1].resolve(response(pending[1].text.replace('Hello', 'new translated')));
|
|
132
|
+
const latest = await until(() => row(first.id), r => r.jobState === 'SUCCESS');
|
|
133
|
+
pending[0].resolve(response('old translated'));
|
|
134
|
+
await sleep(20);
|
|
135
|
+
expect((await row(first.id)).effectiveAttemptId).toBe(latest.effectiveAttemptId);
|
|
136
|
+
const result = await db.translationAttempt.findUniqueOrThrow({ where: { id: latest.effectiveAttemptId } });
|
|
137
|
+
expect(result.resultText).toContain('new translated new');
|
|
138
|
+
const other = await service.registerSource(source(sessionId, 'Hello new', 'second'));
|
|
139
|
+
expect(other.id).not.toBe(first.id);
|
|
140
|
+
await service.cancel(other.id);
|
|
141
|
+
});
|
|
142
|
+
it('retries with the current model/key and a new attempt, then releases the capacity', async () => {
|
|
143
|
+
const models = [];
|
|
144
|
+
const keys = [];
|
|
145
|
+
let count = 0;
|
|
146
|
+
const service = make(async (_url, init) => {
|
|
147
|
+
const body = JSON.parse(String(init?.body));
|
|
148
|
+
models.push(body.model);
|
|
149
|
+
keys.push(JSON.stringify(init?.headers));
|
|
150
|
+
if (++count === 1)
|
|
151
|
+
return new Response('secret upstream body', { status: 503 });
|
|
152
|
+
return response(body.messages.at(-1).content.split('\n').slice(1).join('\n'));
|
|
153
|
+
}, { retryDelays: [200, 200], sources: 1, displaySources: 1 });
|
|
154
|
+
await enable();
|
|
155
|
+
await service.start();
|
|
156
|
+
const first = await service.registerSource(source(sessionId));
|
|
157
|
+
await until(() => row(first.id), r => r.jobState === 'RETRY_WAIT');
|
|
158
|
+
await enable({ model: 'retry-model', apiKey: { action: 'replace', value: 'retry-secret' } });
|
|
159
|
+
await until(() => row(first.id), r => r.jobState === 'SUCCESS');
|
|
160
|
+
expect(models).toEqual(['first-model', 'retry-model']);
|
|
161
|
+
expect(keys[1]).toContain('retry-secret');
|
|
162
|
+
const attempts = await db.translationAttempt.findMany({ where: { sourceId: first.id }, orderBy: { attemptVersion: 'asc' } });
|
|
163
|
+
expect(attempts.map(a => a.attemptVersion)).toEqual([1, 2]);
|
|
164
|
+
expect(attempts[0].errorCode).toBe('UPSTREAM_ERROR');
|
|
165
|
+
expect(JSON.stringify(attempts)).not.toContain('secret upstream body');
|
|
166
|
+
expect((await service.registerSource(source(sessionId, 'Another body', 'next'))).jobState).toBe('PENDING');
|
|
167
|
+
});
|
|
168
|
+
it('enforces bounded admission, retains overflow original text, and admits an explicit retry after cancellation', async () => {
|
|
169
|
+
const service = make(async () => new Promise(() => { }), { sources: 1, displaySources: 1, laneSources: 1 });
|
|
170
|
+
await enable();
|
|
171
|
+
await service.start();
|
|
172
|
+
const first = await service.registerSource(source(sessionId));
|
|
173
|
+
await until(() => row(first.id), r => r.jobState === 'RUNNING');
|
|
174
|
+
const overflow = await service.registerSource(source(sessionId, 'Keep this original', 'overflow'));
|
|
175
|
+
expect(overflow.jobState).toBe('QUEUE_FULL');
|
|
176
|
+
expect(overflow.originalText).toBe('Keep this original');
|
|
177
|
+
await service.cancel(first.id);
|
|
178
|
+
expect((await service.retry(overflow.id, overflow.sourceRevision)).jobState).toBe('PENDING');
|
|
179
|
+
await service.cancel(overflow.id);
|
|
180
|
+
});
|
|
181
|
+
it('disable/enable aborts old epoch and leaves paused sources for explicit action', async () => {
|
|
182
|
+
let calls = 0;
|
|
183
|
+
const service = make(async (_url, init) => {
|
|
184
|
+
calls++;
|
|
185
|
+
if (calls === 1)
|
|
186
|
+
return new Promise(() => { });
|
|
187
|
+
return response(JSON.parse(String(init?.body)).messages.at(-1).content.split('\n').slice(1).join('\n'));
|
|
188
|
+
});
|
|
189
|
+
await enable();
|
|
190
|
+
await service.start();
|
|
191
|
+
const first = await service.registerSource(source(sessionId));
|
|
192
|
+
await until(() => row(first.id), r => r.jobState === 'RUNNING');
|
|
193
|
+
await enable({ enabled: false });
|
|
194
|
+
await until(() => row(first.id), r => r.jobState === 'PAUSED_DISABLED');
|
|
195
|
+
await enable();
|
|
196
|
+
await sleep(40);
|
|
197
|
+
expect(calls).toBe(1);
|
|
198
|
+
await service.retry(first.id, first.sourceRevision);
|
|
199
|
+
await until(() => row(first.id), r => r.jobState === 'SUCCESS');
|
|
200
|
+
expect(calls).toBe(2);
|
|
201
|
+
});
|
|
202
|
+
it('bounds timeouts and retries, and a subsequent draft test can acquire the released slot', async () => {
|
|
203
|
+
let hanging = true;
|
|
204
|
+
let calls = 0;
|
|
205
|
+
const service = make(async (_url, init) => {
|
|
206
|
+
calls++;
|
|
207
|
+
if (hanging)
|
|
208
|
+
return new Promise(() => { });
|
|
209
|
+
return response(JSON.parse(String(init?.body)).messages.at(-1).content.split('\n').slice(1).join('\n'));
|
|
210
|
+
});
|
|
211
|
+
await enable({ maxConcurrency: 1 });
|
|
212
|
+
await service.start();
|
|
213
|
+
const first = await service.registerSource(source(sessionId));
|
|
214
|
+
await until(() => row(first.id), r => r.jobState === 'FAILED');
|
|
215
|
+
expect(calls).toBe(3);
|
|
216
|
+
hanging = false;
|
|
217
|
+
expect((await service.testDraft('owner', draft, 'Hello after timeout', 'SEND')).resultText).toBe('Hello after timeout');
|
|
218
|
+
});
|
|
219
|
+
it('recovers interrupted attempts using current settings without replaying success or disabled work', async () => {
|
|
220
|
+
const firstService = make(async () => new Promise(() => { }));
|
|
221
|
+
await enable();
|
|
222
|
+
await firstService.start();
|
|
223
|
+
const registered = await firstService.registerSource(source(sessionId));
|
|
224
|
+
await until(() => row(registered.id), r => r.jobState === 'RUNNING');
|
|
225
|
+
await firstService.shutdown();
|
|
226
|
+
await enable({ model: 'restart-model' });
|
|
227
|
+
const models = [];
|
|
228
|
+
const second = make(async (_url, init) => {
|
|
229
|
+
const body = JSON.parse(String(init?.body));
|
|
230
|
+
models.push(body.model);
|
|
231
|
+
return response(body.messages.at(-1).content.split('\n').slice(1).join('\n'));
|
|
232
|
+
});
|
|
233
|
+
await second.start();
|
|
234
|
+
await until(() => row(registered.id), r => r.jobState === 'SUCCESS');
|
|
235
|
+
expect(models).toEqual(['restart-model']);
|
|
236
|
+
const attempts = await db.translationAttempt.findMany({ where: { sourceId: registered.id }, orderBy: { attemptVersion: 'asc' } });
|
|
237
|
+
expect(attempts.map(a => a.status)).toEqual(['INTERRUPTED', 'SUCCESS']);
|
|
238
|
+
await second.shutdown();
|
|
239
|
+
const third = make();
|
|
240
|
+
await third.start();
|
|
241
|
+
await sleep(30);
|
|
242
|
+
expect(await db.translationAttempt.count({ where: { sourceId: registered.id } })).toBe(2);
|
|
243
|
+
});
|
|
244
|
+
it('deletion during the request prevents result commit, and private/internal sources are ineligible', async () => {
|
|
245
|
+
let release;
|
|
246
|
+
const service = make(async () => { await new Promise(resolve => { release = resolve; }); return response('late result'); });
|
|
247
|
+
await enable();
|
|
248
|
+
await service.start();
|
|
249
|
+
const registered = await service.registerSource(source(sessionId));
|
|
250
|
+
await until(async () => release, Boolean);
|
|
251
|
+
await db.conversation.update({ where: { id: (await db.session.findUniqueOrThrow({ where: { id: sessionId } })).conversationId }, data: { deletedAt: new Date() } });
|
|
252
|
+
release();
|
|
253
|
+
await sleep(30);
|
|
254
|
+
expect((await row(registered.id)).effectiveAttemptId).toBeNull();
|
|
255
|
+
expect(await db.translationAttempt.count({ where: { sourceId: registered.id, status: 'SUCCESS' } })).toBe(0);
|
|
256
|
+
await expect(service.registerSource(source(sessionId, 'deleted'))).rejects.toMatchObject({ code: 'NOT_FOUND' });
|
|
257
|
+
expect(DEFAULT_TRANSLATION_PROMPT_TEMPLATE).toContain('{{text}}');
|
|
258
|
+
});
|
|
259
|
+
it('draft tests do not persist sources or attempts and only one test per identity runs at once', async () => {
|
|
260
|
+
let release;
|
|
261
|
+
let calls = 0;
|
|
262
|
+
const service = make(async (_url, init) => {
|
|
263
|
+
calls++;
|
|
264
|
+
await new Promise(resolve => { release = resolve; });
|
|
265
|
+
return response(JSON.parse(String(init?.body)).messages.at(-1).content.split('\n').slice(1).join('\n'));
|
|
266
|
+
});
|
|
267
|
+
await service.start();
|
|
268
|
+
const pending = service.testDraft('owner', draft, 'Hello test', 'DISPLAY');
|
|
269
|
+
await until(async () => calls, n => n === 1);
|
|
270
|
+
await expect(service.testDraft('owner', draft, 'Other', 'SEND')).rejects.toMatchObject({ code: 'QUEUE_FULL' });
|
|
271
|
+
release();
|
|
272
|
+
await pending;
|
|
273
|
+
expect(await db.translationSource.count()).toBe(0);
|
|
274
|
+
expect(await db.translationAttempt.count()).toBe(0);
|
|
275
|
+
expect((await settings.getPublic()).enabled).toBe(false);
|
|
276
|
+
});
|
|
277
|
+
it.each(['attempt-version', 'lease-owner'])('rejects a late result after persisted %s ownership is replaced', async (changed) => {
|
|
278
|
+
let release;
|
|
279
|
+
const gate = new Promise(resolve => { release = resolve; });
|
|
280
|
+
const service = make(async (_url, init) => {
|
|
281
|
+
await gate;
|
|
282
|
+
return response(JSON.parse(String(init?.body)).messages.at(-1).content.split('\n').slice(1).join('\n'));
|
|
283
|
+
});
|
|
284
|
+
await enable();
|
|
285
|
+
await service.start();
|
|
286
|
+
const registered = await service.registerSource(source(sessionId));
|
|
287
|
+
const running = await until(() => row(registered.id), value => value.jobState === 'RUNNING');
|
|
288
|
+
const attempt = await db.translationAttempt.findUniqueOrThrow({
|
|
289
|
+
where: { sourceId_attemptVersion: { sourceId: registered.id, attemptVersion: running.currentAttemptVersion } },
|
|
290
|
+
});
|
|
291
|
+
if (changed === 'attempt-version') {
|
|
292
|
+
await db.translationSource.update({ where: { id: registered.id }, data: { currentAttemptVersion: { increment: 1 } } });
|
|
293
|
+
}
|
|
294
|
+
else {
|
|
295
|
+
await db.translationAttempt.update({ where: { id: attempt.id }, data: { leaseOwner: 'replacement-owner' } });
|
|
296
|
+
}
|
|
297
|
+
release();
|
|
298
|
+
if (changed === 'attempt-version') {
|
|
299
|
+
await until(() => db.translationAttempt.findUniqueOrThrow({ where: { id: attempt.id } }), value => value.status === 'SUPERSEDED');
|
|
300
|
+
}
|
|
301
|
+
else {
|
|
302
|
+
await until(() => row(registered.id), value => value.jobState === 'FAILED');
|
|
303
|
+
}
|
|
304
|
+
expect((await row(registered.id)).effectiveAttemptId).toBeNull();
|
|
305
|
+
expect(await db.translationAttempt.count({ where: { sourceId: registered.id, status: 'SUCCESS' } })).toBe(0);
|
|
306
|
+
expect((await db.translationAttempt.findUniqueOrThrow({ where: { id: attempt.id } })).resultText).toBeNull();
|
|
307
|
+
});
|
|
308
|
+
it('preserves a persisted retry deadline across restart and spends the remaining attempts with current configuration', async () => {
|
|
309
|
+
const models = [];
|
|
310
|
+
const keys = [];
|
|
311
|
+
const fail = async (_url, init) => {
|
|
312
|
+
models.push(JSON.parse(String(init?.body)).model);
|
|
313
|
+
keys.push(JSON.stringify(init?.headers));
|
|
314
|
+
return new Response('private upstream failure', { status: 503 });
|
|
315
|
+
};
|
|
316
|
+
const first = make(fail, { retryDelays: [800, 20] });
|
|
317
|
+
await enable();
|
|
318
|
+
await first.start();
|
|
319
|
+
const registered = await first.registerSource(source(sessionId));
|
|
320
|
+
const waiting = await until(() => row(registered.id), value => value.jobState === 'RETRY_WAIT');
|
|
321
|
+
const deadline = waiting.nextRetryAt.getTime();
|
|
322
|
+
await first.shutdown();
|
|
323
|
+
await enable({ model: 'after-restart', apiKey: { action: 'replace', value: 'after-restart-secret' } });
|
|
324
|
+
const second = make(fail, { retryDelays: [20, 20] });
|
|
325
|
+
await second.start();
|
|
326
|
+
const recovered = await row(registered.id);
|
|
327
|
+
expect(recovered.jobState).toBe('RETRY_WAIT');
|
|
328
|
+
expect(recovered.nextRetryAt.getTime()).toBe(deadline);
|
|
329
|
+
expect(recovered.retryCount).toBe(1);
|
|
330
|
+
expect(models).toEqual(['first-model']);
|
|
331
|
+
const done = await until(() => row(registered.id), value => value.jobState === 'FAILED');
|
|
332
|
+
expect(done.retryCount).toBe(3);
|
|
333
|
+
expect(models).toEqual(['first-model', 'after-restart', 'after-restart']);
|
|
334
|
+
expect(keys.slice(1).every(key => key.includes('after-restart-secret'))).toBe(true);
|
|
335
|
+
const attempts = await db.translationAttempt.findMany({ where: { sourceId: registered.id }, orderBy: { attemptVersion: 'asc' } });
|
|
336
|
+
expect(attempts.map(attempt => attempt.attemptVersion)).toEqual([1, 2, 3]);
|
|
337
|
+
expect(attempts.map(attempt => attempt.configRevision)).toEqual([1, 2, 2]);
|
|
338
|
+
expect(JSON.stringify(attempts)).not.toContain('private upstream failure');
|
|
339
|
+
await sleep(40);
|
|
340
|
+
expect(models).toHaveLength(3);
|
|
341
|
+
});
|
|
342
|
+
it('completes code-only bodies locally and preserves over-limit originals without external requests', async () => {
|
|
343
|
+
let calls = 0;
|
|
344
|
+
const service = make(async () => { calls++; return response('should never be requested'); });
|
|
345
|
+
await enable();
|
|
346
|
+
await service.start();
|
|
347
|
+
const code = '```typescript\nconst secret = "private code";\n```';
|
|
348
|
+
const local = await service.registerSource(source(sessionId, code, 'code-only'));
|
|
349
|
+
const localDone = await until(() => row(local.id), value => value.jobState === 'NOT_REQUIRED');
|
|
350
|
+
const localAttempt = await db.translationAttempt.findUniqueOrThrow({ where: { id: localDone.effectiveAttemptId } });
|
|
351
|
+
expect(localDone.originalText).toBe(code);
|
|
352
|
+
expect(localAttempt.resultText).toBe(code);
|
|
353
|
+
const original = 'a'.repeat(64 * 1024 + 1);
|
|
354
|
+
const oversized = await service.registerSource(source(sessionId, original, 'too-large'));
|
|
355
|
+
const failed = await until(() => row(oversized.id), value => value.jobState === 'FAILED');
|
|
356
|
+
expect(failed.originalText).toBe(original);
|
|
357
|
+
expect(failed.errorCode).toBe('PAYLOAD_TOO_LARGE');
|
|
358
|
+
expect(failed.effectiveAttemptId).toBeNull();
|
|
359
|
+
expect(calls).toBe(0);
|
|
360
|
+
});
|
|
361
|
+
it('opens a bad-credential circuit for the saved revision and admits requests with a new configuration', async () => {
|
|
362
|
+
const models = [];
|
|
363
|
+
const service = make(async (_url, init) => {
|
|
364
|
+
const body = JSON.parse(String(init?.body));
|
|
365
|
+
models.push(body.model);
|
|
366
|
+
if (models.length === 1)
|
|
367
|
+
return new Response('private auth failure', { status: 401 });
|
|
368
|
+
return response(body.messages.at(-1).content.split('\n').slice(1).join('\n'));
|
|
369
|
+
});
|
|
370
|
+
await enable();
|
|
371
|
+
await service.start();
|
|
372
|
+
const first = await service.registerSource(source(sessionId, 'Hello first', 'bad-key'));
|
|
373
|
+
expect((await until(() => row(first.id), value => value.jobState === 'FAILED')).errorCode).toBe('AUTH_FAILED');
|
|
374
|
+
const blocked = await service.registerSource(source(sessionId, 'Hello blocked', 'circuit-blocked'));
|
|
375
|
+
expect((await until(() => row(blocked.id), value => value.jobState === 'FAILED')).errorCode).toBe('CONFIG_CIRCUIT_OPEN');
|
|
376
|
+
expect(models).toEqual(['first-model']);
|
|
377
|
+
expect(await db.translationAttempt.count({ where: { sourceId: blocked.id } })).toBe(0);
|
|
378
|
+
await enable({ model: 'fixed-model', apiKey: { action: 'replace', value: 'fixed-credential' } });
|
|
379
|
+
const resumed = await service.registerSource(source(sessionId, 'Hello recovered', 'fixed-config'));
|
|
380
|
+
await until(() => row(resumed.id), value => value.jobState === 'SUCCESS');
|
|
381
|
+
expect(models).toEqual(['first-model', 'fixed-model']);
|
|
382
|
+
});
|
|
383
|
+
it('shares a single global HTTP slot between source translation and draft tests', async () => {
|
|
384
|
+
let calls = 0;
|
|
385
|
+
let inflight = 0;
|
|
386
|
+
let peak = 0;
|
|
387
|
+
let release;
|
|
388
|
+
const gate = new Promise(resolve => { release = resolve; });
|
|
389
|
+
const service = make(async (_url, init) => {
|
|
390
|
+
calls++;
|
|
391
|
+
inflight++;
|
|
392
|
+
peak = Math.max(peak, inflight);
|
|
393
|
+
try {
|
|
394
|
+
if (calls === 1)
|
|
395
|
+
await gate;
|
|
396
|
+
return response(JSON.parse(String(init?.body)).messages.at(-1).content.split('\n').slice(1).join('\n'));
|
|
397
|
+
}
|
|
398
|
+
finally {
|
|
399
|
+
inflight--;
|
|
400
|
+
}
|
|
401
|
+
});
|
|
402
|
+
await enable({ maxConcurrency: 1 });
|
|
403
|
+
await service.start();
|
|
404
|
+
const registered = await service.registerSource(source(sessionId));
|
|
405
|
+
await until(async () => calls, value => value === 1);
|
|
406
|
+
const pending = service.testDraft('independent-browser', draft, 'Hello draft', 'DISPLAY');
|
|
407
|
+
await sleep(30);
|
|
408
|
+
expect(calls).toBe(1);
|
|
409
|
+
expect(inflight).toBe(1);
|
|
410
|
+
release();
|
|
411
|
+
expect((await pending).resultText).toBe('Hello draft');
|
|
412
|
+
await until(() => row(registered.id), value => value.jobState === 'SUCCESS');
|
|
413
|
+
expect(calls).toBe(2);
|
|
414
|
+
expect(peak).toBe(1);
|
|
415
|
+
expect(inflight).toBe(0);
|
|
416
|
+
expect(await db.translationSource.count()).toBe(1);
|
|
417
|
+
expect(await db.translationAttempt.count()).toBe(1);
|
|
418
|
+
});
|
|
419
|
+
it('recovers an expired lease without allowing the old request to retain a winner', async () => {
|
|
420
|
+
const models = [];
|
|
421
|
+
const service = make(async (_url, init) => {
|
|
422
|
+
const body = JSON.parse(String(init?.body));
|
|
423
|
+
models.push(body.model);
|
|
424
|
+
if (models.length === 1)
|
|
425
|
+
return new Promise(() => { });
|
|
426
|
+
return response(body.messages.at(-1).content.split('\n').slice(1).join('\n'));
|
|
427
|
+
});
|
|
428
|
+
await enable({ maxConcurrency: 1 });
|
|
429
|
+
await service.start();
|
|
430
|
+
const registered = await service.registerSource(source(sessionId));
|
|
431
|
+
await until(() => row(registered.id), value => value.jobState === 'RUNNING');
|
|
432
|
+
await enable({ model: 'after-lease-expiry', maxConcurrency: 1 });
|
|
433
|
+
await db.translationAttempt.updateMany({ where: { sourceId: registered.id, status: 'RUNNING' }, data: { leaseExpiresAt: new Date(0) } });
|
|
434
|
+
await service.pump();
|
|
435
|
+
await until(() => row(registered.id), value => value.jobState === 'SUCCESS');
|
|
436
|
+
const attempts = await db.translationAttempt.findMany({ where: { sourceId: registered.id }, orderBy: { attemptVersion: 'asc' } });
|
|
437
|
+
expect(attempts.map(attempt => attempt.status)).toEqual(['INTERRUPTED', 'SUCCESS']);
|
|
438
|
+
expect(attempts[0].resultText).toBeNull();
|
|
439
|
+
expect(models).toEqual(['first-model', 'after-lease-expiry']);
|
|
440
|
+
});
|
|
441
|
+
it('admits later lanes past more than 64 durable sources held in the in-memory queue', async () => {
|
|
442
|
+
await enable({ maxConcurrency: 16 });
|
|
443
|
+
const ids = [sessionId];
|
|
444
|
+
for (const title of ['beta', 'gamma']) {
|
|
445
|
+
const conversation = await db.conversation.create({ data: { title, directoryName: title, workingDir: dir } });
|
|
446
|
+
ids.push((await db.session.create({ data: { conversationId: conversation.id, context: 'CONVERSATION', agentType: 'CODEX', prompt: 'test' } })).id);
|
|
447
|
+
}
|
|
448
|
+
const requests = [];
|
|
449
|
+
const releases = [];
|
|
450
|
+
const service = make(async (_url, init) => {
|
|
451
|
+
const body = JSON.parse(String(init?.body)).messages.at(-1).content;
|
|
452
|
+
requests.push(body);
|
|
453
|
+
await new Promise(resolve => releases.push(resolve));
|
|
454
|
+
return response(body.split('\n').slice(1).join('\n'));
|
|
455
|
+
}, { tickMs: 10 });
|
|
456
|
+
try {
|
|
457
|
+
for (let lane = 0; lane < 3; lane++)
|
|
458
|
+
for (let index = 0; index < (lane === 2 ? 1 : 64); index++) {
|
|
459
|
+
await service.registerSource(source(ids[lane], `Hello ${['alpha', 'beta', 'gamma'][lane]} message ${index}`, `block-${index}`));
|
|
460
|
+
}
|
|
461
|
+
await service.start();
|
|
462
|
+
// Queue callbacks claim sources independently; gamma can reach fetch before
|
|
463
|
+
// beta's second claim. Wait for all five admitted handles before counting.
|
|
464
|
+
await until(async () => requests, rows => rows.length >= 5 && rows.some(body => body.includes('gamma')));
|
|
465
|
+
expect(requests.filter(body => body.includes('alpha'))).toHaveLength(2);
|
|
466
|
+
expect(requests.filter(body => body.includes('beta'))).toHaveLength(2);
|
|
467
|
+
expect(requests.filter(body => body.includes('gamma'))).toHaveLength(1);
|
|
468
|
+
for (let index = 0; index < 5; index++)
|
|
469
|
+
await service.pump();
|
|
470
|
+
expect(new Set(requests).size).toBe(requests.length);
|
|
471
|
+
expect(await db.translationAttempt.count({ where: { status: 'RUNNING' } })).toBe(5);
|
|
472
|
+
}
|
|
473
|
+
finally {
|
|
474
|
+
const stopped = service.shutdown();
|
|
475
|
+
releases.forEach(resolve => resolve());
|
|
476
|
+
await stopped;
|
|
477
|
+
}
|
|
478
|
+
});
|
|
479
|
+
});
|
|
480
|
+
//# sourceMappingURL=translation.service.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"translation.service.test.js","sourceRoot":"","sources":["../../../src/services/__tests__/translation.service.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,6 +60,7 @@ export declare const AccessAuthService: {
|
|
|
60
60
|
valid: boolean;
|
|
61
61
|
generation: number;
|
|
62
62
|
}>;
|
|
63
|
+
prepareSessionTokenValidation(cookieToken: string | null): Promise<() => boolean>;
|
|
63
64
|
getSessionSecretGeneration(): number;
|
|
64
65
|
createPreviewAccessToken(workspaceId: string): Promise<string>;
|
|
65
66
|
validatePreviewAccessToken(token: string | null, workspaceId: string): Promise<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access-auth.service.d.ts","sourceRoot":"","sources":["../../src/services/access-auth.service.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,KAAK,EACV,sBAAsB,EACtB,sBAAsB,EACtB,6BAA6B,EAC9B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAmB,MAAM,cAAc,CAAC;AAQ7D,eAAO,MAAM,8BAA8B,uBAAuB,CAAC;AACnE,4FAA4F;AAC5F,eAAO,MAAM,uBAAuB,uBAAiC,CAAC;AACtE,eAAO,MAAM,mCAAmC,QAAmB,CAAC;AAcpE,KAAK,wBAAwB,GAAG;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,IAAI,GAAG,IAAI,CAAC;IAC/B,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;CACjB,CAAC;AAQF,MAAM,MAAM,yBAAyB,GAAG;IACtC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,MAAM,EAAE,QAAQ,GAAG,QAAQ,GAAG,IAAI,CAAC;CACpC,CAAC;AAWF,qBAAa,eAAgB,SAAQ,YAAY;gBACnC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,SAAM;CAI5D;AAMD,wBAAgB,uBAAuB,CAAC,OAAO,SAAmB,GAAG,MAAM,CAI1E;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAK5D;AAqGD,iBAAe,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAK7D;AAED,iBAAe,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAU7F;AA4CD,iBAAS,0BAA0B,IAAI,IAAI,CAK1C;AAED,iBAAS,iCAAiC,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,yBAAyB,CAa3F;AAED,iBAAS,uBAAuB,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAErE;AAED,iBAAS,kBAAkB,CAAC,QAAQ,EAAE,wBAAwB,GAAG,MAAM,CAKtE;AAED,iBAAS,wBAAwB,CAAC,QAAQ,EAAE,wBAAwB,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAMjG;AAiBD,iBAAS,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,EAAE,QAAQ,EAAE,wBAAwB,GAAG,OAAO,CAE/F;AAED,iBAAS,0BAA0B,CACjC,KAAK,EAAE,MAAM,GAAG,IAAI,EACpB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,wBAAwB,GACjC,OAAO,CAsBT;AAED,eAAO,MAAM,iBAAiB;yBACV,MAAM;;8BAME,cAAc;;;;;;;mCAUT,cAAc;;;;;;;;mBAYxB,OAAO,CAAC,sBAAsB,CAAC;iCAIjB,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,sBAAsB,CAAC;iBAQ/D,OAAO,CAAC,OAAO,CAAC;sCAKK,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC;6CAKzB,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC;iCAK5C,OAAO,CAAC,MAAM,CAAC;oDAKnC,MAAM,GAAG,IAAI,GACzB,OAAO,CAAC;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"access-auth.service.d.ts","sourceRoot":"","sources":["../../src/services/access-auth.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -324,6 +324,14 @@ export const AccessAuthService = {
|
|
|
324
324
|
&& generation === sessionSecretGeneration;
|
|
325
325
|
return { valid, generation };
|
|
326
326
|
},
|
|
327
|
+
// Load settings once, then let the caller validate at its synchronous commit
|
|
328
|
+
// point. A boolean produced before an await cannot cover natural expiration
|
|
329
|
+
// during that await (including the wait for this validator itself).
|
|
330
|
+
async prepareSessionTokenValidation(cookieToken) {
|
|
331
|
+
const generation = sessionSecretGeneration;
|
|
332
|
+
const settings = await ensureSettings();
|
|
333
|
+
return () => generation === sessionSecretGeneration && validateSessionToken(cookieToken, settings);
|
|
334
|
+
},
|
|
327
335
|
getSessionSecretGeneration() {
|
|
328
336
|
return sessionSecretGeneration;
|
|
329
337
|
},
|