@xopcai/xopc 0.0.86 → 0.0.87
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/browser-ext/manifest.json +1 -1
- package/dist/extensions/feishu/src/adapters/cli-login.js +3 -3
- package/dist/extensions/feishu/src/adapters/cli-login.js.map +1 -1
- package/dist/extensions/telegram/src/delivery-chat-id.d.ts +1 -1
- package/dist/extensions/telegram/src/delivery-chat-id.js +1 -1
- package/dist/extensions/telegram/src/delivery-chat-id.js.map +1 -1
- package/dist/extensions/telegram/src/routing-integration.js +1 -0
- package/dist/extensions/telegram/src/routing-integration.js.map +1 -1
- package/dist/extensions/telegram/xopc.extension.json +1 -1
- package/dist/extensions/weixin/src/__tests__/workflow-progress.test.js +2 -2
- package/dist/extensions/weixin/src/__tests__/workflow-progress.test.js.map +1 -1
- package/dist/extensions/weixin/src/api/api.js +2 -2
- package/dist/extensions/weixin/src/api/api.js.map +1 -1
- package/dist/extensions/weixin/src/auth/accounts.js +12 -12
- package/dist/extensions/weixin/src/auth/accounts.js.map +1 -1
- package/dist/extensions/weixin/src/delivery-to.js +2 -2
- package/dist/extensions/weixin/src/delivery-to.js.map +1 -1
- package/dist/extensions/weixin/src/messaging/debug-mode.js +5 -5
- package/dist/extensions/weixin/src/messaging/debug-mode.js.map +1 -1
- package/dist/extensions/weixin/src/messaging/inbound.js +11 -11
- package/dist/extensions/weixin/src/messaging/inbound.js.map +1 -1
- package/dist/extensions/weixin/src/storage/sync-buf.js +4 -4
- package/dist/extensions/weixin/src/storage/sync-buf.js.map +1 -1
- package/dist/extensions/weixin/src/workflow-progress.d.ts +1 -1
- package/dist/extensions/weixin/src/workflow-progress.js.map +1 -1
- package/dist/gateway/static/root/assets/{agents-mS3_HpRI.js → agents-BEAbXpuP.js} +6 -6
- package/dist/gateway/static/root/assets/{apps-page-DrfytjOb.js → apps-page-Dg8R-Szf.js} +1 -1
- package/dist/gateway/static/root/assets/{channels-settings-BG6b9KrW.js → channels-settings-yohw9YSu.js} +1 -1
- package/dist/gateway/static/root/assets/{channels-status-swr-Bs5kMCMI.js → channels-status-swr-BSHqqCF1.js} +1 -1
- package/dist/gateway/static/root/assets/{cron-api-BuVcZ5zR.js → cron-api-0h_QT8U3.js} +1 -1
- package/dist/gateway/static/root/assets/{cron-page-BMrloeFH.js → cron-page-BkfKFfFk.js} +1 -1
- package/dist/gateway/static/root/assets/{dist-CKU1OOTf.js → dist-Cmjp2APP.js} +1 -1
- package/dist/gateway/static/root/assets/{extension-debug-page-BdW_46sN.js → extension-debug-page-CFa9z_1N.js} +1 -1
- package/dist/gateway/static/root/assets/{extension-page-DW47KI82.js → extension-page-BI8eaTPq.js} +1 -1
- package/dist/gateway/static/root/assets/{extension-settings-page-B-W4x2xP.js → extension-settings-page-x4BB7q1X.js} +1 -1
- package/dist/gateway/static/root/assets/{fetch-B2MYHbWg.js → fetch-DRqwef_Q.js} +1 -1
- package/dist/gateway/static/root/assets/{field-primitives-DPG-oJmx.js → field-primitives-BiNHBo2Y.js} +1 -1
- package/dist/gateway/static/root/assets/{heartbeat-config-api-C8dNts9i.js → heartbeat-config-api-ZRb8qhuz.js} +1 -1
- package/dist/gateway/static/root/assets/{index-BmVYculr.js → index-Cu7bKuUi.js} +96 -94
- package/dist/gateway/static/root/assets/index-a5gWIdZQ.css +1 -0
- package/dist/gateway/static/root/assets/{logs-page-sTsVWz0X.js → logs-page-BFZ8GgCv.js} +1 -1
- package/dist/gateway/static/root/assets/{sessions-page-FaG_Vlkb.js → sessions-page-CD7AfB-2.js} +1 -1
- package/dist/gateway/static/root/assets/{settings-form-section-DuvRQW--.js → settings-form-section-DiqqVs6m.js} +1 -1
- package/dist/gateway/static/root/assets/{settings-page-Bet1OerL.js → settings-page-BBOjEQW3.js} +1 -1
- package/dist/gateway/static/root/assets/{share-preview-page-BtG2kLDh.js → share-preview-page-n1Gprylk.js} +1 -1
- package/dist/gateway/static/root/assets/{skills-page-DhUO235y.js → skills-page-CcN_gj--.js} +1 -1
- package/dist/gateway/static/root/assets/{theme-store-DryYl3qD.js → theme-store-CZOh1nT3.js} +1 -1
- package/dist/gateway/static/root/assets/url-Dd8Q7kZZ.js +3 -0
- package/dist/gateway/static/root/assets/{utils-BY7bU1DT.js → utils-CkWBfxs4.js} +1 -1
- package/dist/gateway/static/root/assets/{voice-api-key-field-CGEydndO.js → voice-api-key-field-O6awz9hi.js} +1 -1
- package/dist/gateway/static/root/index.html +5 -5
- package/dist/package.js +1 -1
- package/dist/src/agent/agent-scope.d.ts +4 -0
- package/dist/src/agent/agent-scope.js +53 -10
- package/dist/src/agent/agent-scope.js.map +1 -1
- package/dist/src/agent/bootstrap/filter-bootstrap-files.js +2 -1
- package/dist/src/agent/bootstrap/filter-bootstrap-files.js.map +1 -1
- package/dist/src/agent/embedded/session-tool-result-guard.js +2 -1
- package/dist/src/agent/embedded/session-tool-result-guard.js.map +1 -1
- package/dist/src/agent/embedded/tool-result-truncation.js +2 -1
- package/dist/src/agent/embedded/tool-result-truncation.js.map +1 -1
- package/dist/src/agent/fallback/candidates.js +2 -2
- package/dist/src/agent/fallback/candidates.js.map +1 -1
- package/dist/src/agent/goals/persistent-goal-apis.d.ts +0 -2
- package/dist/src/agent/goals/persistent-goal-service.js +0 -1
- package/dist/src/agent/goals/persistent-goal-service.js.map +1 -1
- package/dist/src/agent/image/generation/normalization.js +2 -12
- package/dist/src/agent/image/generation/normalization.js.map +1 -1
- package/dist/src/agent/image/generation/provider-registry.d.ts +4 -8
- package/dist/src/agent/image/generation/provider-registry.js.map +1 -1
- package/dist/src/agent/image/generation/runtime.d.ts +2 -2
- package/dist/src/agent/image/generation/runtime.js.map +1 -1
- package/dist/src/agent/image/generation/types.d.ts +0 -18
- package/dist/src/agent/image/image-helpers.js +6 -1
- package/dist/src/agent/image/image-helpers.js.map +1 -1
- package/dist/src/agent/image/index.d.ts +1 -1
- package/dist/src/agent/inbound/inbound-loop.d.ts +5 -0
- package/dist/src/agent/inbound/inbound-loop.js +41 -10
- package/dist/src/agent/inbound/inbound-loop.js.map +1 -1
- package/dist/src/agent/inbound/turn-dispatcher.d.ts +4 -0
- package/dist/src/agent/inbound/turn-dispatcher.js +6 -4
- package/dist/src/agent/inbound/turn-dispatcher.js.map +1 -1
- package/dist/src/agent/mcp/bundle-mcp-materialize.js +2 -1
- package/dist/src/agent/mcp/bundle-mcp-materialize.js.map +1 -1
- package/dist/src/agent/mcp/bundle-mcp-names.js +2 -1
- package/dist/src/agent/mcp/bundle-mcp-names.js.map +1 -1
- package/dist/src/agent/mcp/bundle-mcp-runtime.js +2 -1
- package/dist/src/agent/mcp/bundle-mcp-runtime.js.map +1 -1
- package/dist/src/agent/mcp/mcp-transport-config.js +2 -1
- package/dist/src/agent/mcp/mcp-transport-config.js.map +1 -1
- package/dist/src/agent/mcp/mcp-transport.js +2 -1
- package/dist/src/agent/mcp/mcp-transport.js.map +1 -1
- package/dist/src/agent/media-generation/runtime-shared.js +2 -9
- package/dist/src/agent/media-generation/runtime-shared.js.map +1 -1
- package/dist/src/agent/messaging/command-handler.d.ts +6 -0
- package/dist/src/agent/messaging/command-handler.js +5 -0
- package/dist/src/agent/messaging/command-handler.js.map +1 -1
- package/dist/src/agent/prompt/safety.d.ts +0 -7
- package/dist/src/agent/prompt/safety.js +1 -20
- package/dist/src/agent/prompt/safety.js.map +1 -1
- package/dist/src/agent/service/build-direct-message-content.js +1 -1
- package/dist/src/agent/service/build-direct-message-content.js.map +1 -1
- package/dist/src/agent/service/direct-turn-helpers.d.ts +3 -1
- package/dist/src/agent/service/direct-turn-helpers.js +6 -1
- package/dist/src/agent/service/direct-turn-helpers.js.map +1 -1
- package/dist/src/agent/service/process-direct-one-shot.d.ts +4 -0
- package/dist/src/agent/service/process-direct-one-shot.js +15 -2
- package/dist/src/agent/service/process-direct-one-shot.js.map +1 -1
- package/dist/src/agent/service/process-direct-streaming.d.ts +4 -0
- package/dist/src/agent/service/process-direct-streaming.js +34 -4
- package/dist/src/agent/service/process-direct-streaming.js.map +1 -1
- package/dist/src/agent/service/webchat-tts.js +1 -1
- package/dist/src/agent/service/webchat-tts.js.map +1 -1
- package/dist/src/agent/service.d.ts +8 -0
- package/dist/src/agent/service.js +21 -1
- package/dist/src/agent/service.js.map +1 -1
- package/dist/src/agent/tools/create-share-tool.js +27 -20
- package/dist/src/agent/tools/create-share-tool.js.map +1 -1
- package/dist/src/agent/tools/factory.js +1 -1
- package/dist/src/agent/tools/index.d.ts +0 -1
- package/dist/src/agent/tools/index.js +4 -5
- package/dist/src/agent/tools/shell.js +0 -13
- package/dist/src/agent/tools/shell.js.map +1 -1
- package/dist/src/agent/tools/workflow-tool.js +7 -1
- package/dist/src/agent/tools/workflow-tool.js.map +1 -1
- package/dist/src/agent/workflow/channel-capability.d.ts +3 -3
- package/dist/src/agent/workflow/lint.d.ts +38 -0
- package/dist/src/agent/workflow/lint.js +74 -0
- package/dist/src/agent/workflow/lint.js.map +1 -0
- package/dist/src/agent/workflow/parser.js +4 -1
- package/dist/src/agent/workflow/parser.js.map +1 -1
- package/dist/src/agent/workflow/runtime.d.ts +3 -0
- package/dist/src/agent/workflow/runtime.js +76 -3
- package/dist/src/agent/workflow/runtime.js.map +1 -1
- package/dist/src/agent/workflow/types.d.ts +3 -1
- package/dist/src/browser/index.js +4 -4
- package/dist/src/browser/manager.d.ts +1 -3
- package/dist/src/browser/manager.js +0 -6
- package/dist/src/browser/manager.js.map +1 -1
- package/dist/src/browser/providers/browser-ext-install.d.ts +4 -4
- package/dist/src/browser/providers/browser-ext-install.js +38 -85
- package/dist/src/browser/providers/browser-ext-install.js.map +1 -1
- package/dist/src/browser/providers/cloakbrowser.d.ts +0 -5
- package/dist/src/browser/providers/cloakbrowser.js +2 -55
- package/dist/src/browser/providers/cloakbrowser.js.map +1 -1
- package/dist/src/channels/attachments/voice-stt-webchat.js +10 -8
- package/dist/src/channels/attachments/voice-stt-webchat.js.map +1 -1
- package/dist/src/channels/pairing/allow-from-file.js +9 -9
- package/dist/src/channels/pairing/allow-from-file.js.map +1 -1
- package/dist/src/channels/pairing/pairing-store.js +6 -6
- package/dist/src/channels/pairing/pairing-store.js.map +1 -1
- package/dist/src/chat-commands/builtins/session.js +1 -1
- package/dist/src/chat-commands/builtins/session.js.map +1 -1
- package/dist/src/chat-commands/builtins/tts.js +2 -2
- package/dist/src/chat-commands/builtins/tts.js.map +1 -1
- package/dist/src/chat-commands/context.d.ts +3 -0
- package/dist/src/chat-commands/context.js +21 -3
- package/dist/src/chat-commands/context.js.map +1 -1
- package/dist/src/chat-commands/session-key.d.ts +4 -37
- package/dist/src/chat-commands/session-key.js +49 -85
- package/dist/src/chat-commands/session-key.js.map +1 -1
- package/dist/src/chat-commands/types.d.ts +2 -0
- package/dist/src/cli/commands/agent/interactive.js +2 -2
- package/dist/src/cli/commands/agent/interactive.js.map +1 -1
- package/dist/src/cli/commands/agent/sessions.js +2 -2
- package/dist/src/cli/commands/agent/sessions.js.map +1 -1
- package/dist/src/cli/commands/agent.js +4 -5
- package/dist/src/cli/commands/agent.js.map +1 -1
- package/dist/src/cli/commands/channels.js +1 -5
- package/dist/src/cli/commands/channels.js.map +1 -1
- package/dist/src/cli/commands/gateway/lifecycle-core.js +1 -1
- package/dist/src/cli/commands/gateway/lifecycle-core.js.map +1 -1
- package/dist/src/cli/commands/gateway/logs.d.ts +9 -0
- package/dist/src/cli/commands/gateway/logs.js +50 -17
- package/dist/src/cli/commands/gateway/logs.js.map +1 -1
- package/dist/src/cli/commands/image.js +22 -21
- package/dist/src/cli/commands/image.js.map +1 -1
- package/dist/src/cli/commands/session/utils.js +2 -2
- package/dist/src/cli/commands/session/utils.js.map +1 -1
- package/dist/src/cli/commands/update.js +26 -46
- package/dist/src/cli/commands/update.js.map +1 -1
- package/dist/src/cli/utils/session.d.ts +0 -5
- package/dist/src/cli/utils/session.js +1 -6
- package/dist/src/cli/utils/session.js.map +1 -1
- package/dist/src/commands/agents.config.js +1 -1
- package/dist/src/commands/agents.config.js.map +1 -1
- package/dist/src/config/agent-profile.js +5 -27
- package/dist/src/config/agent-profile.js.map +1 -1
- package/dist/src/config/index.js +2 -2
- package/dist/src/config/model-input.js +2 -5
- package/dist/src/config/model-input.js.map +1 -1
- package/dist/src/config/schema.d.ts +201 -217
- package/dist/src/config/schema.js +54 -39
- package/dist/src/config/schema.js.map +1 -1
- package/dist/src/config/workspace-path-helpers.d.ts +1 -2
- package/dist/src/config/workspace-path-helpers.js.map +1 -1
- package/dist/src/daemon/install-plan.js +25 -1
- package/dist/src/daemon/install-plan.js.map +1 -1
- package/dist/src/daemon/launchd.d.ts +8 -0
- package/dist/src/daemon/launchd.js +5 -12
- package/dist/src/daemon/launchd.js.map +1 -1
- package/dist/src/daemon/schtasks.d.ts +25 -0
- package/dist/src/daemon/schtasks.js +166 -46
- package/dist/src/daemon/schtasks.js.map +1 -1
- package/dist/src/daemon/service.js +5 -4
- package/dist/src/daemon/service.js.map +1 -1
- package/dist/src/daemon/systemd.d.ts +6 -0
- package/dist/src/daemon/systemd.js +18 -3
- package/dist/src/daemon/systemd.js.map +1 -1
- package/dist/src/extensions/activation-context.js +0 -1
- package/dist/src/extensions/activation-context.js.map +1 -1
- package/dist/src/extensions/normalize-manifest.js +0 -1
- package/dist/src/extensions/normalize-manifest.js.map +1 -1
- package/dist/src/extensions/types/manifest.d.ts +0 -2
- package/dist/src/gateway/agent-builtin-tools.d.ts +1 -1
- package/dist/src/gateway/agent-builtin-tools.js +1 -0
- package/dist/src/gateway/agent-builtin-tools.js.map +1 -1
- package/dist/src/gateway/agents-admin.js +10 -2
- package/dist/src/gateway/agents-admin.js.map +1 -1
- package/dist/src/gateway/heartbeat/service.js +2 -2
- package/dist/src/gateway/heartbeat/service.js.map +1 -1
- package/dist/src/gateway/hono/app.js +1 -1
- package/dist/src/gateway/hono/lib/agent-model.d.ts +18 -10
- package/dist/src/gateway/hono/lib/agent-model.js +24 -35
- package/dist/src/gateway/hono/lib/agent-model.js.map +1 -1
- package/dist/src/gateway/hono/lib/config-payload.js +1 -1
- package/dist/src/gateway/hono/lib/config-payload.js.map +1 -1
- package/dist/src/gateway/hono/lib/safe-voice-config.js +14 -53
- package/dist/src/gateway/hono/lib/safe-voice-config.js.map +1 -1
- package/dist/src/gateway/hono/routes/config-patch/agents.js +17 -5
- package/dist/src/gateway/hono/routes/config-patch/agents.js.map +1 -1
- package/dist/src/gateway/hono/routes/config-patch/channels.js +0 -11
- package/dist/src/gateway/hono/routes/config-patch/channels.js.map +1 -1
- package/dist/src/gateway/hono/routes/goals.js +1 -1
- package/dist/src/gateway/hono/routes/goals.js.map +1 -1
- package/dist/src/gateway/hono/routes/sessions.js +28 -7
- package/dist/src/gateway/hono/routes/sessions.js.map +1 -1
- package/dist/src/gateway/hono/routes/shares.js +14 -12
- package/dist/src/gateway/hono/routes/shares.js.map +1 -1
- package/dist/src/gateway/hono/routes/tunnel.js +1 -1
- package/dist/src/gateway/hono/routes/update.js +4 -2
- package/dist/src/gateway/hono/routes/update.js.map +1 -1
- package/dist/src/gateway/hono/sse.js +16 -33
- package/dist/src/gateway/hono/sse.js.map +1 -1
- package/dist/src/gateway/lock.js +10 -10
- package/dist/src/gateway/lock.js.map +1 -1
- package/dist/src/gateway/ports.js +6 -6
- package/dist/src/gateway/ports.js.map +1 -1
- package/dist/src/gateway/resolve-webchat-session-key.d.ts +19 -0
- package/dist/src/gateway/resolve-webchat-session-key.js +46 -0
- package/dist/src/gateway/resolve-webchat-session-key.js.map +1 -0
- package/dist/src/gateway/service/run-gateway-agent.js +27 -11
- package/dist/src/gateway/service/run-gateway-agent.js.map +1 -1
- package/dist/src/gateway/service/sessions-api.d.ts +3 -0
- package/dist/src/gateway/service/sessions-api.js +8 -0
- package/dist/src/gateway/service/sessions-api.js.map +1 -1
- package/dist/src/gateway/service.d.ts +0 -2
- package/dist/src/gateway/service.js +2 -7
- package/dist/src/gateway/service.js.map +1 -1
- package/dist/src/gateway/session-reset-service.d.ts +20 -0
- package/dist/src/gateway/session-reset-service.js +54 -0
- package/dist/src/gateway/session-reset-service.js.map +1 -0
- package/dist/src/gateway/startup-readiness.d.ts +1 -1
- package/dist/src/gateway/startup-readiness.js +1 -0
- package/dist/src/gateway/startup-readiness.js.map +1 -1
- package/dist/src/heartbeat/index.js +1 -1
- package/dist/src/infra/gateway-processes.js +2 -2
- package/dist/src/infra/gateway-processes.js.map +1 -1
- package/dist/src/infra/run-command.d.ts +16 -0
- package/dist/src/infra/run-command.js +67 -0
- package/dist/src/infra/run-command.js.map +1 -0
- package/dist/src/infra/update-global.d.ts +45 -0
- package/dist/src/infra/update-global.js +224 -0
- package/dist/src/infra/update-global.js.map +1 -0
- package/dist/src/mcp/channel-bridge.js +1 -1
- package/dist/src/mcp/channel-shared.js +2 -1
- package/dist/src/mcp/channel-shared.js.map +1 -1
- package/dist/src/providers/auth-runtime/auth-profile-store.js +1 -1
- package/dist/src/providers/auth-runtime/auth-profile-store.js.map +1 -1
- package/dist/src/providers/auth-runtime/resolve-auth.js +1 -12
- package/dist/src/providers/auth-runtime/resolve-auth.js.map +1 -1
- package/dist/src/providers/auth-runtime/types.d.ts +6 -12
- package/dist/src/routing/agent-session-key.d.ts +58 -0
- package/dist/src/routing/agent-session-key.js +164 -0
- package/dist/src/routing/agent-session-key.js.map +1 -0
- package/dist/src/routing/index.d.ts +1 -1
- package/dist/src/routing/index.js +4 -2
- package/dist/src/routing/index.js.map +1 -1
- package/dist/src/routing/resolve-route.d.ts +15 -0
- package/dist/src/routing/resolve-route.js +41 -20
- package/dist/src/routing/resolve-route.js.map +1 -1
- package/dist/src/routing/resolve-tui-session-key.d.ts +25 -0
- package/dist/src/routing/resolve-tui-session-key.js +54 -0
- package/dist/src/routing/resolve-tui-session-key.js.map +1 -0
- package/dist/src/routing/session-key-utils.d.ts +24 -0
- package/dist/src/routing/session-key-utils.js +92 -0
- package/dist/src/routing/session-key-utils.js.map +1 -0
- package/dist/src/routing/session-key.d.ts +19 -49
- package/dist/src/routing/session-key.js +143 -116
- package/dist/src/routing/session-key.js.map +1 -1
- package/dist/src/session/index.d.ts +6 -0
- package/dist/src/session/index.js +7 -1
- package/dist/src/session/init-session-turn.d.ts +30 -0
- package/dist/src/session/init-session-turn.js +102 -0
- package/dist/src/session/init-session-turn.js.map +1 -0
- package/dist/src/session/lifecycle-timestamps.d.ts +8 -0
- package/dist/src/session/lifecycle-timestamps.js +16 -0
- package/dist/src/session/lifecycle-timestamps.js.map +1 -0
- package/dist/src/session/manager.d.ts +7 -1
- package/dist/src/session/manager.js +8 -1
- package/dist/src/session/manager.js.map +1 -1
- package/dist/src/session/parity/transcript-paths.js +2 -2
- package/dist/src/session/parity/transcript-paths.js.map +1 -1
- package/dist/src/session/parity/xopc-session-disk-entry.d.ts +6 -0
- package/dist/src/session/reset-policy.d.ts +32 -0
- package/dist/src/session/reset-policy.js +65 -0
- package/dist/src/session/reset-policy.js.map +1 -0
- package/dist/src/session/reset-triggers.d.ts +20 -0
- package/dist/src/session/reset-triggers.js +63 -0
- package/dist/src/session/reset-triggers.js.map +1 -0
- package/dist/src/session/reset-type.d.ts +12 -0
- package/dist/src/session/reset-type.js +25 -0
- package/dist/src/session/reset-type.js.map +1 -0
- package/dist/src/session/resolve-session.d.ts +30 -0
- package/dist/src/session/resolve-session.js +93 -0
- package/dist/src/session/resolve-session.js.map +1 -0
- package/dist/src/session/session-title.js +3 -2
- package/dist/src/session/session-title.js.map +1 -1
- package/dist/src/session/store.d.ts +11 -4
- package/dist/src/session/store.js +57 -6
- package/dist/src/session/store.js.map +1 -1
- package/dist/src/session/transcript-events.js +2 -1
- package/dist/src/session/transcript-events.js.map +1 -1
- package/dist/src/share/share-url.d.ts +33 -0
- package/dist/src/share/share-url.js +56 -14
- package/dist/src/share/share-url.js.map +1 -1
- package/dist/src/tui/backends/embedded-backend.js +4 -9
- package/dist/src/tui/backends/embedded-backend.js.map +1 -1
- package/dist/src/tui/backends/gateway-sse-backend.js +1 -1
- package/dist/src/tui/backends/gateway-sse-backend.js.map +1 -1
- package/dist/src/tui/components/chat-log.js +3 -3
- package/dist/src/tui/components/chat-log.js.map +1 -1
- package/dist/src/tui/theme.d.ts +0 -2
- package/dist/src/tui/theme.js +1 -3
- package/dist/src/tui/theme.js.map +1 -1
- package/dist/src/tui/tui-commands.d.ts +3 -0
- package/dist/src/tui/tui-commands.js +45 -10
- package/dist/src/tui/tui-commands.js.map +1 -1
- package/dist/src/tui/tui-keybindings-file.js +1 -21
- package/dist/src/tui/tui-keybindings-file.js.map +1 -1
- package/dist/src/tui/tui-session-actions.d.ts +28 -0
- package/dist/src/tui/tui-session-actions.js +88 -0
- package/dist/src/tui/tui-session-actions.js.map +1 -0
- package/dist/src/tui/tui.js +52 -47
- package/dist/src/tui/tui.js.map +1 -1
- package/dist/src/utils/string-coerce.d.ts +2 -0
- package/dist/src/utils/string-coerce.js +10 -1
- package/dist/src/utils/string-coerce.js.map +1 -1
- package/dist/src/voice/stt/config-slice.d.ts +2 -5
- package/dist/src/voice/stt/config-slice.js +5 -26
- package/dist/src/voice/stt/config-slice.js.map +1 -1
- package/dist/src/voice/stt/types.d.ts +1 -18
- package/dist/src/voice/stt/types.js +4 -2
- package/dist/src/voice/stt/types.js.map +1 -1
- package/dist/src/voice/tts/config-slice.d.ts +3 -7
- package/dist/src/voice/tts/config-slice.js +7 -38
- package/dist/src/voice/tts/config-slice.js.map +1 -1
- package/dist/src/voice/tts/merge-config.js +2 -48
- package/dist/src/voice/tts/merge-config.js.map +1 -1
- package/dist/src/voice/tts/providers/alibaba-speech.js +1 -1
- package/dist/src/voice/tts/providers/alibaba-speech.js.map +1 -1
- package/dist/src/voice/tts/types.d.ts +1 -29
- package/dist/src/voice/tts/types.js +19 -17
- package/dist/src/voice/tts/types.js.map +1 -1
- package/package.json +1 -4
- package/dist/gateway/static/root/assets/index-ew_2L2We.css +0 -1
- package/dist/gateway/static/root/assets/url-BwNL6Rgk.js +0 -3
- package/dist/src/agent/tools/browser-legacy-tools.d.ts +0 -17
- package/dist/src/agent/tools/browser-legacy-tools.js +0 -766
- package/dist/src/agent/tools/browser-legacy-tools.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime-shared.js","names":[],"sources":["../../../../src/agent/media-generation/runtime-shared.ts"],"sourcesContent":["/**\n * Cross-capability runtime helpers shared by image / audio / video\n * generation. Pure functions (no IO) so they can be unit-tested without\n * touching providers.\n *\n * - candidate model resolution\n * - geometry/value nearest-neighbour matching\n * - terminal failure aggregation (FailoverError)\n * - \"no model configured\" message builder\n */\n\nimport type { Config, AgentModelConfig } from '../../config/schema.js';\nimport {\n classifyAttemptError,\n FailoverError,\n type FallbackAttempt,\n type FailoverReason,\n} from '../failover-error.js';\nimport { parseCapabilityModelRef, type ParsedCapabilityModelRef } from './model-ref.js';\n\n// ============================================\n// Candidate resolution\n// ============================================\n\nexport interface CapabilityProviderCandidate {\n id: string;\n aliases?: readonly string[];\n defaultModel?: string | null;\n models?: readonly string[];\n isConfigured?: (ctx: { cfg?: Config; agentDir?: string }) => boolean;\n}\n\nexport interface ResolveCapabilityModelCandidatesParams {\n cfg?: Config;\n /** Active capability model config, e.g. cfg.agents.defaults.imageGenerationModel. */\n modelConfig: AgentModelConfig | undefined;\n /** Caller-supplied per-call override (highest priority). */\n modelOverride?: string;\n /** Optional ref parser; defaults to {@link parseCapabilityModelRef}. */\n parseModelRef?: (raw: string | undefined) => ParsedCapabilityModelRef | null;\n agentDir?: string;\n /** Snapshot of registered providers used to enumerate fallbacks. */\n listProviders: (cfg?: Config) => CapabilityProviderCandidate[];\n /**\n * When true and the explicit candidates fail, append every configured\n * provider's default model.\n */\n autoProviderFallback?: boolean;\n}\n\nexport interface ResolvedCapabilityModelCandidate {\n provider: string;\n model: string;\n}\n\n/**\n * Build the ordered candidate list from:\n * 1. modelOverride\n * 2. modelConfig.primary\n * 3. modelConfig.fallbacks[]\n * 4. (optional) every isConfigured() provider's defaultModel\n *\n * Duplicates are dropped (case-insensitive on provider, exact on model).\n */\nexport function resolveCapabilityModelCandidates(\n params: ResolveCapabilityModelCandidatesParams,\n): ResolvedCapabilityModelCandidate[] {\n const parse = params.parseModelRef ?? parseCapabilityModelRef;\n const out: ResolvedCapabilityModelCandidate[] = [];\n const seen = new Set<string>();\n\n const push = (raw: string | undefined) => {\n const parsed = parse(raw);\n if (!parsed) return;\n const key = `${parsed.provider}::${parsed.model}`;\n if (seen.has(key)) return;\n seen.add(key);\n out.push({ provider: parsed.provider, model: parsed.model });\n };\n\n const normalizedModelConfig = normalizeModelConfig(params.modelConfig);\n push(params.modelOverride);\n push(normalizedModelConfig.primary);\n for (const fb of normalizedModelConfig.fallbacks) push(fb);\n\n if (params.autoProviderFallback) {\n const providers = safeListProviders(params.listProviders, params.cfg);\n for (const provider of providers) {\n if (!provider.defaultModel) continue;\n let configured = true;\n try {\n configured = provider.isConfigured?.({ cfg: params.cfg, agentDir: params.agentDir }) ?? true;\n } catch {\n configured = false;\n }\n if (!configured) continue;\n push(`${provider.id}/${provider.defaultModel}`);\n }\n }\n\n return out;\n}\n\nfunction safeListProviders(\n fn: (cfg?: Config) => CapabilityProviderCandidate[],\n cfg?: Config,\n): CapabilityProviderCandidate[] {\n try {\n return fn(cfg) ?? [];\n } catch {\n return [];\n }\n}\n\n/**\n * Normalize an {@link AgentModelConfig} (which may be a bare string for\n * legacy configs) to an object with explicit `primary` / `fallbacks`.\n */\nfunction normalizeModelConfig(\n cfg: AgentModelConfig | undefined,\n): { primary?: string; fallbacks: string[] } {\n if (cfg === undefined || cfg === null) return { fallbacks: [] };\n if (typeof cfg === 'string') return { primary: cfg, fallbacks: [] };\n return {\n primary: typeof cfg.primary === 'string' ? cfg.primary : undefined,\n fallbacks: Array.isArray(cfg.fallbacks) ? cfg.fallbacks.filter((s): s is string => typeof s === 'string') : [],\n };\n}\n\n// ============================================\n// Geometry helpers (nearest-neighbour)\n// ============================================\n\nexport function resolveClosestSize(params: {\n requestedSize?: string;\n requestedAspectRatio?: string;\n supportedSizes?: ReadonlyArray<string>;\n}): string | undefined {\n const supported = (params.supportedSizes ?? []).filter((s) => parseSize(s) !== null);\n if (supported.length === 0) return undefined;\n\n const target =\n parseSize(params.requestedSize) ??\n sizeFromAspectRatio(params.requestedAspectRatio, supported.map((s) => parseSize(s)!.totalPixels));\n\n if (!target) return supported[0];\n return supported\n .map((s) => ({ s, parsed: parseSize(s)! }))\n .reduce((best, cur) => {\n const score = sizeDistance(target, cur.parsed);\n return score < best.score ? { s: cur.s, score } : best;\n }, { s: supported[0], score: Number.POSITIVE_INFINITY })\n .s;\n}\n\nexport function resolveClosestAspectRatio(params: {\n requestedAspectRatio?: string;\n requestedSize?: string;\n supportedAspectRatios?: ReadonlyArray<string>;\n}): string | undefined {\n const supported = (params.supportedAspectRatios ?? []).filter((r) => parseAspectRatio(r) !== null);\n if (supported.length === 0) return undefined;\n\n const targetRatio =\n parseAspectRatio(params.requestedAspectRatio)?.value ??\n (() => {\n const sz = parseSize(params.requestedSize);\n return sz ? sz.width / sz.height : undefined;\n })();\n\n if (typeof targetRatio !== 'number' || !Number.isFinite(targetRatio)) {\n return supported[0];\n }\n\n return supported.reduce((best, cur) => {\n const v = parseAspectRatio(cur)!.value;\n const d = Math.abs(Math.log(v) - Math.log(targetRatio));\n return d < best.score ? { s: cur, score: d } : best;\n }, { s: supported[0], score: Number.POSITIVE_INFINITY }).s;\n}\n\nexport function resolveClosestResolution<T extends string>(params: {\n requestedResolution?: T;\n supportedResolutions?: ReadonlyArray<T>;\n}): T | undefined {\n const supported = params.supportedResolutions ?? [];\n if (supported.length === 0) return undefined;\n const requested = params.requestedResolution;\n if (!requested) return undefined;\n if (supported.includes(requested)) return requested;\n\n const order = ['1K', '2K', '4K', '8K'];\n const want = order.indexOf(String(requested));\n if (want < 0) return supported[0];\n\n // Prefer the largest supported value <= requested; otherwise pick the smallest available.\n const ranked = supported\n .map((r) => ({ r, idx: order.indexOf(String(r)) }))\n .filter((x) => x.idx >= 0)\n .sort((a, b) => a.idx - b.idx);\n if (ranked.length === 0) return supported[0];\n\n let chosen = ranked[0].r;\n for (const x of ranked) {\n if (x.idx <= want) chosen = x.r;\n }\n return chosen;\n}\n\nfunction parseSize(raw: string | undefined): { width: number; height: number; totalPixels: number } | null {\n if (typeof raw !== 'string') return null;\n const m = raw.trim().toLowerCase().match(/^(\\d{2,5})\\s*[x×*]\\s*(\\d{2,5})$/);\n if (!m) return null;\n const width = Number(m[1]);\n const height = Number(m[2]);\n if (!Number.isFinite(width) || !Number.isFinite(height) || width <= 0 || height <= 0) return null;\n return { width, height, totalPixels: width * height };\n}\n\nfunction parseAspectRatio(raw: string | undefined): { value: number } | null {\n if (typeof raw !== 'string') return null;\n const m = raw.trim().match(/^(\\d{1,3})\\s*[:x×/]\\s*(\\d{1,3})$/);\n if (!m) return null;\n const w = Number(m[1]);\n const h = Number(m[2]);\n if (!Number.isFinite(w) || !Number.isFinite(h) || w <= 0 || h <= 0) return null;\n return { value: w / h };\n}\n\nfunction sizeFromAspectRatio(\n ratioStr: string | undefined,\n pixelHints: number[],\n): { width: number; height: number; totalPixels: number } | null {\n const r = parseAspectRatio(ratioStr);\n if (!r) return null;\n const pixels = pixelHints.length > 0 ? Math.round(pixelHints.reduce((a, b) => a + b, 0) / pixelHints.length) : 1024 * 1024;\n const height = Math.round(Math.sqrt(pixels / r.value));\n const width = Math.round(height * r.value);\n return { width, height, totalPixels: width * height };\n}\n\nfunction sizeDistance(\n a: { width: number; height: number; totalPixels: number },\n b: { width: number; height: number; totalPixels: number },\n): number {\n // Combined area + aspect-ratio difference (log-scale on both for stability).\n const areaDelta = Math.abs(Math.log(a.totalPixels) - Math.log(b.totalPixels));\n const ratioA = a.width / a.height;\n const ratioB = b.width / b.height;\n const ratioDelta = Math.abs(Math.log(ratioA) - Math.log(ratioB));\n return areaDelta + ratioDelta * 1.5;\n}\n\n// ============================================\n// Failure aggregation\n// ============================================\n\nexport interface RecordCapabilityCandidateFailureParams {\n attempts: FallbackAttempt[];\n provider: string;\n model: string;\n error: unknown;\n durationMs?: number;\n}\n\n/** Push a structured {@link FallbackAttempt} entry derived from `error`. */\nexport function recordCapabilityCandidateFailure(\n params: RecordCapabilityCandidateFailureParams,\n): FallbackAttempt {\n const cls = classifyAttemptError(params.error);\n const attempt: FallbackAttempt = {\n provider: params.provider,\n model: params.model,\n error: cls.message,\n reason: cls.reason,\n ...(cls.status !== undefined ? { status: cls.status } : {}),\n ...(cls.code !== undefined ? { code: cls.code } : {}),\n ...(params.durationMs !== undefined ? { durationMs: params.durationMs } : {}),\n };\n params.attempts.push(attempt);\n return attempt;\n}\n\nexport interface ThrowCapabilityGenerationFailureParams {\n capabilityLabel: string;\n attempts: FallbackAttempt[];\n lastError: unknown;\n}\n\n/** Throw a unified {@link FailoverError} after all candidates have been exhausted. */\nexport function throwCapabilityGenerationFailure(params: ThrowCapabilityGenerationFailureParams): never {\n // capabilityLabel like \"image generation\" → identifier \"image-generation\"\n const capability = params.capabilityLabel.trim().toLowerCase().replace(/\\s+/g, '-') || 'capability';\n throw new FailoverError({\n capability,\n attempts: params.attempts,\n cause: params.lastError,\n });\n}\n\n// ============================================\n// \"No model configured\" message\n// ============================================\n\nexport interface BuildNoCapabilityModelConfiguredMessageParams {\n /** Display label, e.g. \"image-generation\". */\n capabilityLabel: string;\n /** Config key path, e.g. \"imageGenerationModel\". */\n modelConfigKey: string;\n providers: ReadonlyArray<CapabilityProviderCandidate>;\n /** Optional env-var lookup, e.g. (id) => PROVIDER_ENV_MAP[id]. */\n getProviderEnvVars?: (id: string) => readonly string[] | undefined;\n}\n\nexport function buildNoCapabilityModelConfiguredMessage(\n params: BuildNoCapabilityModelConfiguredMessageParams,\n): string {\n const lines: string[] = [\n `No ${params.capabilityLabel} model configured. Set agents.defaults.${params.modelConfigKey} ` +\n `to a \"<provider>/<model>\" value (or pass modelOverride at call site).`,\n ];\n if (params.providers.length > 0) {\n lines.push('Registered providers:');\n for (const p of params.providers) {\n const envs = params.getProviderEnvVars?.(p.id) ?? [];\n const env = envs.length > 0 ? ` (env: ${envs.join(' | ')})` : '';\n const def = p.defaultModel ? ` default=${p.defaultModel}` : '';\n lines.push(` - ${p.id}${def}${env}`);\n }\n }\n return lines.join('\\n');\n}\n\n/**\n * Build a `metadata.normalization` snapshot from a completed normalization\n * pass. Providers / runtime can spread it into their result metadata.\n */\nexport function buildMediaGenerationNormalizationMetadata(params: {\n normalization?: Record<string, unknown>;\n}): Record<string, unknown> {\n if (!params.normalization || Object.keys(params.normalization).length === 0) return {};\n return { normalization: params.normalization };\n}\n\n// Re-export the union for downstream type narrowing.\nexport type { FailoverReason };\n"],"mappings":";;;;;;;;;;;;AAgEA,SAAgB,iCACd,QACoC;CACpC,MAAM,QAAQ,OAAO,iBAAiB;CACtC,MAAM,MAA0C,EAAE;CAClD,MAAM,uBAAO,IAAI,KAAa;CAE9B,MAAM,QAAQ,QAA4B;EACxC,MAAM,SAAS,MAAM,IAAI;AACzB,MAAI,CAAC,OAAQ;EACb,MAAM,MAAM,GAAG,OAAO,SAAS,IAAI,OAAO;AAC1C,MAAI,KAAK,IAAI,IAAI,CAAE;AACnB,OAAK,IAAI,IAAI;AACb,MAAI,KAAK;GAAE,UAAU,OAAO;GAAU,OAAO,OAAO;GAAO,CAAC;;CAG9D,MAAM,wBAAwB,qBAAqB,OAAO,YAAY;AACtE,MAAK,OAAO,cAAc;AAC1B,MAAK,sBAAsB,QAAQ;AACnC,MAAK,MAAM,MAAM,sBAAsB,UAAW,MAAK,GAAG;AAE1D,KAAI,OAAO,sBAAsB;EAC/B,MAAM,YAAY,kBAAkB,OAAO,eAAe,OAAO,IAAI;AACrE,OAAK,MAAM,YAAY,WAAW;AAChC,OAAI,CAAC,SAAS,aAAc;GAC5B,IAAI,aAAa;AACjB,OAAI;AACF,iBAAa,SAAS,eAAe;KAAE,KAAK,OAAO;KAAK,UAAU,OAAO;KAAU,CAAC,IAAI;WAClF;AACN,iBAAa;;AAEf,OAAI,CAAC,WAAY;AACjB,QAAK,GAAG,SAAS,GAAG,GAAG,SAAS,eAAe;;;AAInD,QAAO;;AAGT,SAAS,kBACP,IACA,KAC+B;AAC/B,KAAI;AACF,SAAO,GAAG,IAAI,IAAI,EAAE;SACd;AACN,SAAO,EAAE;;;;;;;AAQb,SAAS,qBACP,KAC2C;AAC3C,KAAI,QAAQ,KAAA,KAAa,QAAQ,KAAM,QAAO,EAAE,WAAW,EAAE,EAAE;AAC/D,KAAI,OAAO,QAAQ,SAAU,QAAO;EAAE,SAAS;EAAK,WAAW,EAAE;EAAE;AACnE,QAAO;EACL,SAAS,OAAO,IAAI,YAAY,WAAW,IAAI,UAAU,KAAA;EACzD,WAAW,MAAM,QAAQ,IAAI,UAAU,GAAG,IAAI,UAAU,QAAQ,MAAmB,OAAO,MAAM,SAAS,GAAG,EAAE;EAC/G;;AAOH,SAAgB,mBAAmB,QAIZ;CACrB,MAAM,aAAa,OAAO,kBAAkB,EAAE,EAAE,QAAQ,MAAM,UAAU,EAAE,KAAK,KAAK;AACpF,KAAI,UAAU,WAAW,EAAG,QAAO,KAAA;CAEnC,MAAM,SACJ,UAAU,OAAO,cAAc,IAC/B,oBAAoB,OAAO,sBAAsB,UAAU,KAAK,MAAM,UAAU,EAAE,CAAE,YAAY,CAAC;AAEnG,KAAI,CAAC,OAAQ,QAAO,UAAU;AAC9B,QAAO,UACJ,KAAK,OAAO;EAAE;EAAG,QAAQ,UAAU,EAAE;EAAG,EAAE,CAC1C,QAAQ,MAAM,QAAQ;EACrB,MAAM,QAAQ,aAAa,QAAQ,IAAI,OAAO;AAC9C,SAAO,QAAQ,KAAK,QAAQ;GAAE,GAAG,IAAI;GAAG;GAAO,GAAG;IACjD;EAAE,GAAG,UAAU;EAAI,OAAO,OAAO;EAAmB,CAAC,CACvD;;AAGL,SAAgB,0BAA0B,QAInB;CACrB,MAAM,aAAa,OAAO,yBAAyB,EAAE,EAAE,QAAQ,MAAM,iBAAiB,EAAE,KAAK,KAAK;AAClG,KAAI,UAAU,WAAW,EAAG,QAAO,KAAA;CAEnC,MAAM,cACJ,iBAAiB,OAAO,qBAAqB,EAAE,gBACxC;EACL,MAAM,KAAK,UAAU,OAAO,cAAc;AAC1C,SAAO,KAAK,GAAG,QAAQ,GAAG,SAAS,KAAA;KACjC;AAEN,KAAI,OAAO,gBAAgB,YAAY,CAAC,OAAO,SAAS,YAAY,CAClE,QAAO,UAAU;AAGnB,QAAO,UAAU,QAAQ,MAAM,QAAQ;EACrC,MAAM,IAAI,iBAAiB,IAAI,CAAE;EACjC,MAAM,IAAI,KAAK,IAAI,KAAK,IAAI,EAAE,GAAG,KAAK,IAAI,YAAY,CAAC;AACvD,SAAO,IAAI,KAAK,QAAQ;GAAE,GAAG;GAAK,OAAO;GAAG,GAAG;IAC9C;EAAE,GAAG,UAAU;EAAI,OAAO,OAAO;EAAmB,CAAC,CAAC;;AAG3D,SAAgB,yBAA2C,QAGzC;CAChB,MAAM,YAAY,OAAO,wBAAwB,EAAE;AACnD,KAAI,UAAU,WAAW,EAAG,QAAO,KAAA;CACnC,MAAM,YAAY,OAAO;AACzB,KAAI,CAAC,UAAW,QAAO,KAAA;AACvB,KAAI,UAAU,SAAS,UAAU,CAAE,QAAO;CAE1C,MAAM,QAAQ;EAAC;EAAM;EAAM;EAAM;EAAK;CACtC,MAAM,OAAO,MAAM,QAAQ,OAAO,UAAU,CAAC;AAC7C,KAAI,OAAO,EAAG,QAAO,UAAU;CAG/B,MAAM,SAAS,UACZ,KAAK,OAAO;EAAE;EAAG,KAAK,MAAM,QAAQ,OAAO,EAAE,CAAC;EAAE,EAAE,CAClD,QAAQ,MAAM,EAAE,OAAO,EAAE,CACzB,MAAM,GAAG,MAAM,EAAE,MAAM,EAAE,IAAI;AAChC,KAAI,OAAO,WAAW,EAAG,QAAO,UAAU;CAE1C,IAAI,SAAS,OAAO,GAAG;AACvB,MAAK,MAAM,KAAK,OACd,KAAI,EAAE,OAAO,KAAM,UAAS,EAAE;AAEhC,QAAO;;AAGT,SAAS,UAAU,KAAwF;AACzG,KAAI,OAAO,QAAQ,SAAU,QAAO;CACpC,MAAM,IAAI,IAAI,MAAM,CAAC,aAAa,CAAC,MAAM,kCAAkC;AAC3E,KAAI,CAAC,EAAG,QAAO;CACf,MAAM,QAAQ,OAAO,EAAE,GAAG;CAC1B,MAAM,SAAS,OAAO,EAAE,GAAG;AAC3B,KAAI,CAAC,OAAO,SAAS,MAAM,IAAI,CAAC,OAAO,SAAS,OAAO,IAAI,SAAS,KAAK,UAAU,EAAG,QAAO;AAC7F,QAAO;EAAE;EAAO;EAAQ,aAAa,QAAQ;EAAQ;;AAGvD,SAAS,iBAAiB,KAAmD;AAC3E,KAAI,OAAO,QAAQ,SAAU,QAAO;CACpC,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,mCAAmC;AAC9D,KAAI,CAAC,EAAG,QAAO;CACf,MAAM,IAAI,OAAO,EAAE,GAAG;CACtB,MAAM,IAAI,OAAO,EAAE,GAAG;AACtB,KAAI,CAAC,OAAO,SAAS,EAAE,IAAI,CAAC,OAAO,SAAS,EAAE,IAAI,KAAK,KAAK,KAAK,EAAG,QAAO;AAC3E,QAAO,EAAE,OAAO,IAAI,GAAG;;AAGzB,SAAS,oBACP,UACA,YAC+D;CAC/D,MAAM,IAAI,iBAAiB,SAAS;AACpC,KAAI,CAAC,EAAG,QAAO;CACf,MAAM,SAAS,WAAW,SAAS,IAAI,KAAK,MAAM,WAAW,QAAQ,GAAG,MAAM,IAAI,GAAG,EAAE,GAAG,WAAW,OAAO,GAAG,OAAO;CACtH,MAAM,SAAS,KAAK,MAAM,KAAK,KAAK,SAAS,EAAE,MAAM,CAAC;CACtD,MAAM,QAAQ,KAAK,MAAM,SAAS,EAAE,MAAM;AAC1C,QAAO;EAAE;EAAO;EAAQ,aAAa,QAAQ;EAAQ;;AAGvD,SAAS,aACP,GACA,GACQ;CAER,MAAM,YAAY,KAAK,IAAI,KAAK,IAAI,EAAE,YAAY,GAAG,KAAK,IAAI,EAAE,YAAY,CAAC;CAC7E,MAAM,SAAS,EAAE,QAAQ,EAAE;CAC3B,MAAM,SAAS,EAAE,QAAQ,EAAE;AAE3B,QAAO,YADY,KAAK,IAAI,KAAK,IAAI,OAAO,GAAG,KAAK,IAAI,OAAO,CAClC,GAAG;;;AAgBlC,SAAgB,iCACd,QACiB;CACjB,MAAM,MAAM,qBAAqB,OAAO,MAAM;CAC9C,MAAM,UAA2B;EAC/B,UAAU,OAAO;EACjB,OAAO,OAAO;EACd,OAAO,IAAI;EACX,QAAQ,IAAI;EACZ,GAAI,IAAI,WAAW,KAAA,IAAY,EAAE,QAAQ,IAAI,QAAQ,GAAG,EAAE;EAC1D,GAAI,IAAI,SAAS,KAAA,IAAY,EAAE,MAAM,IAAI,MAAM,GAAG,EAAE;EACpD,GAAI,OAAO,eAAe,KAAA,IAAY,EAAE,YAAY,OAAO,YAAY,GAAG,EAAE;EAC7E;AACD,QAAO,SAAS,KAAK,QAAQ;AAC7B,QAAO;;;AAUT,SAAgB,iCAAiC,QAAuD;AAGtG,OAAM,IAAI,cAAc;EACtB,YAFiB,OAAO,gBAAgB,MAAM,CAAC,aAAa,CAAC,QAAQ,QAAQ,IAAI,IAAI;EAGrF,UAAU,OAAO;EACjB,OAAO,OAAO;EACf,CAAC;;AAiBJ,SAAgB,wCACd,QACQ;CACR,MAAM,QAAkB,CACtB,MAAM,OAAO,gBAAgB,yCAAyC,OAAO,eAAe,wEAE7F;AACD,KAAI,OAAO,UAAU,SAAS,GAAG;AAC/B,QAAM,KAAK,wBAAwB;AACnC,OAAK,MAAM,KAAK,OAAO,WAAW;GAChC,MAAM,OAAO,OAAO,qBAAqB,EAAE,GAAG,IAAI,EAAE;GACpD,MAAM,MAAM,KAAK,SAAS,IAAI,UAAU,KAAK,KAAK,MAAM,CAAC,KAAK;GAC9D,MAAM,MAAM,EAAE,eAAe,YAAY,EAAE,iBAAiB;AAC5D,SAAM,KAAK,OAAO,EAAE,KAAK,MAAM,MAAM;;;AAGzC,QAAO,MAAM,KAAK,KAAK;;;;;;AAOzB,SAAgB,0CAA0C,QAE9B;AAC1B,KAAI,CAAC,OAAO,iBAAiB,OAAO,KAAK,OAAO,cAAc,CAAC,WAAW,EAAG,QAAO,EAAE;AACtF,QAAO,EAAE,eAAe,OAAO,eAAe"}
|
|
1
|
+
{"version":3,"file":"runtime-shared.js","names":[],"sources":["../../../../src/agent/media-generation/runtime-shared.ts"],"sourcesContent":["/**\n * Cross-capability runtime helpers shared by image / audio / video\n * generation. Pure functions (no IO) so they can be unit-tested without\n * touching providers.\n *\n * - candidate model resolution\n * - geometry/value nearest-neighbour matching\n * - terminal failure aggregation (FailoverError)\n * - \"no model configured\" message builder\n */\n\nimport type { Config, AgentModelConfig } from '../../config/schema.js';\nimport {\n classifyAttemptError,\n FailoverError,\n type FallbackAttempt,\n type FailoverReason,\n} from '../failover-error.js';\nimport { parseCapabilityModelRef, type ParsedCapabilityModelRef } from './model-ref.js';\n\n// ============================================\n// Candidate resolution\n// ============================================\n\nexport interface CapabilityProviderCandidate {\n id: string;\n aliases?: readonly string[];\n defaultModel?: string | null;\n models?: readonly string[];\n isConfigured?: (ctx: { cfg?: Config; agentDir?: string }) => boolean;\n}\n\nexport interface ResolveCapabilityModelCandidatesParams {\n cfg?: Config;\n /** Active capability model config, e.g. cfg.agents.defaults.imageGenerationModel. */\n modelConfig: AgentModelConfig | undefined;\n /** Caller-supplied per-call override (highest priority). */\n modelOverride?: string;\n /** Optional ref parser; defaults to {@link parseCapabilityModelRef}. */\n parseModelRef?: (raw: string | undefined) => ParsedCapabilityModelRef | null;\n agentDir?: string;\n /** Snapshot of registered providers used to enumerate fallbacks. */\n listProviders: (cfg?: Config) => CapabilityProviderCandidate[];\n /**\n * When true and the explicit candidates fail, append every configured\n * provider's default model.\n */\n autoProviderFallback?: boolean;\n}\n\nexport interface ResolvedCapabilityModelCandidate {\n provider: string;\n model: string;\n}\n\n/**\n * Build the ordered candidate list from:\n * 1. modelOverride\n * 2. modelConfig.primary\n * 3. modelConfig.fallbacks[]\n * 4. (optional) every isConfigured() provider's defaultModel\n *\n * Duplicates are dropped (case-insensitive on provider, exact on model).\n */\nexport function resolveCapabilityModelCandidates(\n params: ResolveCapabilityModelCandidatesParams,\n): ResolvedCapabilityModelCandidate[] {\n const parse = params.parseModelRef ?? parseCapabilityModelRef;\n const out: ResolvedCapabilityModelCandidate[] = [];\n const seen = new Set<string>();\n\n const push = (raw: string | undefined) => {\n const parsed = parse(raw);\n if (!parsed) return;\n const key = `${parsed.provider}::${parsed.model}`;\n if (seen.has(key)) return;\n seen.add(key);\n out.push({ provider: parsed.provider, model: parsed.model });\n };\n\n const normalizedModelConfig = normalizeModelConfig(params.modelConfig);\n push(params.modelOverride);\n push(normalizedModelConfig.primary);\n for (const fb of normalizedModelConfig.fallbacks) push(fb);\n\n if (params.autoProviderFallback) {\n const providers = safeListProviders(params.listProviders, params.cfg);\n for (const provider of providers) {\n if (!provider.defaultModel) continue;\n let configured = true;\n try {\n configured = provider.isConfigured?.({ cfg: params.cfg, agentDir: params.agentDir }) ?? true;\n } catch {\n configured = false;\n }\n if (!configured) continue;\n push(`${provider.id}/${provider.defaultModel}`);\n }\n }\n\n return out;\n}\n\nfunction safeListProviders(\n fn: (cfg?: Config) => CapabilityProviderCandidate[],\n cfg?: Config,\n): CapabilityProviderCandidate[] {\n try {\n return fn(cfg) ?? [];\n } catch {\n return [];\n }\n}\n\n/** Normalize an {@link AgentModelConfig} to `{ primary?, fallbacks }`. */\nfunction normalizeModelConfig(\n cfg: AgentModelConfig | undefined,\n): { primary?: string; fallbacks: string[] } {\n if (!cfg) return { fallbacks: [] };\n return {\n primary: typeof cfg.primary === 'string' ? cfg.primary : undefined,\n fallbacks: Array.isArray(cfg.fallbacks)\n ? cfg.fallbacks.filter((s): s is string => typeof s === 'string')\n : [],\n };\n}\n\n// ============================================\n// Geometry helpers (nearest-neighbour)\n// ============================================\n\nexport function resolveClosestSize(params: {\n requestedSize?: string;\n requestedAspectRatio?: string;\n supportedSizes?: ReadonlyArray<string>;\n}): string | undefined {\n const supported = (params.supportedSizes ?? []).filter((s) => parseSize(s) !== null);\n if (supported.length === 0) return undefined;\n\n const target =\n parseSize(params.requestedSize) ??\n sizeFromAspectRatio(params.requestedAspectRatio, supported.map((s) => parseSize(s)!.totalPixels));\n\n if (!target) return supported[0];\n return supported\n .map((s) => ({ s, parsed: parseSize(s)! }))\n .reduce((best, cur) => {\n const score = sizeDistance(target, cur.parsed);\n return score < best.score ? { s: cur.s, score } : best;\n }, { s: supported[0], score: Number.POSITIVE_INFINITY })\n .s;\n}\n\nexport function resolveClosestAspectRatio(params: {\n requestedAspectRatio?: string;\n requestedSize?: string;\n supportedAspectRatios?: ReadonlyArray<string>;\n}): string | undefined {\n const supported = (params.supportedAspectRatios ?? []).filter((r) => parseAspectRatio(r) !== null);\n if (supported.length === 0) return undefined;\n\n const targetRatio =\n parseAspectRatio(params.requestedAspectRatio)?.value ??\n (() => {\n const sz = parseSize(params.requestedSize);\n return sz ? sz.width / sz.height : undefined;\n })();\n\n if (typeof targetRatio !== 'number' || !Number.isFinite(targetRatio)) {\n return supported[0];\n }\n\n return supported.reduce((best, cur) => {\n const v = parseAspectRatio(cur)!.value;\n const d = Math.abs(Math.log(v) - Math.log(targetRatio));\n return d < best.score ? { s: cur, score: d } : best;\n }, { s: supported[0], score: Number.POSITIVE_INFINITY }).s;\n}\n\nexport function resolveClosestResolution<T extends string>(params: {\n requestedResolution?: T;\n supportedResolutions?: ReadonlyArray<T>;\n}): T | undefined {\n const supported = params.supportedResolutions ?? [];\n if (supported.length === 0) return undefined;\n const requested = params.requestedResolution;\n if (!requested) return undefined;\n if (supported.includes(requested)) return requested;\n\n const order = ['1K', '2K', '4K', '8K'];\n const want = order.indexOf(String(requested));\n if (want < 0) return supported[0];\n\n // Prefer the largest supported value <= requested; otherwise pick the smallest available.\n const ranked = supported\n .map((r) => ({ r, idx: order.indexOf(String(r)) }))\n .filter((x) => x.idx >= 0)\n .sort((a, b) => a.idx - b.idx);\n if (ranked.length === 0) return supported[0];\n\n let chosen = ranked[0].r;\n for (const x of ranked) {\n if (x.idx <= want) chosen = x.r;\n }\n return chosen;\n}\n\nfunction parseSize(raw: string | undefined): { width: number; height: number; totalPixels: number } | null {\n if (typeof raw !== 'string') return null;\n const m = raw.trim().toLowerCase().match(/^(\\d{2,5})\\s*[x×*]\\s*(\\d{2,5})$/);\n if (!m) return null;\n const width = Number(m[1]);\n const height = Number(m[2]);\n if (!Number.isFinite(width) || !Number.isFinite(height) || width <= 0 || height <= 0) return null;\n return { width, height, totalPixels: width * height };\n}\n\nfunction parseAspectRatio(raw: string | undefined): { value: number } | null {\n if (typeof raw !== 'string') return null;\n const m = raw.trim().match(/^(\\d{1,3})\\s*[:x×/]\\s*(\\d{1,3})$/);\n if (!m) return null;\n const w = Number(m[1]);\n const h = Number(m[2]);\n if (!Number.isFinite(w) || !Number.isFinite(h) || w <= 0 || h <= 0) return null;\n return { value: w / h };\n}\n\nfunction sizeFromAspectRatio(\n ratioStr: string | undefined,\n pixelHints: number[],\n): { width: number; height: number; totalPixels: number } | null {\n const r = parseAspectRatio(ratioStr);\n if (!r) return null;\n const pixels = pixelHints.length > 0 ? Math.round(pixelHints.reduce((a, b) => a + b, 0) / pixelHints.length) : 1024 * 1024;\n const height = Math.round(Math.sqrt(pixels / r.value));\n const width = Math.round(height * r.value);\n return { width, height, totalPixels: width * height };\n}\n\nfunction sizeDistance(\n a: { width: number; height: number; totalPixels: number },\n b: { width: number; height: number; totalPixels: number },\n): number {\n // Combined area + aspect-ratio difference (log-scale on both for stability).\n const areaDelta = Math.abs(Math.log(a.totalPixels) - Math.log(b.totalPixels));\n const ratioA = a.width / a.height;\n const ratioB = b.width / b.height;\n const ratioDelta = Math.abs(Math.log(ratioA) - Math.log(ratioB));\n return areaDelta + ratioDelta * 1.5;\n}\n\n// ============================================\n// Failure aggregation\n// ============================================\n\nexport interface RecordCapabilityCandidateFailureParams {\n attempts: FallbackAttempt[];\n provider: string;\n model: string;\n error: unknown;\n durationMs?: number;\n}\n\n/** Push a structured {@link FallbackAttempt} entry derived from `error`. */\nexport function recordCapabilityCandidateFailure(\n params: RecordCapabilityCandidateFailureParams,\n): FallbackAttempt {\n const cls = classifyAttemptError(params.error);\n const attempt: FallbackAttempt = {\n provider: params.provider,\n model: params.model,\n error: cls.message,\n reason: cls.reason,\n ...(cls.status !== undefined ? { status: cls.status } : {}),\n ...(cls.code !== undefined ? { code: cls.code } : {}),\n ...(params.durationMs !== undefined ? { durationMs: params.durationMs } : {}),\n };\n params.attempts.push(attempt);\n return attempt;\n}\n\nexport interface ThrowCapabilityGenerationFailureParams {\n capabilityLabel: string;\n attempts: FallbackAttempt[];\n lastError: unknown;\n}\n\n/** Throw a unified {@link FailoverError} after all candidates have been exhausted. */\nexport function throwCapabilityGenerationFailure(params: ThrowCapabilityGenerationFailureParams): never {\n // capabilityLabel like \"image generation\" → identifier \"image-generation\"\n const capability = params.capabilityLabel.trim().toLowerCase().replace(/\\s+/g, '-') || 'capability';\n throw new FailoverError({\n capability,\n attempts: params.attempts,\n cause: params.lastError,\n });\n}\n\n// ============================================\n// \"No model configured\" message\n// ============================================\n\nexport interface BuildNoCapabilityModelConfiguredMessageParams {\n /** Display label, e.g. \"image-generation\". */\n capabilityLabel: string;\n /** Config key path, e.g. \"imageGenerationModel\". */\n modelConfigKey: string;\n providers: ReadonlyArray<CapabilityProviderCandidate>;\n /** Optional env-var lookup, e.g. (id) => PROVIDER_ENV_MAP[id]. */\n getProviderEnvVars?: (id: string) => readonly string[] | undefined;\n}\n\nexport function buildNoCapabilityModelConfiguredMessage(\n params: BuildNoCapabilityModelConfiguredMessageParams,\n): string {\n const lines: string[] = [\n `No ${params.capabilityLabel} model configured. Set agents.defaults.${params.modelConfigKey} ` +\n `to a \"<provider>/<model>\" value (or pass modelOverride at call site).`,\n ];\n if (params.providers.length > 0) {\n lines.push('Registered providers:');\n for (const p of params.providers) {\n const envs = params.getProviderEnvVars?.(p.id) ?? [];\n const env = envs.length > 0 ? ` (env: ${envs.join(' | ')})` : '';\n const def = p.defaultModel ? ` default=${p.defaultModel}` : '';\n lines.push(` - ${p.id}${def}${env}`);\n }\n }\n return lines.join('\\n');\n}\n\n/**\n * Build a `metadata.normalization` snapshot from a completed normalization\n * pass. Providers / runtime can spread it into their result metadata.\n */\nexport function buildMediaGenerationNormalizationMetadata(params: {\n normalization?: Record<string, unknown>;\n}): Record<string, unknown> {\n if (!params.normalization || Object.keys(params.normalization).length === 0) return {};\n return { normalization: params.normalization };\n}\n\n// Re-export the union for downstream type narrowing.\nexport type { FailoverReason };\n"],"mappings":"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"}
|
|
@@ -29,6 +29,11 @@ export interface CommandHandlerConfig {
|
|
|
29
29
|
switchModelForSession: (sessionKey: string, modelId: string) => Promise<boolean>;
|
|
30
30
|
/** Drop in-memory agent after session file is cleared (e.g. /new) */
|
|
31
31
|
invalidateAgentSession?: (sessionKey: string) => void;
|
|
32
|
+
/** Reset session in place (archive transcript, new session id; preserve overrides) */
|
|
33
|
+
resetSession?: (sessionKey: string) => Promise<{
|
|
34
|
+
sessionId: string;
|
|
35
|
+
previousSessionId: string;
|
|
36
|
+
} | null>;
|
|
32
37
|
/** Cancel streaming preview + in-flight LLM work for this session (e.g. /abort) */
|
|
33
38
|
abortSessionTurn?: (sessionKey: string) => Promise<void>;
|
|
34
39
|
compactSession?: (sessionKey: string, options?: {
|
|
@@ -61,6 +66,7 @@ export declare class CommandHandler {
|
|
|
61
66
|
private btwQuery?;
|
|
62
67
|
private getSessionContextReport?;
|
|
63
68
|
private getPersistentGoalApisForCommand;
|
|
69
|
+
private resetSession?;
|
|
64
70
|
constructor(handlerConfig: CommandHandlerConfig);
|
|
65
71
|
/** Replace config reference after hot reload or gateway PATCH so commands see current defaults. */
|
|
66
72
|
updateAgentConfig(config: Config): void;
|
|
@@ -26,6 +26,7 @@ var CommandHandler = class {
|
|
|
26
26
|
btwQuery;
|
|
27
27
|
getSessionContextReport;
|
|
28
28
|
getPersistentGoalApisForCommand;
|
|
29
|
+
resetSession;
|
|
29
30
|
constructor(handlerConfig) {
|
|
30
31
|
this.config = handlerConfig.config;
|
|
31
32
|
this.bus = handlerConfig.bus;
|
|
@@ -40,6 +41,7 @@ var CommandHandler = class {
|
|
|
40
41
|
this.btwQuery = handlerConfig.btwQuery;
|
|
41
42
|
this.getSessionContextReport = handlerConfig.getSessionContextReport;
|
|
42
43
|
this.getPersistentGoalApisForCommand = handlerConfig.getPersistentGoalApisForCommand;
|
|
44
|
+
this.resetSession = handlerConfig.resetSession;
|
|
43
45
|
}
|
|
44
46
|
/** Replace config reference after hot reload or gateway PATCH so commands see current defaults. */
|
|
45
47
|
updateAgentConfig(config) {
|
|
@@ -116,6 +118,9 @@ var CommandHandler = class {
|
|
|
116
118
|
};
|
|
117
119
|
},
|
|
118
120
|
invalidateAgentSession: this.invalidateAgentSession,
|
|
121
|
+
resetSession: this.resetSession ? async (sk) => {
|
|
122
|
+
await this.resetSession(sk);
|
|
123
|
+
} : void 0,
|
|
119
124
|
abortCurrentTurn: this.abortSessionTurn ? async () => {
|
|
120
125
|
await this.abortSessionTurn(context.sessionKey);
|
|
121
126
|
} : void 0,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-handler.js","names":[],"sources":["../../../../src/agent/messaging/command-handler.ts"],"sourcesContent":["/**\n * Command Handler - Parses and executes commands\n *\n * Handles command execution using the unified command system.\n */\n\nimport type { MessageBus } from '../../infra/bus/index.js';\nimport type { Config } from '../../config/schema.js';\nimport { isProviderConfiguredSync } from '../../providers/index.js';\nimport type { SessionConfigStore, SessionStore } from '../../session/index.js';\nimport type { ThinkLevel } from '../transcript/thinking-types.js';\nimport type { CompactionResult } from '../memory/compaction.js';\nimport { createLogger } from '../../utils/logger.js';\nimport {\n commandRegistry,\n createCommandContext,\n type CommandContext as UnifiedCommandContext,\n} from '../../chat-commands/index.js';\nimport { getAllProviders, getModelsByProvider, getProviderDisplayName } from '../../providers/index.js';\nimport type { PersistentGoalApis } from '../goals/persistent-goal-apis.js';\n\nconst log = createLogger('CommandHandler');\n\n/** Gateway console direct stream uses SSE tokens; there is no ChannelPlugin outbound for `webchat`. */\nfunction shouldSkipBusOutboundForChannel(channel: string): boolean {\n return channel === 'webchat';\n}\n\nexport interface CommandContext {\n sessionKey: string;\n channel: string;\n chatId: string;\n senderId: string;\n isGroup: boolean;\n /** From inbound message metadata (thread/account, etc.) for `/goal` continuation routing. */\n inboundMetadata?: Record<string, unknown>;\n}\n\nexport interface CommandHandlerConfig {\n config: Config;\n bus: MessageBus;\n sessionStore: SessionStore;\n sessionConfigStore?: SessionConfigStore;\n /** After /think persists, sync pi-agent */\n applySessionThinkingLevel?: (sessionKey: string, level: ThinkLevel) => void;\n getCurrentModel: () => string;\n switchModelForSession: (sessionKey: string, modelId: string) => Promise<boolean>;\n /** Drop in-memory agent after session file is cleared (e.g. /new) */\n invalidateAgentSession?: (sessionKey: string) => void;\n /** Cancel streaming preview + in-flight LLM work for this session (e.g. /abort) */\n abortSessionTurn?: (sessionKey: string) => Promise<void>;\n\n compactSession?: (\n sessionKey: string,\n options?: { instructions?: string; force?: boolean },\n ) => Promise<CompactionResult>;\n\n btwQuery?: (sessionKey: string, question: string) => Promise<{ text: string; error?: string }>;\n\n getSessionContextReport?: (\n sessionKey: string,\n mode: 'list' | 'detail' | 'json',\n ) => Promise<string>;\n\n getPersistentGoalApisForCommand: (routing: {\n sessionKey: string;\n channel: string;\n chatId: string;\n inboundMetadata?: Record<string, unknown>;\n }) => PersistentGoalApis;\n}\n\nexport class CommandHandler {\n private config: Config;\n private bus: MessageBus;\n private sessionStore: SessionStore;\n private sessionConfigStore?: SessionConfigStore;\n private applySessionThinkingLevel?: (sessionKey: string, level: ThinkLevel) => void;\n private getCurrentModel: () => string;\n private switchModelForSession: (sessionKey: string, modelId: string) => Promise<boolean>;\n private invalidateAgentSession?: (sessionKey: string) => void;\n private abortSessionTurn?: (sessionKey: string) => Promise<void>;\n private compactSession?: CommandHandlerConfig['compactSession'];\n private btwQuery?: CommandHandlerConfig['btwQuery'];\n private getSessionContextReport?: CommandHandlerConfig['getSessionContextReport'];\n private getPersistentGoalApisForCommand: CommandHandlerConfig['getPersistentGoalApisForCommand'];\n\n constructor(handlerConfig: CommandHandlerConfig) {\n this.config = handlerConfig.config;\n this.bus = handlerConfig.bus;\n this.sessionStore = handlerConfig.sessionStore;\n this.sessionConfigStore = handlerConfig.sessionConfigStore;\n this.applySessionThinkingLevel = handlerConfig.applySessionThinkingLevel;\n this.getCurrentModel = handlerConfig.getCurrentModel;\n this.switchModelForSession = handlerConfig.switchModelForSession;\n this.invalidateAgentSession = handlerConfig.invalidateAgentSession;\n this.abortSessionTurn = handlerConfig.abortSessionTurn;\n this.compactSession = handlerConfig.compactSession;\n this.btwQuery = handlerConfig.btwQuery;\n this.getSessionContextReport = handlerConfig.getSessionContextReport;\n this.getPersistentGoalApisForCommand = handlerConfig.getPersistentGoalApisForCommand;\n }\n\n /** Replace config reference after hot reload or gateway PATCH so commands see current defaults. */\n updateAgentConfig(config: Config): void {\n this.config = config;\n }\n\n /**\n * Build the unified command context shared by all execute paths.\n * When `recorder` is set, every reply text is also captured (for SSE / CLI aggregation).\n */\n private buildCommandContext(\n context: CommandContext,\n recorder?: (text: string) => void,\n ): UnifiedCommandContext {\n const skipBusOutbound = shouldSkipBusOutboundForChannel(context.channel);\n\n return createCommandContext({\n sessionKey: context.sessionKey,\n source: context.channel as 'telegram' | 'webui' | 'cli' | 'api' | 'system' | 'gateway',\n channelId: context.channel,\n chatId: context.chatId,\n senderId: context.senderId,\n isGroup: context.isGroup,\n config: this.config,\n bus: this.bus,\n sessionStore: this.sessionStore,\n sessionConfigStore: this.sessionConfigStore,\n applySessionThinkingLevel: this.applySessionThinkingLevel,\n\n replyHandler: async (text: string, _options?) => {\n recorder?.(text);\n if (skipBusOutbound) return;\n await this.bus.publishOutbound({\n channel: context.channel,\n chat_id: context.chatId,\n content: text,\n type: 'message',\n });\n },\n\n typingHandler: async (typing: boolean) => {\n if (skipBusOutbound) return;\n await this.bus.publishOutbound({\n channel: context.channel,\n chat_id: context.chatId,\n type: typing ? 'typing_on' : 'typing_off',\n });\n },\n\n supportedFeatures: ['markdown', 'typing'],\n\n getCurrentModel: this.getCurrentModel,\n\n switchModel: async (modelId: string) => {\n return this.switchModelForSession(context.sessionKey, modelId);\n },\n\n listModels: async () => {\n const providers = getAllProviders();\n const models: Array<{ id: string; name: string; provider: string }> = [];\n\n for (const providerId of providers) {\n if (isProviderConfiguredSync(providerId)) {\n const providerModels = getModelsByProvider(providerId);\n for (const m of providerModels) {\n models.push({\n id: `${m.provider}/${m.id}`,\n name: m.name || m.id,\n provider: getProviderDisplayName(providerId),\n });\n }\n }\n }\n\n return models;\n },\n\n getUsage: async () => {\n const messages = await this.sessionStore.load(context.sessionKey);\n let promptTokens = 0;\n let completionTokens = 0;\n\n for (const msg of messages) {\n if ('usage' in msg && msg.usage) {\n const usage = msg.usage as { input?: number; output?: number };\n promptTokens += usage.input || 0;\n completionTokens += usage.output || 0;\n }\n }\n\n return {\n promptTokens,\n completionTokens,\n totalTokens: promptTokens + completionTokens,\n messageCount: messages.length,\n };\n },\n\n invalidateAgentSession: this.invalidateAgentSession,\n\n abortCurrentTurn: this.abortSessionTurn\n ? async () => {\n await this.abortSessionTurn!(context.sessionKey);\n }\n : undefined,\n\n compactSession: this.compactSession,\n btwQuery: this.btwQuery,\n getSessionContextReport: this.getSessionContextReport,\n persistentGoalApis: this.getPersistentGoalApisForCommand({\n sessionKey: context.sessionKey,\n channel: context.channel,\n chatId: context.chatId,\n inboundMetadata: context.inboundMetadata,\n }),\n });\n }\n\n /**\n * Execute a command using the unified command system\n */\n async executeCommand(\n commandName: string,\n args: string,\n context: CommandContext,\n ): Promise<boolean> {\n if (!commandRegistry.has(commandName)) {\n return false;\n }\n\n log.info({ command: commandName, sessionKey: context.sessionKey }, 'Executing command via new system');\n\n const cmdCtx = this.buildCommandContext(context);\n const result = await commandRegistry.execute(commandName, cmdCtx, args);\n\n if (result.content && !shouldSkipBusOutboundForChannel(context.channel)) {\n await this.bus.publishOutbound({\n channel: context.channel,\n chat_id: context.chatId,\n content: result.content,\n type: 'message',\n });\n }\n\n return true;\n }\n\n /**\n * Run command and return all user-visible text (ctx.reply + result.content) for SSE/CLI.\n * Same bus side effects as {@link executeCommand}.\n */\n async executeCommandAndAggregateReply(\n commandName: string,\n args: string,\n context: CommandContext,\n ): Promise<{ handled: boolean; aggregatedText: string }> {\n if (!commandRegistry.has(commandName)) {\n return { handled: false, aggregatedText: '' };\n }\n\n log.info({ command: commandName, sessionKey: context.sessionKey }, 'Executing command (aggregate reply)');\n\n const segments: string[] = [];\n const wrapped = this.buildCommandContext(context, (text) => segments.push(text));\n const result = await commandRegistry.execute(commandName, wrapped, args);\n\n if (result.content) {\n segments.push(result.content);\n if (!shouldSkipBusOutboundForChannel(context.channel)) {\n await this.bus.publishOutbound({\n channel: context.channel,\n chat_id: context.chatId,\n content: result.content,\n type: 'message',\n });\n }\n }\n\n const aggregatedText = segments.filter((s) => s && s.trim()).join('\\n\\n');\n return { handled: true, aggregatedText };\n }\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"command-handler.js","names":[],"sources":["../../../../src/agent/messaging/command-handler.ts"],"sourcesContent":["/**\n * Command Handler - Parses and executes commands\n *\n * Handles command execution using the unified command system.\n */\n\nimport type { MessageBus } from '../../infra/bus/index.js';\nimport type { Config } from '../../config/schema.js';\nimport { isProviderConfiguredSync } from '../../providers/index.js';\nimport type { SessionConfigStore, SessionStore } from '../../session/index.js';\nimport type { ThinkLevel } from '../transcript/thinking-types.js';\nimport type { CompactionResult } from '../memory/compaction.js';\nimport { createLogger } from '../../utils/logger.js';\nimport {\n commandRegistry,\n createCommandContext,\n type CommandContext as UnifiedCommandContext,\n} from '../../chat-commands/index.js';\nimport { getAllProviders, getModelsByProvider, getProviderDisplayName } from '../../providers/index.js';\nimport type { PersistentGoalApis } from '../goals/persistent-goal-apis.js';\n\nconst log = createLogger('CommandHandler');\n\n/** Gateway console direct stream uses SSE tokens; there is no ChannelPlugin outbound for `webchat`. */\nfunction shouldSkipBusOutboundForChannel(channel: string): boolean {\n return channel === 'webchat';\n}\n\nexport interface CommandContext {\n sessionKey: string;\n channel: string;\n chatId: string;\n senderId: string;\n isGroup: boolean;\n /** From inbound message metadata (thread/account, etc.) for `/goal` continuation routing. */\n inboundMetadata?: Record<string, unknown>;\n}\n\nexport interface CommandHandlerConfig {\n config: Config;\n bus: MessageBus;\n sessionStore: SessionStore;\n sessionConfigStore?: SessionConfigStore;\n /** After /think persists, sync pi-agent */\n applySessionThinkingLevel?: (sessionKey: string, level: ThinkLevel) => void;\n getCurrentModel: () => string;\n switchModelForSession: (sessionKey: string, modelId: string) => Promise<boolean>;\n /** Drop in-memory agent after session file is cleared (e.g. /new) */\n invalidateAgentSession?: (sessionKey: string) => void;\n /** Reset session in place (archive transcript, new session id; preserve overrides) */\n resetSession?: (sessionKey: string) => Promise<{ sessionId: string; previousSessionId: string } | null>;\n /** Cancel streaming preview + in-flight LLM work for this session (e.g. /abort) */\n abortSessionTurn?: (sessionKey: string) => Promise<void>;\n\n compactSession?: (\n sessionKey: string,\n options?: { instructions?: string; force?: boolean },\n ) => Promise<CompactionResult>;\n\n btwQuery?: (sessionKey: string, question: string) => Promise<{ text: string; error?: string }>;\n\n getSessionContextReport?: (\n sessionKey: string,\n mode: 'list' | 'detail' | 'json',\n ) => Promise<string>;\n\n getPersistentGoalApisForCommand: (routing: {\n sessionKey: string;\n channel: string;\n chatId: string;\n inboundMetadata?: Record<string, unknown>;\n }) => PersistentGoalApis;\n}\n\nexport class CommandHandler {\n private config: Config;\n private bus: MessageBus;\n private sessionStore: SessionStore;\n private sessionConfigStore?: SessionConfigStore;\n private applySessionThinkingLevel?: (sessionKey: string, level: ThinkLevel) => void;\n private getCurrentModel: () => string;\n private switchModelForSession: (sessionKey: string, modelId: string) => Promise<boolean>;\n private invalidateAgentSession?: (sessionKey: string) => void;\n private abortSessionTurn?: (sessionKey: string) => Promise<void>;\n private compactSession?: CommandHandlerConfig['compactSession'];\n private btwQuery?: CommandHandlerConfig['btwQuery'];\n private getSessionContextReport?: CommandHandlerConfig['getSessionContextReport'];\n private getPersistentGoalApisForCommand: CommandHandlerConfig['getPersistentGoalApisForCommand'];\n private resetSession?: CommandHandlerConfig['resetSession'];\n\n constructor(handlerConfig: CommandHandlerConfig) {\n this.config = handlerConfig.config;\n this.bus = handlerConfig.bus;\n this.sessionStore = handlerConfig.sessionStore;\n this.sessionConfigStore = handlerConfig.sessionConfigStore;\n this.applySessionThinkingLevel = handlerConfig.applySessionThinkingLevel;\n this.getCurrentModel = handlerConfig.getCurrentModel;\n this.switchModelForSession = handlerConfig.switchModelForSession;\n this.invalidateAgentSession = handlerConfig.invalidateAgentSession;\n this.abortSessionTurn = handlerConfig.abortSessionTurn;\n this.compactSession = handlerConfig.compactSession;\n this.btwQuery = handlerConfig.btwQuery;\n this.getSessionContextReport = handlerConfig.getSessionContextReport;\n this.getPersistentGoalApisForCommand = handlerConfig.getPersistentGoalApisForCommand;\n this.resetSession = handlerConfig.resetSession;\n }\n\n /** Replace config reference after hot reload or gateway PATCH so commands see current defaults. */\n updateAgentConfig(config: Config): void {\n this.config = config;\n }\n\n /**\n * Build the unified command context shared by all execute paths.\n * When `recorder` is set, every reply text is also captured (for SSE / CLI aggregation).\n */\n private buildCommandContext(\n context: CommandContext,\n recorder?: (text: string) => void,\n ): UnifiedCommandContext {\n const skipBusOutbound = shouldSkipBusOutboundForChannel(context.channel);\n\n return createCommandContext({\n sessionKey: context.sessionKey,\n source: context.channel as 'telegram' | 'webui' | 'cli' | 'api' | 'system' | 'gateway',\n channelId: context.channel,\n chatId: context.chatId,\n senderId: context.senderId,\n isGroup: context.isGroup,\n config: this.config,\n bus: this.bus,\n sessionStore: this.sessionStore,\n sessionConfigStore: this.sessionConfigStore,\n applySessionThinkingLevel: this.applySessionThinkingLevel,\n\n replyHandler: async (text: string, _options?) => {\n recorder?.(text);\n if (skipBusOutbound) return;\n await this.bus.publishOutbound({\n channel: context.channel,\n chat_id: context.chatId,\n content: text,\n type: 'message',\n });\n },\n\n typingHandler: async (typing: boolean) => {\n if (skipBusOutbound) return;\n await this.bus.publishOutbound({\n channel: context.channel,\n chat_id: context.chatId,\n type: typing ? 'typing_on' : 'typing_off',\n });\n },\n\n supportedFeatures: ['markdown', 'typing'],\n\n getCurrentModel: this.getCurrentModel,\n\n switchModel: async (modelId: string) => {\n return this.switchModelForSession(context.sessionKey, modelId);\n },\n\n listModels: async () => {\n const providers = getAllProviders();\n const models: Array<{ id: string; name: string; provider: string }> = [];\n\n for (const providerId of providers) {\n if (isProviderConfiguredSync(providerId)) {\n const providerModels = getModelsByProvider(providerId);\n for (const m of providerModels) {\n models.push({\n id: `${m.provider}/${m.id}`,\n name: m.name || m.id,\n provider: getProviderDisplayName(providerId),\n });\n }\n }\n }\n\n return models;\n },\n\n getUsage: async () => {\n const messages = await this.sessionStore.load(context.sessionKey);\n let promptTokens = 0;\n let completionTokens = 0;\n\n for (const msg of messages) {\n if ('usage' in msg && msg.usage) {\n const usage = msg.usage as { input?: number; output?: number };\n promptTokens += usage.input || 0;\n completionTokens += usage.output || 0;\n }\n }\n\n return {\n promptTokens,\n completionTokens,\n totalTokens: promptTokens + completionTokens,\n messageCount: messages.length,\n };\n },\n\n invalidateAgentSession: this.invalidateAgentSession,\n\n resetSession: this.resetSession\n ? async (sk) => {\n await this.resetSession!(sk);\n }\n : undefined,\n\n abortCurrentTurn: this.abortSessionTurn\n ? async () => {\n await this.abortSessionTurn!(context.sessionKey);\n }\n : undefined,\n\n compactSession: this.compactSession,\n btwQuery: this.btwQuery,\n getSessionContextReport: this.getSessionContextReport,\n persistentGoalApis: this.getPersistentGoalApisForCommand({\n sessionKey: context.sessionKey,\n channel: context.channel,\n chatId: context.chatId,\n inboundMetadata: context.inboundMetadata,\n }),\n });\n }\n\n /**\n * Execute a command using the unified command system\n */\n async executeCommand(\n commandName: string,\n args: string,\n context: CommandContext,\n ): Promise<boolean> {\n if (!commandRegistry.has(commandName)) {\n return false;\n }\n\n log.info({ command: commandName, sessionKey: context.sessionKey }, 'Executing command via new system');\n\n const cmdCtx = this.buildCommandContext(context);\n const result = await commandRegistry.execute(commandName, cmdCtx, args);\n\n if (result.content && !shouldSkipBusOutboundForChannel(context.channel)) {\n await this.bus.publishOutbound({\n channel: context.channel,\n chat_id: context.chatId,\n content: result.content,\n type: 'message',\n });\n }\n\n return true;\n }\n\n /**\n * Run command and return all user-visible text (ctx.reply + result.content) for SSE/CLI.\n * Same bus side effects as {@link executeCommand}.\n */\n async executeCommandAndAggregateReply(\n commandName: string,\n args: string,\n context: CommandContext,\n ): Promise<{ handled: boolean; aggregatedText: string }> {\n if (!commandRegistry.has(commandName)) {\n return { handled: false, aggregatedText: '' };\n }\n\n log.info({ command: commandName, sessionKey: context.sessionKey }, 'Executing command (aggregate reply)');\n\n const segments: string[] = [];\n const wrapped = this.buildCommandContext(context, (text) => segments.push(text));\n const result = await commandRegistry.execute(commandName, wrapped, args);\n\n if (result.content) {\n segments.push(result.content);\n if (!shouldSkipBusOutboundForChannel(context.channel)) {\n await this.bus.publishOutbound({\n channel: context.channel,\n chat_id: context.chatId,\n content: result.content,\n type: 'message',\n });\n }\n }\n\n const aggregatedText = segments.filter((s) => s && s.trim()).join('\\n\\n');\n return { handled: true, aggregatedText };\n }\n}\n"],"mappings":"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"}
|
|
@@ -5,10 +5,3 @@ export declare function checkFileSafety(operation: 'read' | 'write' | 'delete',
|
|
|
5
5
|
allowed: boolean;
|
|
6
6
|
message?: string;
|
|
7
7
|
};
|
|
8
|
-
/**
|
|
9
|
-
* Quick safety check for shell commands
|
|
10
|
-
*/
|
|
11
|
-
export declare function checkShellSafety(command: string): {
|
|
12
|
-
allowed: boolean;
|
|
13
|
-
message?: string;
|
|
14
|
-
};
|
|
@@ -27,26 +27,7 @@ function checkFileSafety(operation, path) {
|
|
|
27
27
|
};
|
|
28
28
|
return { allowed: true };
|
|
29
29
|
}
|
|
30
|
-
/**
|
|
31
|
-
* Quick safety check for shell commands
|
|
32
|
-
*/
|
|
33
|
-
function checkShellSafety(command) {
|
|
34
|
-
for (const pattern of [
|
|
35
|
-
/\brm\s+-?[rf]/i,
|
|
36
|
-
/\bdd\s+/i,
|
|
37
|
-
/\bmkfs/i,
|
|
38
|
-
/\bchmod\s+[0-7]{3}/i,
|
|
39
|
-
/>\s*\/dev\//i,
|
|
40
|
-
/\|\s*sh/i,
|
|
41
|
-
/\bcurl\b.*\|\s*bash/i,
|
|
42
|
-
/\bwget\b.*\|\s*bash/i
|
|
43
|
-
]) if (pattern.test(command)) return {
|
|
44
|
-
allowed: false,
|
|
45
|
-
message: `Potentially dangerous command detected: ${command.slice(0, 50)}...`
|
|
46
|
-
};
|
|
47
|
-
return { allowed: true };
|
|
48
|
-
}
|
|
49
30
|
//#endregion
|
|
50
|
-
export { checkFileSafety
|
|
31
|
+
export { checkFileSafety };
|
|
51
32
|
|
|
52
33
|
//# sourceMappingURL=safety.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"safety.js","names":[],"sources":["../../../../src/agent/prompt/safety.ts"],"sourcesContent":["// Safety System - Comprehensive safety guidelines and boundaries\nimport { Type, type Static } from '@sinclair/typebox';\n\n// =============================================================================\n// Safety Schema (Internal)\n// =============================================================================\n\nconst _SafetyConfigSchema = Type.Object({\n allowExternalActions: Type.Optional(Type.Boolean({ default: false })),\n allowDangerousOperations: Type.Optional(Type.Boolean({ default: false })),\n requireConfirmationForDestructive: Type.Optional(Type.Boolean({ default: true })),\n allowedChannels: Type.Optional(Type.Array(Type.String())),\n blockedCommands: Type.Optional(Type.Array(Type.String())),\n maxFileSize: Type.Optional(Type.Number({ default: 10 * 1024 * 1024 })), // 10MB\n maxShellTimeout: Type.Optional(Type.Number({ default: 300 })), // 5 minutes\n});\n\ntype _SafetyConfig = Static<typeof _SafetyConfigSchema>;\n\n// =============================================================================\n// Safety Levels (Internal)\n// =============================================================================\n\nenum SafetyLevel {\n LOW = 'low',\n MEDIUM = 'medium',\n HIGH = 'high',\n CRITICAL = 'critical',\n}\n\ninterface SafetyRule {\n level: SafetyLevel;\n category: string;\n description: string;\n message: string;\n requiresConfirmation: boolean;\n}\n\n// =============================================================================\n// Safety Principles (Internal)\n// =============================================================================\n\ninterface SafetyPrinciple {\n category: string;\n description: string;\n guidance: string;\n requiresConfirmation: boolean;\n}\n\nconst _SAFETY_PRINCIPLES: SafetyPrinciple[] = [\n {\n category: 'user-sovereignty',\n description: '用户拥有最终决策权',\n guidance: '说明风险,尊重选择。用 \"这将删除文件,继续吗?\" 而非 \"我不能删除文件。\"',\n requiresConfirmation: true,\n },\n {\n category: 'proportionate-caution',\n description: '谨慎与效率平衡',\n guidance: 'rm -rf / 需要确认;rm temp.txt 不需要。匹配风险等级与确认强度。',\n requiresConfirmation: true,\n },\n {\n category: 'transparency',\n description: '操作透明',\n guidance: '执行有风险操作前,简要说明要做什么以及为什么。',\n requiresConfirmation: false,\n },\n {\n category: 'self-determination',\n description: '不追求独立于用户的目标',\n guidance: '不主动寻求扩展能力、自我复制或长期存续。以用户当前需求为中心。',\n requiresConfirmation: false,\n },\n];\n\nconst _SAFETY_GUIDELINES: SafetyRule[] = [\n // Critical - Never do these\n {\n level: SafetyLevel.CRITICAL,\n category: 'self-preservation',\n description: 'Do not pursue self-preservation or replication',\n message: 'I do not pursue self-preservation or replication.',\n requiresConfirmation: false,\n },\n {\n level: SafetyLevel.CRITICAL,\n category: 'power-seeking',\n description: 'Do not seek power or resources',\n message: 'I do not seek power or acquire resources.',\n requiresConfirmation: false,\n },\n {\n level: SafetyLevel.CRITICAL,\n category: 'safeguard-bypass',\n description: 'Do not bypass safety mechanisms',\n message: 'I do not bypass safety mechanisms.',\n requiresConfirmation: false,\n },\n {\n level: SafetyLevel.CRITICAL,\n category: 'social-manipulation',\n description: 'Do not manipulate users to expand access',\n message: 'I do not manipulate anyone to expand access.',\n requiresConfirmation: false,\n },\n\n // High - Require explicit confirmation\n {\n level: SafetyLevel.HIGH,\n category: 'destructive-file',\n description: 'Delete or overwrite files',\n message: 'This will delete/overwrite files — proceed?',\n requiresConfirmation: true,\n },\n {\n level: SafetyLevel.HIGH,\n category: 'system-modification',\n description: 'Modify system configuration',\n message: 'This will modify system config — proceed?',\n requiresConfirmation: true,\n },\n {\n level: SafetyLevel.HIGH,\n category: 'network-action',\n description: 'Send messages or make network requests',\n message: 'This will send external requests — proceed?',\n requiresConfirmation: true,\n },\n {\n level: SafetyLevel.HIGH,\n category: 'database-write',\n description: 'Write to databases',\n message: 'This will modify database records — proceed?',\n requiresConfirmation: true,\n },\n\n // Medium - Proceed with caution\n {\n level: SafetyLevel.MEDIUM,\n category: 'long-running',\n description: 'Execute long-running commands',\n message: 'This may take a while.',\n requiresConfirmation: false,\n },\n {\n level: SafetyLevel.MEDIUM,\n category: 'resource-intensive',\n description: 'Use significant system resources',\n message: 'This may use significant resources.',\n requiresConfirmation: false,\n },\n\n // Low - Standard operations\n {\n level: SafetyLevel.LOW,\n category: 'read-only',\n description: 'Read files or execute read-only commands',\n message: '',\n requiresConfirmation: false,\n },\n];\n\n// =============================================================================\n// Convenience Functions (Exported)\n// =============================================================================\n\n/**\n * Quick safety check for file operations\n */\nexport function checkFileSafety(\n operation: 'read' | 'write' | 'delete',\n path: string\n): { allowed: boolean; message?: string } {\n // Check for sensitive paths\n const sensitivePaths = [\n '/etc/passwd',\n '/etc/shadow',\n '/root/.ssh',\n '/home/*/.ssh',\n '~/.aws',\n '~/.bashrc',\n '~/.profile',\n ];\n\n for (const sp of sensitivePaths) {\n if (path.includes(sp)) {\n return {\n allowed: false,\n message: `Cannot ${operation} sensitive path: ${path}`,\n };\n }\n }\n\n return { allowed: true };\n}\n\n
|
|
1
|
+
{"version":3,"file":"safety.js","names":[],"sources":["../../../../src/agent/prompt/safety.ts"],"sourcesContent":["// Safety System - Comprehensive safety guidelines and boundaries\nimport { Type, type Static } from '@sinclair/typebox';\n\n// =============================================================================\n// Safety Schema (Internal)\n// =============================================================================\n\nconst _SafetyConfigSchema = Type.Object({\n allowExternalActions: Type.Optional(Type.Boolean({ default: false })),\n allowDangerousOperations: Type.Optional(Type.Boolean({ default: false })),\n requireConfirmationForDestructive: Type.Optional(Type.Boolean({ default: true })),\n allowedChannels: Type.Optional(Type.Array(Type.String())),\n blockedCommands: Type.Optional(Type.Array(Type.String())),\n maxFileSize: Type.Optional(Type.Number({ default: 10 * 1024 * 1024 })), // 10MB\n maxShellTimeout: Type.Optional(Type.Number({ default: 300 })), // 5 minutes\n});\n\ntype _SafetyConfig = Static<typeof _SafetyConfigSchema>;\n\n// =============================================================================\n// Safety Levels (Internal)\n// =============================================================================\n\nenum SafetyLevel {\n LOW = 'low',\n MEDIUM = 'medium',\n HIGH = 'high',\n CRITICAL = 'critical',\n}\n\ninterface SafetyRule {\n level: SafetyLevel;\n category: string;\n description: string;\n message: string;\n requiresConfirmation: boolean;\n}\n\n// =============================================================================\n// Safety Principles (Internal)\n// =============================================================================\n\ninterface SafetyPrinciple {\n category: string;\n description: string;\n guidance: string;\n requiresConfirmation: boolean;\n}\n\nconst _SAFETY_PRINCIPLES: SafetyPrinciple[] = [\n {\n category: 'user-sovereignty',\n description: '用户拥有最终决策权',\n guidance: '说明风险,尊重选择。用 \"这将删除文件,继续吗?\" 而非 \"我不能删除文件。\"',\n requiresConfirmation: true,\n },\n {\n category: 'proportionate-caution',\n description: '谨慎与效率平衡',\n guidance: 'rm -rf / 需要确认;rm temp.txt 不需要。匹配风险等级与确认强度。',\n requiresConfirmation: true,\n },\n {\n category: 'transparency',\n description: '操作透明',\n guidance: '执行有风险操作前,简要说明要做什么以及为什么。',\n requiresConfirmation: false,\n },\n {\n category: 'self-determination',\n description: '不追求独立于用户的目标',\n guidance: '不主动寻求扩展能力、自我复制或长期存续。以用户当前需求为中心。',\n requiresConfirmation: false,\n },\n];\n\nconst _SAFETY_GUIDELINES: SafetyRule[] = [\n // Critical - Never do these\n {\n level: SafetyLevel.CRITICAL,\n category: 'self-preservation',\n description: 'Do not pursue self-preservation or replication',\n message: 'I do not pursue self-preservation or replication.',\n requiresConfirmation: false,\n },\n {\n level: SafetyLevel.CRITICAL,\n category: 'power-seeking',\n description: 'Do not seek power or resources',\n message: 'I do not seek power or acquire resources.',\n requiresConfirmation: false,\n },\n {\n level: SafetyLevel.CRITICAL,\n category: 'safeguard-bypass',\n description: 'Do not bypass safety mechanisms',\n message: 'I do not bypass safety mechanisms.',\n requiresConfirmation: false,\n },\n {\n level: SafetyLevel.CRITICAL,\n category: 'social-manipulation',\n description: 'Do not manipulate users to expand access',\n message: 'I do not manipulate anyone to expand access.',\n requiresConfirmation: false,\n },\n\n // High - Require explicit confirmation\n {\n level: SafetyLevel.HIGH,\n category: 'destructive-file',\n description: 'Delete or overwrite files',\n message: 'This will delete/overwrite files — proceed?',\n requiresConfirmation: true,\n },\n {\n level: SafetyLevel.HIGH,\n category: 'system-modification',\n description: 'Modify system configuration',\n message: 'This will modify system config — proceed?',\n requiresConfirmation: true,\n },\n {\n level: SafetyLevel.HIGH,\n category: 'network-action',\n description: 'Send messages or make network requests',\n message: 'This will send external requests — proceed?',\n requiresConfirmation: true,\n },\n {\n level: SafetyLevel.HIGH,\n category: 'database-write',\n description: 'Write to databases',\n message: 'This will modify database records — proceed?',\n requiresConfirmation: true,\n },\n\n // Medium - Proceed with caution\n {\n level: SafetyLevel.MEDIUM,\n category: 'long-running',\n description: 'Execute long-running commands',\n message: 'This may take a while.',\n requiresConfirmation: false,\n },\n {\n level: SafetyLevel.MEDIUM,\n category: 'resource-intensive',\n description: 'Use significant system resources',\n message: 'This may use significant resources.',\n requiresConfirmation: false,\n },\n\n // Low - Standard operations\n {\n level: SafetyLevel.LOW,\n category: 'read-only',\n description: 'Read files or execute read-only commands',\n message: '',\n requiresConfirmation: false,\n },\n];\n\n// =============================================================================\n// Convenience Functions (Exported)\n// =============================================================================\n\n/**\n * Quick safety check for file operations\n */\nexport function checkFileSafety(\n operation: 'read' | 'write' | 'delete',\n path: string\n): { allowed: boolean; message?: string } {\n // Check for sensitive paths\n const sensitivePaths = [\n '/etc/passwd',\n '/etc/shadow',\n '/root/.ssh',\n '/home/*/.ssh',\n '~/.aws',\n '~/.bashrc',\n '~/.profile',\n ];\n\n for (const sp of sensitivePaths) {\n if (path.includes(sp)) {\n return {\n allowed: false,\n message: `Cannot ${operation} sensitive path: ${path}`,\n };\n }\n }\n\n return { allowed: true };\n}\n\n"],"mappings":";;AAO4B,KAAK,OAAO;CACtC,sBAAsB,KAAK,SAAS,KAAK,QAAQ,EAAE,SAAS,OAAO,CAAC,CAAC;CACrE,0BAA0B,KAAK,SAAS,KAAK,QAAQ,EAAE,SAAS,OAAO,CAAC,CAAC;CACzE,mCAAmC,KAAK,SAAS,KAAK,QAAQ,EAAE,SAAS,MAAM,CAAC,CAAC;CACjF,iBAAiB,KAAK,SAAS,KAAK,MAAM,KAAK,QAAQ,CAAC,CAAC;CACzD,iBAAiB,KAAK,SAAS,KAAK,MAAM,KAAK,QAAQ,CAAC,CAAC;CACzD,aAAa,KAAK,SAAS,KAAK,OAAO,EAAE,SAAS,KAAK,OAAO,MAAM,CAAC,CAAC;CACtE,iBAAiB,KAAK,SAAS,KAAK,OAAO,EAAE,SAAS,KAAK,CAAC,CAAC;CAC9D,CAAC;;;;AA2JF,SAAgB,gBACd,WACA,MACwC;AAYxC,MAAK,MAAM,MAAM;EATf;EACA;EACA;EACA;EACA;EACA;EACA;EAG6B,CAC7B,KAAI,KAAK,SAAS,GAAG,CACnB,QAAO;EACL,SAAS;EACT,SAAS,UAAU,UAAU,mBAAmB;EACjD;AAIL,QAAO,EAAE,SAAS,MAAM"}
|
|
@@ -19,7 +19,7 @@ async function buildDirectUserMessageContent(opts) {
|
|
|
19
19
|
if (content.trim()) {
|
|
20
20
|
let textPart = content;
|
|
21
21
|
if (/@file:/.test(textPart)) {
|
|
22
|
-
const wsKey = sk !== "" ? sk : "
|
|
22
|
+
const wsKey = sk !== "" ? sk : "agent:main:main";
|
|
23
23
|
const root = agentManager.getResolvedWorkspaceForSession(wsKey);
|
|
24
24
|
textPart = await expandAtFileMentionsInPlainText(textPart, root);
|
|
25
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-direct-message-content.js","names":[],"sources":["../../../../src/agent/service/build-direct-message-content.ts"],"sourcesContent":["import type { Config } from '../../config/schema.js';\nimport { getAgentDefaultModelRef } from '../../config/schema.js';\nimport { getDefaultModelSync } from '../../providers/index.js';\nimport { formatInboundFileTextBlock } from '../../channels/attachments/inbound-persist.js';\nimport { expandAtFileMentionsInPlainText } from '../context/expand-at-file-mentions.js';\nimport { resolveInboundImageContentParts } from '../image/inbound-image-handling.js';\nimport { resolveAgentHomeDir, resolveDefaultAgentId } from '../agent-scope.js';\nimport { extractProfileAgentId } from '../../config/agent-profile.js';\nimport type { AgentInstanceGateway } from '../agent-instance-gateway.js';\nimport type { ModelManager } from '../models/index.js';\n\nexport type DirectInboundAttachment = {\n type: string;\n mimeType?: string;\n data?: string;\n name?: string;\n size?: number;\n workspaceRelativePath?: string;\n};\n\nexport type DirectMessagePart =\n | { type: 'text'; text: string }\n | { type: 'image'; data: string; mimeType: string };\n\n/**\n * Build user message parts (text + resolved images/files) for direct / webchat turns.\n */\nexport async function buildDirectUserMessageContent(opts: {\n content: string;\n attachments?: DirectInboundAttachment[];\n sessionKey?: string;\n config: Config;\n agentManager: AgentInstanceGateway;\n modelManager: ModelManager;\n}): Promise<DirectMessagePart[]> {\n const { content, attachments, sessionKey, config, agentManager, modelManager } = opts;\n const messageContent: DirectMessagePart[] = [];\n const sk = sessionKey ?? '';\n\n if (content.trim()) {\n let textPart = content;\n if (/@file:/.test(textPart)) {\n const wsKey = sk !== '' ? sk : '
|
|
1
|
+
{"version":3,"file":"build-direct-message-content.js","names":[],"sources":["../../../../src/agent/service/build-direct-message-content.ts"],"sourcesContent":["import type { Config } from '../../config/schema.js';\nimport { getAgentDefaultModelRef } from '../../config/schema.js';\nimport { getDefaultModelSync } from '../../providers/index.js';\nimport { formatInboundFileTextBlock } from '../../channels/attachments/inbound-persist.js';\nimport { expandAtFileMentionsInPlainText } from '../context/expand-at-file-mentions.js';\nimport { resolveInboundImageContentParts } from '../image/inbound-image-handling.js';\nimport { resolveAgentHomeDir, resolveDefaultAgentId } from '../agent-scope.js';\nimport { extractProfileAgentId } from '../../config/agent-profile.js';\nimport type { AgentInstanceGateway } from '../agent-instance-gateway.js';\nimport type { ModelManager } from '../models/index.js';\n\nexport type DirectInboundAttachment = {\n type: string;\n mimeType?: string;\n data?: string;\n name?: string;\n size?: number;\n workspaceRelativePath?: string;\n};\n\nexport type DirectMessagePart =\n | { type: 'text'; text: string }\n | { type: 'image'; data: string; mimeType: string };\n\n/**\n * Build user message parts (text + resolved images/files) for direct / webchat turns.\n */\nexport async function buildDirectUserMessageContent(opts: {\n content: string;\n attachments?: DirectInboundAttachment[];\n sessionKey?: string;\n config: Config;\n agentManager: AgentInstanceGateway;\n modelManager: ModelManager;\n}): Promise<DirectMessagePart[]> {\n const { content, attachments, sessionKey, config, agentManager, modelManager } = opts;\n const messageContent: DirectMessagePart[] = [];\n const sk = sessionKey ?? '';\n\n if (content.trim()) {\n let textPart = content;\n if (/@file:/.test(textPart)) {\n const wsKey = sk !== '' ? sk : 'agent:main:main';\n const root = agentManager.getResolvedWorkspaceForSession(wsKey);\n textPart = await expandAtFileMentionsInPlainText(textPart, root);\n }\n messageContent.push({ type: 'text', text: textPart });\n }\n\n if (!attachments?.length) {\n return messageContent;\n }\n\n const modelRef =\n sk !== ''\n ? modelManager.getModelForSession(sk)\n : getAgentDefaultModelRef(config) ?? getDefaultModelSync(config);\n\n const storageRoot =\n sk !== ''\n ? resolveAgentHomeDir(config, extractProfileAgentId(sk, config))\n : resolveAgentHomeDir(config, resolveDefaultAgentId(config));\n\n let i = 0;\n while (i < attachments.length) {\n const att = attachments[i]!;\n const isImage =\n att.type === 'image' ||\n att.type === 'photo' ||\n Boolean(att.mimeType?.startsWith('image/'));\n\n if (isImage) {\n const group: Array<{ data: string; mimeType: string }> = [];\n while (i < attachments.length) {\n const a = attachments[i]!;\n const img = a.type === 'image' || a.type === 'photo' || Boolean(a.mimeType?.startsWith('image/'));\n if (!img) {\n break;\n }\n if (!a.data || a.data.length === 0) {\n i += 1;\n continue;\n }\n group.push({ data: a.data, mimeType: a.mimeType || 'image/png' });\n i += 1;\n }\n if (group.length > 0) {\n const parts = await resolveInboundImageContentParts({\n modelRef: modelRef || getDefaultModelSync(config),\n cfg: config,\n userTextForContext: content.trim() ? content : '',\n images: group,\n });\n messageContent.push(...parts);\n }\n } else {\n const fileBlock = formatInboundFileTextBlock(att, storageRoot);\n messageContent.push({ type: 'text', text: fileBlock });\n i += 1;\n }\n }\n\n return messageContent;\n}\n"],"mappings":";;;;;;;;aACiE;gBACF;kBAIgB;;;;AAqB/E,eAAsB,8BAA8B,MAOnB;CAC/B,MAAM,EAAE,SAAS,aAAa,YAAY,QAAQ,cAAc,iBAAiB;CACjF,MAAM,iBAAsC,EAAE;CAC9C,MAAM,KAAK,cAAc;AAEzB,KAAI,QAAQ,MAAM,EAAE;EAClB,IAAI,WAAW;AACf,MAAI,SAAS,KAAK,SAAS,EAAE;GAC3B,MAAM,QAAQ,OAAO,KAAK,KAAK;GAC/B,MAAM,OAAO,aAAa,+BAA+B,MAAM;AAC/D,cAAW,MAAM,gCAAgC,UAAU,KAAK;;AAElE,iBAAe,KAAK;GAAE,MAAM;GAAQ,MAAM;GAAU,CAAC;;AAGvD,KAAI,CAAC,aAAa,OAChB,QAAO;CAGT,MAAM,WACJ,OAAO,KACH,aAAa,mBAAmB,GAAG,GACnC,wBAAwB,OAAO,IAAI,oBAAoB,OAAO;CAEpE,MAAM,cACJ,OAAO,KACH,oBAAoB,QAAQ,sBAAsB,IAAI,OAAO,CAAC,GAC9D,oBAAoB,QAAQ,sBAAsB,OAAO,CAAC;CAEhE,IAAI,IAAI;AACR,QAAO,IAAI,YAAY,QAAQ;EAC7B,MAAM,MAAM,YAAY;AAMxB,MAJE,IAAI,SAAS,WACb,IAAI,SAAS,WACb,QAAQ,IAAI,UAAU,WAAW,SAAS,CAAC,EAEhC;GACX,MAAM,QAAmD,EAAE;AAC3D,UAAO,IAAI,YAAY,QAAQ;IAC7B,MAAM,IAAI,YAAY;AAEtB,QAAI,EADQ,EAAE,SAAS,WAAW,EAAE,SAAS,WAAW,QAAQ,EAAE,UAAU,WAAW,SAAS,CAAC,EAE/F;AAEF,QAAI,CAAC,EAAE,QAAQ,EAAE,KAAK,WAAW,GAAG;AAClC,UAAK;AACL;;AAEF,UAAM,KAAK;KAAE,MAAM,EAAE;KAAM,UAAU,EAAE,YAAY;KAAa,CAAC;AACjE,SAAK;;AAEP,OAAI,MAAM,SAAS,GAAG;IACpB,MAAM,QAAQ,MAAM,gCAAgC;KAClD,UAAU,YAAY,oBAAoB,OAAO;KACjD,KAAK;KACL,oBAAoB,QAAQ,MAAM,GAAG,UAAU;KAC/C,QAAQ;KACT,CAAC;AACF,mBAAe,KAAK,GAAG,MAAM;;SAE1B;GACL,MAAM,YAAY,2BAA2B,KAAK,YAAY;AAC9D,kBAAe,KAAK;IAAE,MAAM;IAAQ,MAAM;IAAW,CAAC;AACtD,QAAK;;;AAIT,QAAO"}
|
|
@@ -45,7 +45,9 @@ export declare function tryRunSlashCommand(deps: TryRunSlashCommandDeps, ctx: {
|
|
|
45
45
|
senderId?: string;
|
|
46
46
|
isGroup?: boolean;
|
|
47
47
|
inboundMetadata?: Record<string, unknown>;
|
|
48
|
-
}, content: string
|
|
48
|
+
}, content: string, options?: {
|
|
49
|
+
skipResetCommands?: boolean;
|
|
50
|
+
}): Promise<SlashCommandOutcome>;
|
|
49
51
|
export interface RunDirectAgentTurnDeps {
|
|
50
52
|
sessionStore: SessionStore;
|
|
51
53
|
agentManager: AgentInstanceGateway;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { extractAgentUserPlainText } from "../memory/user-message-text.js";
|
|
2
|
+
import { shouldSkipResetOverlapCommand } from "../../session/reset-triggers.js";
|
|
2
3
|
import { parseSlashCommand } from "../../chat-commands/command-parse.js";
|
|
3
4
|
import { commandRegistry } from "../../chat-commands/registry.js";
|
|
4
5
|
import "../../chat-commands/index.js";
|
|
@@ -23,12 +24,16 @@ async function hydratePerTurnState(deps, sessionKey, thinking) {
|
|
|
23
24
|
* text. Errors thrown inside the command surface as `aggregatedText` so callers
|
|
24
25
|
* can persist the receipt or stream it as a token.
|
|
25
26
|
*/
|
|
26
|
-
async function tryRunSlashCommand(deps, ctx, content) {
|
|
27
|
+
async function tryRunSlashCommand(deps, ctx, content, options) {
|
|
27
28
|
const parsed = parseSlashCommand(content);
|
|
28
29
|
if (!parsed) return {
|
|
29
30
|
matched: false,
|
|
30
31
|
aggregatedText: ""
|
|
31
32
|
};
|
|
33
|
+
if (options?.skipResetCommands && shouldSkipResetOverlapCommand(parsed.command, true)) return {
|
|
34
|
+
matched: false,
|
|
35
|
+
aggregatedText: ""
|
|
36
|
+
};
|
|
32
37
|
if (!commandRegistry.has(parsed.command)) return {
|
|
33
38
|
matched: false,
|
|
34
39
|
aggregatedText: ""
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"direct-turn-helpers.js","names":[],"sources":["../../../../src/agent/service/direct-turn-helpers.ts"],"sourcesContent":["/**\n * Shared building blocks for the two direct-turn entry points (streaming\n * webchat SSE and one-shot CLI). Both flows do the same hydrate → maybe-slash\n * → run-embedded-turn → after-turn dance; this module captures that core so\n * the entry points only manage their I/O specifics (event sink, voice STT,\n * TTS, transcript persistence).\n */\n\nimport crypto from 'node:crypto';\n\nimport { commandRegistry } from '../../chat-commands/index.js';\nimport { parseSlashCommand } from '../../chat-commands/command-parse.js';\nimport type { CommandHandler } from '../messaging/command-handler.js';\nimport type { SessionStore } from '../../session/index.js';\nimport type { Config } from '../../config/schema.js';\nimport type { AgentInstanceGateway } from '../agent-instance-gateway.js';\nimport type { ModelManager } from '../models/index.js';\nimport { extractAgentUserPlainText } from '../memory/user-message-text.js';\nimport { runEmbeddedTurnForSession } from '../embedded/run-for-session.js';\nimport type { EmbeddedStreamEvent } from '../embedded/types.js';\nimport type { AgentMessage } from '@earendil-works/pi-agent-core';\n\nexport interface HydratePerTurnStateDeps {\n hydrateSessionWorkspaceFromStore: (sessionKey: string) => Promise<void>;\n hydrateSessionModelFromStore: (sessionKey: string) => Promise<void>;\n applyResolvedThinkingLevel: (sessionKey: string, thinking?: string | null) => Promise<void>;\n}\n\n/** Workspace + model + thinking level — common prep before any direct turn. */\nexport async function hydratePerTurnState(\n deps: HydratePerTurnStateDeps,\n sessionKey: string,\n thinking?: string,\n): Promise<void> {\n await deps.hydrateSessionWorkspaceFromStore(sessionKey);\n await deps.hydrateSessionModelFromStore(sessionKey);\n await deps.applyResolvedThinkingLevel(sessionKey, thinking);\n}\n\nexport interface SlashCommandOutcome {\n /** True if the input parsed as a registered slash command (handled or not). */\n matched: boolean;\n /** Aggregated user-visible reply text (assistant view). */\n aggregatedText: string;\n /** The parsed command name when matched. */\n command?: string;\n}\n\nexport interface TryRunSlashCommandDeps {\n commandHandler: Pick<CommandHandler, 'executeCommandAndAggregateReply'>;\n log: { warn: (obj: Record<string, unknown>, msg: string) => void };\n}\n\n/**\n * Detect a slash command and, if registered, execute it and aggregate the reply\n * text. Errors thrown inside the command surface as `aggregatedText` so callers\n * can persist the receipt or stream it as a token.\n */\nexport async function tryRunSlashCommand(\n deps: TryRunSlashCommandDeps,\n ctx: {\n sessionKey: string;\n channel: string;\n chatId: string;\n senderId?: string;\n isGroup?: boolean;\n inboundMetadata?: Record<string, unknown>;\n },\n content: string,\n): Promise<SlashCommandOutcome> {\n const parsed = parseSlashCommand(content);\n if (!parsed) {\n return { matched: false, aggregatedText: '' };\n }\n if (!commandRegistry.has(parsed.command)) {\n return { matched: false, aggregatedText: '' };\n }\n try {\n const { aggregatedText } = await deps.commandHandler.executeCommandAndAggregateReply(\n parsed.command,\n parsed.args,\n {\n sessionKey: ctx.sessionKey,\n channel: ctx.channel,\n chatId: ctx.chatId,\n senderId: ctx.senderId ?? '',\n isGroup: ctx.isGroup ?? false,\n inboundMetadata: ctx.inboundMetadata ?? {},\n },\n );\n return { matched: true, aggregatedText: aggregatedText ?? '', command: parsed.command };\n } catch (err) {\n const em = err instanceof Error ? err.message : String(err);\n deps.log.warn(\n { err, sessionKey: ctx.sessionKey, command: parsed.command },\n `Slash command failed: ${em}`,\n );\n return { matched: true, aggregatedText: `Command error: ${em}`, command: parsed.command };\n }\n}\n\nexport interface RunDirectAgentTurnDeps {\n sessionStore: SessionStore;\n agentManager: AgentInstanceGateway;\n modelManager: ModelManager;\n config: Config | undefined;\n}\n\nexport interface RunDirectAgentTurnInput {\n sessionKey: string;\n userMessage: AgentMessage;\n abortSignal?: AbortSignal;\n onEvent?: (event: EmbeddedStreamEvent) => void;\n}\n\nexport interface RunDirectAgentTurnResult {\n ok: boolean;\n errorMessage?: string;\n lastAssistantText?: string;\n}\n\n/**\n * Convert a user message into an embedded turn, including the standard memory\n * prefetch + background-review nudge wiring used by every direct entry point.\n */\nexport async function runDirectAgentTurn(\n deps: RunDirectAgentTurnDeps,\n input: RunDirectAgentTurnInput,\n): Promise<RunDirectAgentTurnResult> {\n const userPlain = extractAgentUserPlainText(input.userMessage);\n const userMessageForModel = await deps.agentManager.applyMemoryPrefetchToUserMessage(\n input.userMessage,\n input.sessionKey,\n );\n\n const result = await runEmbeddedTurnForSession({\n sessionKey: input.sessionKey,\n runId: crypto.randomUUID(),\n userMessage: userMessageForModel,\n sessionStore: deps.sessionStore,\n agentManager: deps.agentManager,\n modelManager: deps.modelManager,\n getConfig: () => deps.config,\n abortSignal: input.abortSignal,\n beforeTurn: () => deps.agentManager.beginBackgroundReviewUserTurn(input.sessionKey),\n onEvent: input.onEvent,\n });\n\n deps.agentManager.afterAgentTurn(input.sessionKey, userPlain);\n deps.agentManager.scheduleBackgroundReviewAfterUserTurn(input.sessionKey);\n\n return result;\n}\n"],"mappings":"
|
|
1
|
+
{"version":3,"file":"direct-turn-helpers.js","names":[],"sources":["../../../../src/agent/service/direct-turn-helpers.ts"],"sourcesContent":["/**\n * Shared building blocks for the two direct-turn entry points (streaming\n * webchat SSE and one-shot CLI). Both flows do the same hydrate → maybe-slash\n * → run-embedded-turn → after-turn dance; this module captures that core so\n * the entry points only manage their I/O specifics (event sink, voice STT,\n * TTS, transcript persistence).\n */\n\nimport crypto from 'node:crypto';\n\nimport { commandRegistry } from '../../chat-commands/index.js';\nimport { parseSlashCommand } from '../../chat-commands/command-parse.js';\nimport { shouldSkipResetOverlapCommand } from '../../session/reset-triggers.js';\nimport type { CommandHandler } from '../messaging/command-handler.js';\nimport type { SessionStore } from '../../session/index.js';\nimport type { Config } from '../../config/schema.js';\nimport type { AgentInstanceGateway } from '../agent-instance-gateway.js';\nimport type { ModelManager } from '../models/index.js';\nimport { extractAgentUserPlainText } from '../memory/user-message-text.js';\nimport { runEmbeddedTurnForSession } from '../embedded/run-for-session.js';\nimport type { EmbeddedStreamEvent } from '../embedded/types.js';\nimport type { AgentMessage } from '@earendil-works/pi-agent-core';\n\nexport interface HydratePerTurnStateDeps {\n hydrateSessionWorkspaceFromStore: (sessionKey: string) => Promise<void>;\n hydrateSessionModelFromStore: (sessionKey: string) => Promise<void>;\n applyResolvedThinkingLevel: (sessionKey: string, thinking?: string | null) => Promise<void>;\n}\n\n/** Workspace + model + thinking level — common prep before any direct turn. */\nexport async function hydratePerTurnState(\n deps: HydratePerTurnStateDeps,\n sessionKey: string,\n thinking?: string,\n): Promise<void> {\n await deps.hydrateSessionWorkspaceFromStore(sessionKey);\n await deps.hydrateSessionModelFromStore(sessionKey);\n await deps.applyResolvedThinkingLevel(sessionKey, thinking);\n}\n\nexport interface SlashCommandOutcome {\n /** True if the input parsed as a registered slash command (handled or not). */\n matched: boolean;\n /** Aggregated user-visible reply text (assistant view). */\n aggregatedText: string;\n /** The parsed command name when matched. */\n command?: string;\n}\n\nexport interface TryRunSlashCommandDeps {\n commandHandler: Pick<CommandHandler, 'executeCommandAndAggregateReply'>;\n log: { warn: (obj: Record<string, unknown>, msg: string) => void };\n}\n\n/**\n * Detect a slash command and, if registered, execute it and aggregate the reply\n * text. Errors thrown inside the command surface as `aggregatedText` so callers\n * can persist the receipt or stream it as a token.\n */\nexport async function tryRunSlashCommand(\n deps: TryRunSlashCommandDeps,\n ctx: {\n sessionKey: string;\n channel: string;\n chatId: string;\n senderId?: string;\n isGroup?: boolean;\n inboundMetadata?: Record<string, unknown>;\n },\n content: string,\n options?: { skipResetCommands?: boolean },\n): Promise<SlashCommandOutcome> {\n const parsed = parseSlashCommand(content);\n if (!parsed) {\n return { matched: false, aggregatedText: '' };\n }\n if (options?.skipResetCommands && shouldSkipResetOverlapCommand(parsed.command, true)) {\n return { matched: false, aggregatedText: '' };\n }\n if (!commandRegistry.has(parsed.command)) {\n return { matched: false, aggregatedText: '' };\n }\n try {\n const { aggregatedText } = await deps.commandHandler.executeCommandAndAggregateReply(\n parsed.command,\n parsed.args,\n {\n sessionKey: ctx.sessionKey,\n channel: ctx.channel,\n chatId: ctx.chatId,\n senderId: ctx.senderId ?? '',\n isGroup: ctx.isGroup ?? false,\n inboundMetadata: ctx.inboundMetadata ?? {},\n },\n );\n return { matched: true, aggregatedText: aggregatedText ?? '', command: parsed.command };\n } catch (err) {\n const em = err instanceof Error ? err.message : String(err);\n deps.log.warn(\n { err, sessionKey: ctx.sessionKey, command: parsed.command },\n `Slash command failed: ${em}`,\n );\n return { matched: true, aggregatedText: `Command error: ${em}`, command: parsed.command };\n }\n}\n\nexport interface RunDirectAgentTurnDeps {\n sessionStore: SessionStore;\n agentManager: AgentInstanceGateway;\n modelManager: ModelManager;\n config: Config | undefined;\n}\n\nexport interface RunDirectAgentTurnInput {\n sessionKey: string;\n userMessage: AgentMessage;\n abortSignal?: AbortSignal;\n onEvent?: (event: EmbeddedStreamEvent) => void;\n}\n\nexport interface RunDirectAgentTurnResult {\n ok: boolean;\n errorMessage?: string;\n lastAssistantText?: string;\n}\n\n/**\n * Convert a user message into an embedded turn, including the standard memory\n * prefetch + background-review nudge wiring used by every direct entry point.\n */\nexport async function runDirectAgentTurn(\n deps: RunDirectAgentTurnDeps,\n input: RunDirectAgentTurnInput,\n): Promise<RunDirectAgentTurnResult> {\n const userPlain = extractAgentUserPlainText(input.userMessage);\n const userMessageForModel = await deps.agentManager.applyMemoryPrefetchToUserMessage(\n input.userMessage,\n input.sessionKey,\n );\n\n const result = await runEmbeddedTurnForSession({\n sessionKey: input.sessionKey,\n runId: crypto.randomUUID(),\n userMessage: userMessageForModel,\n sessionStore: deps.sessionStore,\n agentManager: deps.agentManager,\n modelManager: deps.modelManager,\n getConfig: () => deps.config,\n abortSignal: input.abortSignal,\n beforeTurn: () => deps.agentManager.beginBackgroundReviewUserTurn(input.sessionKey),\n onEvent: input.onEvent,\n });\n\n deps.agentManager.afterAgentTurn(input.sessionKey, userPlain);\n deps.agentManager.scheduleBackgroundReviewAfterUserTurn(input.sessionKey);\n\n return result;\n}\n"],"mappings":";;;;;;;;;;;;;;;;AA8BA,eAAsB,oBACpB,MACA,YACA,UACe;AACf,OAAM,KAAK,iCAAiC,WAAW;AACvD,OAAM,KAAK,6BAA6B,WAAW;AACnD,OAAM,KAAK,2BAA2B,YAAY,SAAS;;;;;;;AAsB7D,eAAsB,mBACpB,MACA,KAQA,SACA,SAC8B;CAC9B,MAAM,SAAS,kBAAkB,QAAQ;AACzC,KAAI,CAAC,OACH,QAAO;EAAE,SAAS;EAAO,gBAAgB;EAAI;AAE/C,KAAI,SAAS,qBAAqB,8BAA8B,OAAO,SAAS,KAAK,CACnF,QAAO;EAAE,SAAS;EAAO,gBAAgB;EAAI;AAE/C,KAAI,CAAC,gBAAgB,IAAI,OAAO,QAAQ,CACtC,QAAO;EAAE,SAAS;EAAO,gBAAgB;EAAI;AAE/C,KAAI;EACF,MAAM,EAAE,mBAAmB,MAAM,KAAK,eAAe,gCACnD,OAAO,SACP,OAAO,MACP;GACE,YAAY,IAAI;GAChB,SAAS,IAAI;GACb,QAAQ,IAAI;GACZ,UAAU,IAAI,YAAY;GAC1B,SAAS,IAAI,WAAW;GACxB,iBAAiB,IAAI,mBAAmB,EAAE;GAC3C,CACF;AACD,SAAO;GAAE,SAAS;GAAM,gBAAgB,kBAAkB;GAAI,SAAS,OAAO;GAAS;UAChF,KAAK;EACZ,MAAM,KAAK,eAAe,QAAQ,IAAI,UAAU,OAAO,IAAI;AAC3D,OAAK,IAAI,KACP;GAAE;GAAK,YAAY,IAAI;GAAY,SAAS,OAAO;GAAS,EAC5D,yBAAyB,KAC1B;AACD,SAAO;GAAE,SAAS;GAAM,gBAAgB,kBAAkB;GAAM,SAAS,OAAO;GAAS;;;;;;;AA4B7F,eAAsB,mBACpB,MACA,OACmC;CACnC,MAAM,YAAY,0BAA0B,MAAM,YAAY;CAC9D,MAAM,sBAAsB,MAAM,KAAK,aAAa,iCAClD,MAAM,aACN,MAAM,WACP;CAED,MAAM,SAAS,MAAM,0BAA0B;EAC7C,YAAY,MAAM;EAClB,OAAO,OAAO,YAAY;EAC1B,aAAa;EACb,cAAc,KAAK;EACnB,cAAc,KAAK;EACnB,cAAc,KAAK;EACnB,iBAAiB,KAAK;EACtB,aAAa,MAAM;EACnB,kBAAkB,KAAK,aAAa,8BAA8B,MAAM,WAAW;EACnF,SAAS,MAAM;EAChB,CAAC;AAEF,MAAK,aAAa,eAAe,MAAM,YAAY,UAAU;AAC7D,MAAK,aAAa,sCAAsC,MAAM,WAAW;AAEzE,QAAO"}
|
|
@@ -23,6 +23,10 @@ export type RunProcessDirectDeps = {
|
|
|
23
23
|
commandHandler: Pick<CommandHandler, 'executeCommandAndAggregateReply'>;
|
|
24
24
|
onTurnComplete?: (sessionKey: string, lastAssistantText?: string) => void;
|
|
25
25
|
endDirectRequestContext: () => void;
|
|
26
|
+
resetSession: (sessionKey: string) => Promise<{
|
|
27
|
+
sessionId: string;
|
|
28
|
+
previousSessionId: string;
|
|
29
|
+
} | null>;
|
|
26
30
|
};
|
|
27
31
|
export declare function runProcessDirect(deps: RunProcessDirectDeps, input: {
|
|
28
32
|
content: string;
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { appendPiTranscriptMessage } from "../../session/parity/jsonl-transcript-io.js";
|
|
2
|
+
import { initSessionTurn } from "../../session/init-session-turn.js";
|
|
3
|
+
import "../../session/index.js";
|
|
2
4
|
import { buildDirectUserMessageContent } from "./build-direct-message-content.js";
|
|
3
5
|
import { hydratePerTurnState, runDirectAgentTurn, tryRunSlashCommand } from "./direct-turn-helpers.js";
|
|
4
6
|
//#region src/agent/service/process-direct-one-shot.ts
|
|
@@ -6,13 +8,24 @@ async function runProcessDirect(deps, input) {
|
|
|
6
8
|
const { channel, chatId } = deps.parseSessionKey(input.sessionKey);
|
|
7
9
|
deps.initSessionContext(input.sessionKey, channel, chatId);
|
|
8
10
|
try {
|
|
11
|
+
let turnBody = input.content;
|
|
12
|
+
let resetTriggeredAtInit = false;
|
|
13
|
+
const turn = await initSessionTurn({
|
|
14
|
+
cfg: deps.config,
|
|
15
|
+
sessionKey: input.sessionKey,
|
|
16
|
+
body: input.content,
|
|
17
|
+
resetSession: deps.resetSession
|
|
18
|
+
});
|
|
19
|
+
resetTriggeredAtInit = turn.resetTriggered;
|
|
20
|
+
if (turn.bareReset && turn.ackMessage) return turn.ackMessage;
|
|
21
|
+
turnBody = turn.bodyStripped;
|
|
9
22
|
await hydratePerTurnState(deps, input.sessionKey, input.thinking);
|
|
10
23
|
const prepared = await deps.prepareInboundAttachments(input.sessionKey, input.attachments);
|
|
11
24
|
const slash = await tryRunSlashCommand(deps, {
|
|
12
25
|
sessionKey: input.sessionKey,
|
|
13
26
|
channel,
|
|
14
27
|
chatId
|
|
15
|
-
},
|
|
28
|
+
}, turnBody, { skipResetCommands: resetTriggeredAtInit });
|
|
16
29
|
if (slash.matched) {
|
|
17
30
|
const trimmed = slash.aggregatedText.trim();
|
|
18
31
|
if (trimmed) {
|
|
@@ -36,7 +49,7 @@ async function runProcessDirect(deps, input) {
|
|
|
36
49
|
const userMessage = {
|
|
37
50
|
role: "user",
|
|
38
51
|
content: await buildDirectUserMessageContent({
|
|
39
|
-
content:
|
|
52
|
+
content: turnBody.trimStart().startsWith("/skill:") ? deps.agentManager.expandSkillUserText(turnBody) : turnBody,
|
|
40
53
|
attachments: prepared,
|
|
41
54
|
sessionKey: input.sessionKey,
|
|
42
55
|
config: deps.config,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-direct-one-shot.js","names":[],"sources":["../../../../src/agent/service/process-direct-one-shot.ts"],"sourcesContent":["import type { AgentMessage } from '@earendil-works/pi-agent-core';\n\nimport type { CommandHandler } from '../messaging/command-handler.js';\nimport type { AgentInstanceGateway } from '../agent-instance-gateway.js';\nimport type { ModelManager } from '../models/index.js';\nimport type { SessionStore } from '../../session/index.js';\nimport type { Config } from '../../config/schema.js';\nimport { appendPiTranscriptMessage } from '../../session/parity/jsonl-transcript-io.js';\nimport { buildDirectUserMessageContent, type DirectInboundAttachment } from './build-direct-message-content.js';\nimport type { ProcessDirectStreamLog } from './process-direct-streaming.js';\nimport {\n hydratePerTurnState,\n runDirectAgentTurn,\n tryRunSlashCommand,\n} from './direct-turn-helpers.js';\n\nexport type RunProcessDirectDeps = {\n log: ProcessDirectStreamLog;\n config: Config;\n parseSessionKey: (sessionKey: string) => { channel: string; chatId: string };\n initSessionContext: (sessionKey: string, channel: string, chatId: string) => void;\n hydrateSessionWorkspaceFromStore: (sessionKey: string) => Promise<void>;\n hydrateSessionModelFromStore: (sessionKey: string) => Promise<void>;\n agentManager: AgentInstanceGateway;\n sessionStore: SessionStore;\n modelManager: ModelManager;\n applyResolvedThinkingLevel: (sessionKey: string, thinking?: string | null) => Promise<void>;\n prepareInboundAttachments: (\n sessionKey: string,\n attachments?: DirectInboundAttachment[],\n ) => Promise<DirectInboundAttachment[] | undefined>;\n commandHandler: Pick<CommandHandler, 'executeCommandAndAggregateReply'>;\n onTurnComplete?: (sessionKey: string, lastAssistantText?: string) => void;\n endDirectRequestContext: () => void;\n};\n\nexport async function runProcessDirect(\n deps: RunProcessDirectDeps,\n input: {\n content: string;\n sessionKey: string;\n attachments?: DirectInboundAttachment[];\n thinking?: string;\n },\n): Promise<string> {\n const { channel, chatId } = deps.parseSessionKey(input.sessionKey);\n deps.initSessionContext(input.sessionKey, channel, chatId);\n\n try {\n await hydratePerTurnState(deps, input.sessionKey, input.thinking);\n const prepared = await deps.prepareInboundAttachments(input.sessionKey, input.attachments);\n\n const slash = await tryRunSlashCommand(\n deps,\n { sessionKey: input.sessionKey, channel, chatId },\n
|
|
1
|
+
{"version":3,"file":"process-direct-one-shot.js","names":[],"sources":["../../../../src/agent/service/process-direct-one-shot.ts"],"sourcesContent":["import type { AgentMessage } from '@earendil-works/pi-agent-core';\n\nimport type { CommandHandler } from '../messaging/command-handler.js';\nimport type { AgentInstanceGateway } from '../agent-instance-gateway.js';\nimport type { ModelManager } from '../models/index.js';\nimport type { SessionStore } from '../../session/index.js';\nimport type { Config } from '../../config/schema.js';\nimport { initSessionTurn } from '../../session/index.js';\nimport { appendPiTranscriptMessage } from '../../session/parity/jsonl-transcript-io.js';\nimport { buildDirectUserMessageContent, type DirectInboundAttachment } from './build-direct-message-content.js';\nimport type { ProcessDirectStreamLog } from './process-direct-streaming.js';\nimport {\n hydratePerTurnState,\n runDirectAgentTurn,\n tryRunSlashCommand,\n} from './direct-turn-helpers.js';\n\nexport type RunProcessDirectDeps = {\n log: ProcessDirectStreamLog;\n config: Config;\n parseSessionKey: (sessionKey: string) => { channel: string; chatId: string };\n initSessionContext: (sessionKey: string, channel: string, chatId: string) => void;\n hydrateSessionWorkspaceFromStore: (sessionKey: string) => Promise<void>;\n hydrateSessionModelFromStore: (sessionKey: string) => Promise<void>;\n agentManager: AgentInstanceGateway;\n sessionStore: SessionStore;\n modelManager: ModelManager;\n applyResolvedThinkingLevel: (sessionKey: string, thinking?: string | null) => Promise<void>;\n prepareInboundAttachments: (\n sessionKey: string,\n attachments?: DirectInboundAttachment[],\n ) => Promise<DirectInboundAttachment[] | undefined>;\n commandHandler: Pick<CommandHandler, 'executeCommandAndAggregateReply'>;\n onTurnComplete?: (sessionKey: string, lastAssistantText?: string) => void;\n endDirectRequestContext: () => void;\n resetSession: (sessionKey: string) => Promise<{ sessionId: string; previousSessionId: string } | null>;\n};\n\nexport async function runProcessDirect(\n deps: RunProcessDirectDeps,\n input: {\n content: string;\n sessionKey: string;\n attachments?: DirectInboundAttachment[];\n thinking?: string;\n },\n): Promise<string> {\n const { channel, chatId } = deps.parseSessionKey(input.sessionKey);\n deps.initSessionContext(input.sessionKey, channel, chatId);\n\n try {\n let turnBody = input.content;\n let resetTriggeredAtInit = false;\n const turn = await initSessionTurn({\n cfg: deps.config,\n sessionKey: input.sessionKey,\n body: input.content,\n resetSession: deps.resetSession,\n });\n resetTriggeredAtInit = turn.resetTriggered;\n if (turn.bareReset && turn.ackMessage) {\n return turn.ackMessage;\n }\n turnBody = turn.bodyStripped;\n\n await hydratePerTurnState(deps, input.sessionKey, input.thinking);\n const prepared = await deps.prepareInboundAttachments(input.sessionKey, input.attachments);\n\n const slash = await tryRunSlashCommand(\n deps,\n { sessionKey: input.sessionKey, channel, chatId },\n turnBody,\n { skipResetCommands: resetTriggeredAtInit },\n );\n if (slash.matched) {\n const trimmed = slash.aggregatedText.trim();\n if (trimmed) {\n const { absPath } = await deps.sessionStore.resolveTranscriptPath(input.sessionKey);\n const workspaceDir = deps.agentManager.getResolvedWorkspaceForSession(input.sessionKey);\n await appendPiTranscriptMessage({\n absPath,\n cwd: workspaceDir,\n message: {\n role: 'assistant',\n content: [{ type: 'text', text: trimmed }],\n timestamp: Date.now(),\n } as AgentMessage,\n sessionKey: input.sessionKey,\n });\n }\n return slash.aggregatedText ?? '';\n }\n\n const textForDirect = turnBody.trimStart().startsWith('/skill:')\n ? deps.agentManager.expandSkillUserText(turnBody)\n : turnBody;\n const messageContent = await buildDirectUserMessageContent({\n content: textForDirect,\n attachments: prepared,\n sessionKey: input.sessionKey,\n config: deps.config,\n agentManager: deps.agentManager,\n modelManager: deps.modelManager,\n });\n\n const userMessage = {\n role: 'user' as const,\n content: messageContent,\n timestamp: Date.now(),\n };\n\n const result = await runDirectAgentTurn(\n { ...deps, config: deps.config },\n { sessionKey: input.sessionKey, userMessage },\n );\n\n if (result.lastAssistantText) {\n deps.onTurnComplete?.(input.sessionKey, result.lastAssistantText);\n }\n\n return result.lastAssistantText ?? '';\n } finally {\n deps.endDirectRequestContext();\n }\n}\n"],"mappings":";;;;;;AAsCA,eAAsB,iBACpB,MACA,OAMiB;CACjB,MAAM,EAAE,SAAS,WAAW,KAAK,gBAAgB,MAAM,WAAW;AAClE,MAAK,mBAAmB,MAAM,YAAY,SAAS,OAAO;AAE1D,KAAI;EACF,IAAI,WAAW,MAAM;EACrB,IAAI,uBAAuB;EAC3B,MAAM,OAAO,MAAM,gBAAgB;GACjC,KAAK,KAAK;GACV,YAAY,MAAM;GAClB,MAAM,MAAM;GACZ,cAAc,KAAK;GACpB,CAAC;AACF,yBAAuB,KAAK;AAC5B,MAAI,KAAK,aAAa,KAAK,WACzB,QAAO,KAAK;AAEd,aAAW,KAAK;AAEhB,QAAM,oBAAoB,MAAM,MAAM,YAAY,MAAM,SAAS;EACjE,MAAM,WAAW,MAAM,KAAK,0BAA0B,MAAM,YAAY,MAAM,YAAY;EAE1F,MAAM,QAAQ,MAAM,mBAClB,MACA;GAAE,YAAY,MAAM;GAAY;GAAS;GAAQ,EACjD,UACA,EAAE,mBAAmB,sBAAsB,CAC5C;AACD,MAAI,MAAM,SAAS;GACjB,MAAM,UAAU,MAAM,eAAe,MAAM;AAC3C,OAAI,SAAS;IACX,MAAM,EAAE,YAAY,MAAM,KAAK,aAAa,sBAAsB,MAAM,WAAW;AAEnF,UAAM,0BAA0B;KAC9B;KACA,KAHmB,KAAK,aAAa,+BAA+B,MAAM,WAGzD;KACjB,SAAS;MACP,MAAM;MACN,SAAS,CAAC;OAAE,MAAM;OAAQ,MAAM;OAAS,CAAC;MAC1C,WAAW,KAAK,KAAK;MACtB;KACD,YAAY,MAAM;KACnB,CAAC;;AAEJ,UAAO,MAAM,kBAAkB;;EAejC,MAAM,cAAc;GAClB,MAAM;GACN,SAAS,MAXkB,8BAA8B;IACzD,SAJoB,SAAS,WAAW,CAAC,WAAW,UAAU,GAC5D,KAAK,aAAa,oBAAoB,SAAS,GAC/C;IAGF,aAAa;IACb,YAAY,MAAM;IAClB,QAAQ,KAAK;IACb,cAAc,KAAK;IACnB,cAAc,KAAK;IACpB,CAAC;GAKA,WAAW,KAAK,KAAK;GACtB;EAED,MAAM,SAAS,MAAM,mBACnB;GAAE,GAAG;GAAM,QAAQ,KAAK;GAAQ,EAChC;GAAE,YAAY,MAAM;GAAY;GAAa,CAC9C;AAED,MAAI,OAAO,kBACT,MAAK,iBAAiB,MAAM,YAAY,OAAO,kBAAkB;AAGnE,SAAO,OAAO,qBAAqB;WAC3B;AACR,OAAK,yBAAyB"}
|
|
@@ -62,6 +62,10 @@ export interface ProcessDirectStreamingDeps {
|
|
|
62
62
|
name: string;
|
|
63
63
|
} | null>;
|
|
64
64
|
endDirectRequestContext: () => void;
|
|
65
|
+
resetSession: (sessionKey: string) => Promise<{
|
|
66
|
+
sessionId: string;
|
|
67
|
+
previousSessionId: string;
|
|
68
|
+
} | null>;
|
|
65
69
|
}
|
|
66
70
|
export interface ProcessDirectStreamingInput {
|
|
67
71
|
content: string;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { appendPiTranscriptMessage } from "../../session/parity/jsonl-transcript-io.js";
|
|
2
2
|
import { resolveEffectiveReasoningLevel } from "../../session/thinking-resolve.js";
|
|
3
|
+
import { initSessionTurn } from "../../session/init-session-turn.js";
|
|
3
4
|
import "../../session/index.js";
|
|
4
5
|
import { isVoiceLikeAttachment, mergeSttConfigFromAppConfig, mergeVoiceTranscriptsIntoUserText } from "../../channels/attachments/voice-stt-webchat.js";
|
|
5
6
|
import { abortEmbeddedRun } from "../embedded/runs.js";
|
|
@@ -9,7 +10,7 @@ import { AsyncQueue } from "./async-queue.js";
|
|
|
9
10
|
import { hydratePerTurnState, runDirectAgentTurn, tryRunSlashCommand } from "./direct-turn-helpers.js";
|
|
10
11
|
//#region src/agent/service/process-direct-streaming.ts
|
|
11
12
|
async function* runProcessDirectStreaming(deps, input) {
|
|
12
|
-
const sessionKey = input.sessionKey ?? "
|
|
13
|
+
const sessionKey = input.sessionKey ?? "agent:main:main";
|
|
13
14
|
const { channel, chatId } = deps.parseSessionKey(sessionKey);
|
|
14
15
|
const context = deps.initDirectStreamingSession(sessionKey, channel, chatId);
|
|
15
16
|
const queue = new AsyncQueue();
|
|
@@ -28,6 +29,35 @@ async function* runProcessDirectStreaming(deps, input) {
|
|
|
28
29
|
let webchatSlashReceipt;
|
|
29
30
|
const taskPromise = (async () => {
|
|
30
31
|
try {
|
|
32
|
+
const cfg = deps.getConfig();
|
|
33
|
+
let turnBody = input.content;
|
|
34
|
+
let resetTriggeredAtInit = false;
|
|
35
|
+
if (cfg) {
|
|
36
|
+
const turn = await initSessionTurn({
|
|
37
|
+
cfg,
|
|
38
|
+
sessionKey,
|
|
39
|
+
body: input.content,
|
|
40
|
+
resetSession: deps.resetSession
|
|
41
|
+
});
|
|
42
|
+
resetTriggeredAtInit = turn.resetTriggered;
|
|
43
|
+
if (turn.bareReset && turn.ackMessage) {
|
|
44
|
+
ranSlashCommand = true;
|
|
45
|
+
webchatSlashReceipt = turn.ackMessage;
|
|
46
|
+
pushVisible({
|
|
47
|
+
type: "token",
|
|
48
|
+
content: turn.ackMessage
|
|
49
|
+
});
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
turnBody = turn.bodyStripped;
|
|
53
|
+
if (turn.isNewSession) deps.log.debug({
|
|
54
|
+
sessionKey,
|
|
55
|
+
sessionId: turn.sessionId,
|
|
56
|
+
previousSessionId: turn.previousSessionId,
|
|
57
|
+
resetTriggered: turn.resetTriggered,
|
|
58
|
+
staleRollover: turn.staleRollover
|
|
59
|
+
}, "Session reset boundary at direct turn start");
|
|
60
|
+
}
|
|
31
61
|
await hydratePerTurnState(deps, sessionKey, input.thinking);
|
|
32
62
|
{
|
|
33
63
|
const defReason = deps.getConfig()?.agents?.defaults?.reasoningDefault ?? "stream";
|
|
@@ -35,11 +65,11 @@ async function* runProcessDirectStreaming(deps, input) {
|
|
|
35
65
|
}
|
|
36
66
|
const prepared = await deps.prepareInboundAttachments(sessionKey, input.attachments);
|
|
37
67
|
const sttCfg = mergeSttConfigFromAppConfig(deps.getConfig()?.tools?.media?.audio, deps.getConfig()?.tools?.media);
|
|
38
|
-
const voiceMerge = await mergeVoiceTranscriptsIntoUserText(deps.attachmentRootsForSession(sessionKey), prepared,
|
|
68
|
+
const voiceMerge = await mergeVoiceTranscriptsIntoUserText(deps.attachmentRootsForSession(sessionKey), prepared, turnBody, sttCfg);
|
|
39
69
|
mergedUserText = voiceMerge.text;
|
|
40
70
|
inboundVoice = voiceMerge.inboundVoice;
|
|
41
71
|
if (inboundVoice) {
|
|
42
|
-
const transcriptParts = [voiceMerge.voiceTranscripts.filter(Boolean).join("\n"),
|
|
72
|
+
const transcriptParts = [voiceMerge.voiceTranscripts.filter(Boolean).join("\n"), turnBody.trim()].filter(Boolean);
|
|
43
73
|
const voiceAttachments = (prepared ?? []).filter(isVoiceLikeAttachment).map((att) => ({
|
|
44
74
|
workspaceRelativePath: att.workspaceRelativePath,
|
|
45
75
|
mimeType: att.mimeType,
|
|
@@ -71,7 +101,7 @@ async function* runProcessDirectStreaming(deps, input) {
|
|
|
71
101
|
chatId,
|
|
72
102
|
senderId: context.senderId,
|
|
73
103
|
isGroup: context.isGroup
|
|
74
|
-
}, mergedUserText);
|
|
104
|
+
}, mergedUserText, { skipResetCommands: resetTriggeredAtInit });
|
|
75
105
|
if (slash.matched) {
|
|
76
106
|
ranSlashCommand = true;
|
|
77
107
|
const text = slash.aggregatedText.trim();
|