@jingyi0605/codingns 0.3.6 → 0.5.0
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/README.md +3 -0
- package/bin/codingns.mjs +913 -1
- package/dist/public/assets/AdaptiveButlerPage-B153lk5H.css +1 -0
- package/dist/public/assets/AdaptiveButlerPage-R-XZw7pd.js +3 -0
- package/dist/public/assets/App-DUAg5urj.css +1 -0
- package/dist/public/assets/App-DkvE5EyM.js +30 -0
- package/dist/public/assets/BootstrapPage-Vu5oEJ8z.js +1 -0
- package/dist/public/assets/ConversationPage-Cjpg6g0J.js +2 -0
- package/dist/public/assets/DesktopDetachPreviewPage-BgeEqbc5.js +1 -0
- package/dist/public/assets/DesktopWindowPage-1WelvxdH.js +2 -0
- package/dist/public/assets/FileContextPanel-D_ghXJuW.js +1 -0
- package/dist/public/assets/GitSidebar-D9f9Jxwr.js +6 -0
- package/dist/public/assets/MobileCreateSessionSheet-DLq5qPkx.js +1 -0
- package/dist/public/assets/MobileSheet-DLg-gX1t.js +1 -0
- package/dist/public/assets/MobileTopHeaderFrame-DArgZI7L.js +1 -0
- package/dist/public/assets/MobileWorkspaceSwitcherHeader-0ywJKfBQ.js +1 -0
- package/dist/public/assets/ServerSettingsModal-izoYMx9U.js +1 -0
- package/dist/public/assets/SessionIndexPage-C5aG8FIv.js +1 -0
- package/dist/public/assets/SettingsPage-HJIC-P-4.js +1 -0
- package/dist/public/assets/TerminalManagerPanel-DpyUTo9k.js +1 -0
- package/dist/public/assets/{TerminalPage-D00S4KM6.js → TerminalPage-CtKXIU0h.js} +19 -19
- package/dist/public/assets/TerminalRuntimeFallbackModal-CRhOQOsT.js +1 -0
- package/dist/public/assets/ToolFilesPage-DcYPsS-e.js +1 -0
- package/dist/public/assets/ToolGitPage-CsPl89ty.js +1 -0
- package/dist/public/assets/ToolProcessesPage-D0dvR8xK.js +1 -0
- package/dist/public/assets/ToolsHomePage-4fP-KRiv.js +1 -0
- package/dist/public/assets/WorkbenchLandingPage-kvlfyxRo.js +1 -0
- package/dist/public/assets/WorkbenchLayout-ByFw4eeu.js +3 -0
- package/dist/public/assets/WorkbenchModal-Ctob14VR.js +1 -0
- package/dist/public/assets/WorkbenchShellRoute-BUITtdAg.css +1 -0
- package/dist/public/assets/WorkbenchShellRoute-Kw7JEZI3.js +1 -0
- package/dist/public/assets/WorkspaceDebugDetailPage-Com5kEXJ.js +1 -0
- package/dist/public/assets/WorkspaceDetailPage-D0Lrx4Uz.js +1 -0
- package/dist/public/assets/WorkspaceHomePage-wR8d3aP9.js +1 -0
- package/dist/public/assets/butler-records-events-DgWCG364.js +1 -0
- package/dist/public/assets/default-session-permission-mode-CcGwR4Kk.js +1 -0
- package/dist/public/assets/event-DvH9tcej.js +1 -0
- package/dist/public/assets/file-tree-icon-UFVoVzhM.js +31 -0
- package/dist/public/assets/index-Byp9hJ0c.js +42 -0
- package/dist/public/assets/index-_52jxu4a.css +1 -0
- package/dist/public/assets/preferences-service-KIYeE2gk.js +1 -0
- package/dist/public/assets/session-runtime-machine-0KNSSPp5.js +17 -0
- package/dist/public/assets/styles-BWPBZvze.css +1 -0
- package/dist/public/assets/styles-CSUx5LGe.js +1 -0
- package/dist/public/assets/terminal-runtime-meta-AWXJpN4r.js +1 -0
- package/dist/public/assets/useRegisteredDebugTemplates-DBDRdptr.js +1 -0
- package/dist/public/assets/window-BWqRixxq.js +1 -0
- package/dist/public/index.html +2 -2
- package/dist/server/middlewares/auth-guard.d.ts +4 -0
- package/dist/server/middlewares/auth-guard.js +42 -4
- package/dist/server/middlewares/auth-guard.js.map +1 -1
- package/dist/server/modules/assistant-capability/assistant-capability-controller.d.ts +234 -0
- package/dist/server/modules/assistant-capability/assistant-capability-controller.js +365 -0
- package/dist/server/modules/assistant-capability/assistant-capability-controller.js.map +1 -1
- package/dist/server/modules/assistant-capability/assistant-capability-service.d.ts +262 -2
- package/dist/server/modules/assistant-capability/assistant-capability-service.js +737 -3
- package/dist/server/modules/assistant-capability/assistant-capability-service.js.map +1 -1
- package/dist/server/modules/auth/auth-controller.d.ts +11 -1
- package/dist/server/modules/auth/auth-controller.js +61 -2
- package/dist/server/modules/auth/auth-controller.js.map +1 -1
- package/dist/server/modules/auth/auth-device-display-name.d.ts +10 -0
- package/dist/server/modules/auth/auth-device-display-name.js +190 -0
- package/dist/server/modules/auth/auth-device-display-name.js.map +1 -0
- package/dist/server/modules/auth/auth-service.d.ts +80 -5
- package/dist/server/modules/auth/auth-service.js +333 -23
- package/dist/server/modules/auth/auth-service.js.map +1 -1
- package/dist/server/modules/butler/assistant-automation-service.d.ts +112 -0
- package/dist/server/modules/butler/assistant-automation-service.js +832 -0
- package/dist/server/modules/butler/assistant-automation-service.js.map +1 -0
- package/dist/server/modules/butler/assistant-automation-trigger.d.ts +94 -0
- package/dist/server/modules/butler/assistant-automation-trigger.js +400 -0
- package/dist/server/modules/butler/assistant-automation-trigger.js.map +1 -0
- package/dist/server/modules/butler/assistant-sandbox-cleanup-scheduler.d.ts +32 -0
- package/dist/server/modules/butler/assistant-sandbox-cleanup-scheduler.js +93 -0
- package/dist/server/modules/butler/assistant-sandbox-cleanup-scheduler.js.map +1 -0
- package/dist/server/modules/butler/assistant-sandbox-service.d.ts +69 -0
- package/dist/server/modules/butler/assistant-sandbox-service.js +399 -0
- package/dist/server/modules/butler/assistant-sandbox-service.js.map +1 -0
- package/dist/server/modules/butler/butler-action-context-service.d.ts +4 -1
- package/dist/server/modules/butler/butler-action-context-service.js +8 -2
- package/dist/server/modules/butler/butler-action-context-service.js.map +1 -1
- package/dist/server/modules/butler/butler-auth-service.js +7 -2
- package/dist/server/modules/butler/butler-auth-service.js.map +1 -1
- package/dist/server/modules/butler/butler-control-session-service.d.ts +11 -1
- package/dist/server/modules/butler/butler-control-session-service.js +173 -40
- package/dist/server/modules/butler/butler-control-session-service.js.map +1 -1
- package/dist/server/modules/butler/butler-control-timer-scheduler.d.ts +32 -0
- package/dist/server/modules/butler/butler-control-timer-scheduler.js +93 -0
- package/dist/server/modules/butler/butler-control-timer-scheduler.js.map +1 -0
- package/dist/server/modules/butler/butler-control-timer-service.d.ts +42 -0
- package/dist/server/modules/butler/butler-control-timer-service.js +132 -0
- package/dist/server/modules/butler/butler-control-timer-service.js.map +1 -0
- package/dist/server/modules/butler/butler-controller.d.ts +42 -2
- package/dist/server/modules/butler/butler-controller.js +79 -12
- package/dist/server/modules/butler/butler-controller.js.map +1 -1
- package/dist/server/modules/butler/butler-follow-up-evaluation-instruction-adapter.d.ts +2 -1
- package/dist/server/modules/butler/butler-follow-up-evaluation-instruction-adapter.js +27 -25
- package/dist/server/modules/butler/butler-follow-up-evaluation-instruction-adapter.js.map +1 -1
- package/dist/server/modules/butler/butler-follow-up-service.d.ts +41 -5
- package/dist/server/modules/butler/butler-follow-up-service.js +568 -371
- package/dist/server/modules/butler/butler-follow-up-service.js.map +1 -1
- package/dist/server/modules/butler/butler-inbox-analysis-service.d.ts +4 -1
- package/dist/server/modules/butler/butler-inbox-analysis-service.js +18 -4
- package/dist/server/modules/butler/butler-inbox-analysis-service.js.map +1 -1
- package/dist/server/modules/butler/butler-inbox-service.js +1 -0
- package/dist/server/modules/butler/butler-inbox-service.js.map +1 -1
- package/dist/server/modules/butler/butler-profile-service.js +2 -5
- package/dist/server/modules/butler/butler-profile-service.js.map +1 -1
- package/dist/server/modules/butler/butler-project-service.d.ts +3 -1
- package/dist/server/modules/butler/butler-project-service.js +7 -1
- package/dist/server/modules/butler/butler-project-service.js.map +1 -1
- package/dist/server/modules/butler/butler-session-service.d.ts +5 -1
- package/dist/server/modules/butler/butler-session-service.js +26 -1
- package/dist/server/modules/butler/butler-session-service.js.map +1 -1
- package/dist/server/modules/butler/butler-session-summary-service.js +2 -1
- package/dist/server/modules/butler/butler-session-summary-service.js.map +1 -1
- package/dist/server/modules/butler/butler-workspace-context.d.ts +4 -1
- package/dist/server/modules/butler/butler-workspace-context.js +204 -58
- package/dist/server/modules/butler/butler-workspace-context.js.map +1 -1
- package/dist/server/modules/butler/patrol-execution-service.js +2 -1
- package/dist/server/modules/butler/patrol-execution-service.js.map +1 -1
- package/dist/server/modules/butler/provider-adapter-registry.d.ts +3 -0
- package/dist/server/modules/butler/provider-adapter-registry.js +18 -1
- package/dist/server/modules/butler/provider-adapter-registry.js.map +1 -1
- package/dist/server/modules/butler/verification-run-service.d.ts +9 -2
- package/dist/server/modules/butler/verification-run-service.js +188 -34
- package/dist/server/modules/butler/verification-run-service.js.map +1 -1
- package/dist/server/modules/debug-target/debug-target-controller.js +1 -1
- package/dist/server/modules/debug-target/debug-target-controller.js.map +1 -1
- package/dist/server/modules/debug-target/debug-target-service.d.ts +7 -2
- package/dist/server/modules/debug-target/debug-target-service.js +563 -100
- package/dist/server/modules/debug-target/debug-target-service.js.map +1 -1
- package/dist/server/modules/git/git-command-helper-client.d.ts +1 -0
- package/dist/server/modules/git/git-command-helper-client.js +19 -26
- package/dist/server/modules/git/git-command-helper-client.js.map +1 -1
- package/dist/server/modules/git/git-command-runner.js +19 -1
- package/dist/server/modules/git/git-command-runner.js.map +1 -1
- package/dist/server/modules/preferences/profile-service.d.ts +3 -1
- package/dist/server/modules/preferences/profile-service.js +74 -3
- package/dist/server/modules/preferences/profile-service.js.map +1 -1
- package/dist/server/modules/provider/provider-controller.d.ts +1 -1
- package/dist/server/modules/provider/provider-controller.js.map +1 -1
- package/dist/server/modules/provider/provider-discovery-helper-client.d.ts +5 -3
- package/dist/server/modules/provider/provider-discovery-helper-client.js +129 -43
- package/dist/server/modules/provider/provider-discovery-helper-client.js.map +1 -1
- package/dist/server/modules/provider/provider-discovery-helper-process.js +44 -0
- package/dist/server/modules/provider/provider-discovery-helper-process.js.map +1 -1
- package/dist/server/modules/provider/provider-discovery-runtime.js +83 -3
- package/dist/server/modules/provider/provider-discovery-runtime.js.map +1 -1
- package/dist/server/modules/relay-tunnel/crypto/relay-tunnel-identity-service.d.ts +10 -0
- package/dist/server/modules/relay-tunnel/crypto/relay-tunnel-identity-service.js +48 -0
- package/dist/server/modules/relay-tunnel/crypto/relay-tunnel-identity-service.js.map +1 -0
- package/dist/server/modules/relay-tunnel/crypto/relay-tunnel-packets.d.ts +48 -0
- package/dist/server/modules/relay-tunnel/crypto/relay-tunnel-packets.js +11 -0
- package/dist/server/modules/relay-tunnel/crypto/relay-tunnel-packets.js.map +1 -0
- package/dist/server/modules/relay-tunnel/crypto/relay-tunnel-protocol.d.ts +74 -0
- package/dist/server/modules/relay-tunnel/crypto/relay-tunnel-protocol.js +302 -0
- package/dist/server/modules/relay-tunnel/crypto/relay-tunnel-protocol.js.map +1 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-controller.d.ts +33 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-controller.js +57 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-controller.js.map +1 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-edge-proof.d.ts +9 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-edge-proof.js +25 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-edge-proof.js.map +1 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-gateway-service.d.ts +18 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-gateway-service.js +230 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-gateway-service.js.map +1 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-runtime-adapter.d.ts +41 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-runtime-adapter.js +443 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-runtime-adapter.js.map +1 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-service.d.ts +111 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-service.js +771 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-service.js.map +1 -0
- package/dist/server/modules/sessions/claude-runtime-helper-client.js +23 -1
- package/dist/server/modules/sessions/claude-runtime-helper-client.js.map +1 -1
- package/dist/server/modules/sessions/codex-app-server-helper-client.d.ts +2 -1
- package/dist/server/modules/sessions/codex-app-server-helper-client.js +78 -0
- package/dist/server/modules/sessions/codex-app-server-helper-client.js.map +1 -1
- package/dist/server/modules/sessions/codex-app-server-helper-process.js +84 -2
- package/dist/server/modules/sessions/codex-app-server-helper-process.js.map +1 -1
- package/dist/server/modules/sessions/provider-session-delete-cli.d.ts +15 -0
- package/dist/server/modules/sessions/provider-session-delete-cli.js +148 -0
- package/dist/server/modules/sessions/provider-session-delete-cli.js.map +1 -0
- package/dist/server/modules/sessions/session-controller.d.ts +4 -1
- package/dist/server/modules/sessions/session-controller.js +4 -0
- package/dist/server/modules/sessions/session-controller.js.map +1 -1
- package/dist/server/modules/sessions/session-history-service.d.ts +24 -1
- package/dist/server/modules/sessions/session-history-service.js +401 -42
- package/dist/server/modules/sessions/session-history-service.js.map +1 -1
- package/dist/server/modules/sessions/session-live-runtime-router-service.d.ts +25 -0
- package/dist/server/modules/sessions/session-live-runtime-router-service.js +42 -0
- package/dist/server/modules/sessions/session-live-runtime-router-service.js.map +1 -0
- package/dist/server/modules/sessions/session-live-runtime-service.d.ts +6 -0
- package/dist/server/modules/sessions/session-live-runtime-service.js +130 -28
- package/dist/server/modules/sessions/session-live-runtime-service.js.map +1 -1
- package/dist/server/modules/sessions/session-message-attachment-service.d.ts +1 -0
- package/dist/server/modules/sessions/session-message-attachment-service.js +22 -0
- package/dist/server/modules/sessions/session-message-attachment-service.js.map +1 -1
- package/dist/server/modules/sessions/session-message-origin-utils.d.ts +12 -0
- package/dist/server/modules/sessions/session-message-origin-utils.js +45 -0
- package/dist/server/modules/sessions/session-message-origin-utils.js.map +1 -0
- package/dist/server/modules/sessions/session-permission-request-service.d.ts +1 -0
- package/dist/server/modules/sessions/session-permission-request-service.js +367 -5
- package/dist/server/modules/sessions/session-permission-request-service.js.map +1 -1
- package/dist/server/modules/sessions/session-provider-error-mapper.js +32 -0
- package/dist/server/modules/sessions/session-provider-error-mapper.js.map +1 -1
- package/dist/server/modules/sessions/session-provider-usage-guard-service.d.ts +37 -0
- package/dist/server/modules/sessions/session-provider-usage-guard-service.js +179 -0
- package/dist/server/modules/sessions/session-provider-usage-guard-service.js.map +1 -0
- package/dist/server/modules/sessions/session-provider-usage-limit.d.ts +17 -0
- package/dist/server/modules/sessions/session-provider-usage-limit.js +465 -0
- package/dist/server/modules/sessions/session-provider-usage-limit.js.map +1 -0
- package/dist/server/modules/skills/assistant-runtime-skill-catalog.d.ts +8 -0
- package/dist/server/modules/skills/assistant-runtime-skill-catalog.js +26 -0
- package/dist/server/modules/skills/assistant-runtime-skill-catalog.js.map +1 -0
- package/dist/server/modules/skills/assistant-runtime-skill-cleanup.d.ts +9 -0
- package/dist/server/modules/skills/assistant-runtime-skill-cleanup.js +55 -0
- package/dist/server/modules/skills/assistant-runtime-skill-cleanup.js.map +1 -0
- package/dist/server/modules/skills/builtin-skill-service.js +1 -6
- package/dist/server/modules/skills/builtin-skill-service.js.map +1 -1
- package/dist/server/modules/skills/builtin-skills/codingns-assistant/SKILL.md +19 -12
- package/dist/server/modules/skills/builtin-skills/codingns-assistant/references/cli-workflow.md +9 -3
- package/dist/server/modules/skills/skill-controller.d.ts +2 -2
- package/dist/server/modules/skills/skill-controller.js +9 -1
- package/dist/server/modules/skills/skill-controller.js.map +1 -1
- package/dist/server/modules/skills/skill-manager-service.d.ts +26 -1
- package/dist/server/modules/skills/skill-manager-service.js +346 -90
- package/dist/server/modules/skills/skill-manager-service.js.map +1 -1
- package/dist/server/modules/skills/skill-name-policy.d.ts +2 -0
- package/dist/server/modules/skills/skill-name-policy.js +10 -0
- package/dist/server/modules/skills/skill-name-policy.js.map +1 -0
- package/dist/server/modules/tailscale/tailscale-service.d.ts +2 -0
- package/dist/server/modules/tailscale/tailscale-service.js +21 -8
- package/dist/server/modules/tailscale/tailscale-service.js.map +1 -1
- package/dist/server/modules/tasks/task-helper-client.d.ts +5 -2
- package/dist/server/modules/tasks/task-helper-client.js +118 -38
- package/dist/server/modules/tasks/task-helper-client.js.map +1 -1
- package/dist/server/modules/tasks/task-helper-process.js +94 -3
- package/dist/server/modules/tasks/task-helper-process.js.map +1 -1
- package/dist/server/modules/tasks/task-types.d.ts +6 -0
- package/dist/server/modules/tasks/task-types.js +7 -1
- package/dist/server/modules/tasks/task-types.js.map +1 -1
- package/dist/server/modules/terminal/command-template-service.d.ts +9 -0
- package/dist/server/modules/terminal/command-template-service.js +87 -5
- package/dist/server/modules/terminal/command-template-service.js.map +1 -1
- package/dist/server/modules/terminal/template-reverse-proxy-service.js +71 -3
- package/dist/server/modules/terminal/template-reverse-proxy-service.js.map +1 -1
- package/dist/server/modules/terminal/terminal-controller.d.ts +3 -0
- package/dist/server/modules/terminal/terminal-controller.js +41 -0
- package/dist/server/modules/terminal/terminal-controller.js.map +1 -1
- package/dist/server/modules/workbench/workbench-service.d.ts +3 -0
- package/dist/server/modules/workbench/workbench-service.js +4 -3
- package/dist/server/modules/workbench/workbench-service.js.map +1 -1
- package/dist/server/modules/workbench/workspace-file-watcher.d.ts +14 -6
- package/dist/server/modules/workbench/workspace-file-watcher.js +267 -57
- package/dist/server/modules/workbench/workspace-file-watcher.js.map +1 -1
- package/dist/server/modules/workbench/workspace-panel-snapshot-service.d.ts +2 -0
- package/dist/server/modules/workbench/workspace-panel-snapshot-service.js +32 -3
- package/dist/server/modules/workbench/workspace-panel-snapshot-service.js.map +1 -1
- package/dist/server/modules/worktree/worktree-manager.d.ts +9 -1
- package/dist/server/modules/worktree/worktree-manager.js +9 -1
- package/dist/server/modules/worktree/worktree-manager.js.map +1 -1
- package/dist/server/routes/assistant.js +49 -0
- package/dist/server/routes/assistant.js.map +1 -1
- package/dist/server/routes/auth.js +4 -0
- package/dist/server/routes/auth.js.map +1 -1
- package/dist/server/routes/butler.js +5 -0
- package/dist/server/routes/butler.js.map +1 -1
- package/dist/server/routes/sessions.js +1 -0
- package/dist/server/routes/sessions.js.map +1 -1
- package/dist/server/routes/system.d.ts +2 -1
- package/dist/server/routes/system.js +13 -1
- package/dist/server/routes/system.js.map +1 -1
- package/dist/server/server/create-server.d.ts +18 -0
- package/dist/server/server/create-server.js +113 -20
- package/dist/server/server/create-server.js.map +1 -1
- package/dist/server/shared/utils/tokens.d.ts +3 -1
- package/dist/server/shared/utils/tokens.js +9 -2
- package/dist/server/shared/utils/tokens.js.map +1 -1
- package/dist/server/storage/repositories/assistant-automation-run-repository.d.ts +12 -0
- package/dist/server/storage/repositories/assistant-automation-run-repository.js +139 -0
- package/dist/server/storage/repositories/assistant-automation-run-repository.js.map +1 -0
- package/dist/server/storage/repositories/assistant-automation-task-repository.d.ts +17 -0
- package/dist/server/storage/repositories/assistant-automation-task-repository.js +179 -0
- package/dist/server/storage/repositories/assistant-automation-task-repository.js.map +1 -0
- package/dist/server/storage/repositories/assistant-sandbox-workspace-repository.d.ts +18 -0
- package/dist/server/storage/repositories/assistant-sandbox-workspace-repository.js +191 -0
- package/dist/server/storage/repositories/assistant-sandbox-workspace-repository.js.map +1 -0
- package/dist/server/storage/repositories/auth-device-repository.d.ts +22 -0
- package/dist/server/storage/repositories/auth-device-repository.js +97 -0
- package/dist/server/storage/repositories/auth-device-repository.js.map +1 -0
- package/dist/server/storage/repositories/auth-device-session-repository.d.ts +17 -0
- package/dist/server/storage/repositories/auth-device-session-repository.js +82 -0
- package/dist/server/storage/repositories/auth-device-session-repository.js.map +1 -0
- package/dist/server/storage/repositories/auth-login-event-repository.d.ts +9 -0
- package/dist/server/storage/repositories/auth-login-event-repository.js +53 -0
- package/dist/server/storage/repositories/auth-login-event-repository.js.map +1 -0
- package/dist/server/storage/repositories/auth-token-repository.d.ts +4 -0
- package/dist/server/storage/repositories/auth-token-repository.js +58 -5
- package/dist/server/storage/repositories/auth-token-repository.js.map +1 -1
- package/dist/server/storage/repositories/butler-control-session-repository.js +27 -3
- package/dist/server/storage/repositories/butler-control-session-repository.js.map +1 -1
- package/dist/server/storage/repositories/butler-control-timer-repository.d.ts +15 -0
- package/dist/server/storage/repositories/butler-control-timer-repository.js +157 -0
- package/dist/server/storage/repositories/butler-control-timer-repository.js.map +1 -0
- package/dist/server/storage/repositories/butler-follow-up-task-repository.js +21 -3
- package/dist/server/storage/repositories/butler-follow-up-task-repository.js.map +1 -1
- package/dist/server/storage/repositories/instance-relay-tunnel-identity-repository.d.ts +8 -0
- package/dist/server/storage/repositories/instance-relay-tunnel-identity-repository.js +52 -0
- package/dist/server/storage/repositories/instance-relay-tunnel-identity-repository.js.map +1 -0
- package/dist/server/storage/repositories/instance-relay-tunnel-repository.d.ts +10 -0
- package/dist/server/storage/repositories/instance-relay-tunnel-repository.js +153 -0
- package/dist/server/storage/repositories/instance-relay-tunnel-repository.js.map +1 -0
- package/dist/server/storage/repositories/instance-tailscale-repository.js +6 -3
- package/dist/server/storage/repositories/instance-tailscale-repository.js.map +1 -1
- package/dist/server/storage/repositories/managed-skill-repository.d.ts +2 -1
- package/dist/server/storage/repositories/managed-skill-repository.js +14 -4
- package/dist/server/storage/repositories/managed-skill-repository.js.map +1 -1
- package/dist/server/storage/repositories/session-message-attachment-repository.d.ts +2 -0
- package/dist/server/storage/repositories/session-message-attachment-repository.js +24 -0
- package/dist/server/storage/repositories/session-message-attachment-repository.js.map +1 -1
- package/dist/server/storage/repositories/user-preference-profile-repository.js +6 -3
- package/dist/server/storage/repositories/user-preference-profile-repository.js.map +1 -1
- package/dist/server/storage/sqlite/client.js +534 -2
- package/dist/server/storage/sqlite/client.js.map +1 -1
- package/dist/server/storage/sqlite/schema.sql +228 -4
- package/dist/server/types/domain.d.ts +170 -2
- package/dist/server/ws/workbench-ws-hub.d.ts +14 -8
- package/dist/server/ws/workbench-ws-hub.js +369 -209
- package/dist/server/ws/workbench-ws-hub.js.map +1 -1
- package/dist/server/ws/ws-auth-guard.js +1 -4
- package/dist/server/ws/ws-auth-guard.js.map +1 -1
- package/dist/server/ws/ws-server.d.ts +1 -1
- package/dist/server/ws/ws-server.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/codex-resume-history.d.ts +1 -0
- package/node_modules/@codingns/session-sync-core/dist/codex-resume-history.js +80 -0
- package/node_modules/@codingns/session-sync-core/dist/codex-resume-history.js.map +1 -0
- package/node_modules/@codingns/session-sync-core/dist/providers/claude-code.d.ts +5 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/claude-code.js +122 -4
- package/node_modules/@codingns/session-sync-core/dist/providers/claude-code.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/codex.d.ts +17 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/codex.js +437 -51
- package/node_modules/@codingns/session-sync-core/dist/providers/codex.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/gemini.d.ts +7 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/gemini.js +240 -27
- package/node_modules/@codingns/session-sync-core/dist/providers/gemini.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/kimi.d.ts +5 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/kimi.js +108 -2
- package/node_modules/@codingns/session-sync-core/dist/providers/kimi.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/opencode.d.ts +3 -0
- package/node_modules/@codingns/session-sync-core/dist/providers/opencode.js +101 -8
- package/node_modules/@codingns/session-sync-core/dist/providers/opencode.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/utils.d.ts +1 -0
- package/node_modules/@codingns/session-sync-core/dist/providers/utils.js +4 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/utils.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/runtime/claude-runtime.js +44 -0
- package/node_modules/@codingns/session-sync-core/dist/runtime/claude-runtime.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/runtime/codex-runtime.d.ts +5 -1
- package/node_modules/@codingns/session-sync-core/dist/runtime/codex-runtime.js +153 -60
- package/node_modules/@codingns/session-sync-core/dist/runtime/codex-runtime.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/runtime/types.d.ts +1 -0
- package/node_modules/@codingns/session-sync-core/dist/services.d.ts +1 -0
- package/node_modules/@codingns/session-sync-core/dist/services.js +24 -8
- package/node_modules/@codingns/session-sync-core/dist/services.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/types.d.ts +6 -0
- package/package.json +1 -1
- package/scripts/postinstall.mjs +0 -33
- package/dist/public/assets/index-BlOinYqR.js +0 -122
- package/dist/public/assets/index-Dg_7g6lA.css +0 -1
|
@@ -0,0 +1,132 @@
|
|
|
1
|
+
import { AppError } from "../../shared/errors/app-error.js";
|
|
2
|
+
export class ButlerControlTimerService {
|
|
3
|
+
butlerProfileService;
|
|
4
|
+
butlerControlSessionService;
|
|
5
|
+
butlerControlTimerRepository;
|
|
6
|
+
assistantAutomationService;
|
|
7
|
+
constructor(butlerProfileService, butlerControlSessionService, butlerControlTimerRepository, assistantAutomationService) {
|
|
8
|
+
this.butlerProfileService = butlerProfileService;
|
|
9
|
+
this.butlerControlSessionService = butlerControlSessionService;
|
|
10
|
+
this.butlerControlTimerRepository = butlerControlTimerRepository;
|
|
11
|
+
this.assistantAutomationService = assistantAutomationService;
|
|
12
|
+
}
|
|
13
|
+
listTimers(filters) {
|
|
14
|
+
this.butlerProfileService.ensureInitialized();
|
|
15
|
+
return this.assistantAutomationService
|
|
16
|
+
.listTasks({
|
|
17
|
+
userId: filters.userId,
|
|
18
|
+
statuses: mapTimerStatusesToAutomationStatuses(filters.statuses),
|
|
19
|
+
controlSessionId: filters.controlSessionId?.trim() || null,
|
|
20
|
+
limit: filters.limit
|
|
21
|
+
})
|
|
22
|
+
.filter((task) => task.triggerType === "once")
|
|
23
|
+
.map((task) => this.mapTaskToTimerView(task));
|
|
24
|
+
}
|
|
25
|
+
getTimer(timerId, userId) {
|
|
26
|
+
this.butlerProfileService.ensureInitialized();
|
|
27
|
+
return this.mapTaskToTimerView(this.assistantAutomationService.getTask(timerId.trim(), userId));
|
|
28
|
+
}
|
|
29
|
+
createTimer(input) {
|
|
30
|
+
this.butlerProfileService.ensureInitialized();
|
|
31
|
+
const created = this.assistantAutomationService.createTask({
|
|
32
|
+
userId: input.userId,
|
|
33
|
+
controlSessionId: input.controlSessionId,
|
|
34
|
+
projectId: input.projectId,
|
|
35
|
+
title: input.title,
|
|
36
|
+
trigger: {
|
|
37
|
+
type: "once",
|
|
38
|
+
dueAt: input.dueAt,
|
|
39
|
+
afterSeconds: input.afterSeconds ?? null
|
|
40
|
+
},
|
|
41
|
+
action: {
|
|
42
|
+
type: "send_control_message",
|
|
43
|
+
content: input.content,
|
|
44
|
+
includeTriggerContext: false,
|
|
45
|
+
targetSessionId: input.targetSessionId
|
|
46
|
+
}
|
|
47
|
+
});
|
|
48
|
+
return this.mapTaskToTimerView(created);
|
|
49
|
+
}
|
|
50
|
+
cancelTimer(timerId, userId) {
|
|
51
|
+
this.butlerProfileService.ensureInitialized();
|
|
52
|
+
return this.mapTaskToTimerView(this.assistantAutomationService.cancelTask(timerId.trim(), userId));
|
|
53
|
+
}
|
|
54
|
+
async runDueTimers(referenceAt) {
|
|
55
|
+
this.butlerProfileService.ensureInitialized();
|
|
56
|
+
const result = await this.assistantAutomationService.runDueTasks(referenceAt);
|
|
57
|
+
return {
|
|
58
|
+
activeTimerCount: result.activeTaskCount,
|
|
59
|
+
dueTimerCount: result.dueTaskCount,
|
|
60
|
+
processedTimerCount: result.processedTaskCount,
|
|
61
|
+
idle: result.idle
|
|
62
|
+
};
|
|
63
|
+
}
|
|
64
|
+
mapTaskToTimerView(task) {
|
|
65
|
+
if (task.triggerType !== "once") {
|
|
66
|
+
throw new AppError({
|
|
67
|
+
statusCode: 409,
|
|
68
|
+
errorCode: "BUTLER_CONTROL_TIMER_COMPATIBILITY_ERROR",
|
|
69
|
+
detail: "当前计时器兼容视图只支持 once 类型自动化"
|
|
70
|
+
});
|
|
71
|
+
}
|
|
72
|
+
const triggerConfig = parseOnceTriggerConfig(task.triggerConfigJson);
|
|
73
|
+
const actionConfig = parseSendControlMessageActionConfig(task.actionConfigJson);
|
|
74
|
+
return {
|
|
75
|
+
id: task.id,
|
|
76
|
+
controlSessionId: task.controlSessionId,
|
|
77
|
+
sessionId: task.controlSession?.sessionId ?? "",
|
|
78
|
+
userId: task.userId,
|
|
79
|
+
projectId: task.projectId,
|
|
80
|
+
targetSessionId: actionConfig.targetSessionId,
|
|
81
|
+
title: task.title,
|
|
82
|
+
content: actionConfig.content,
|
|
83
|
+
dueAt: triggerConfig.dueAt,
|
|
84
|
+
status: mapAutomationStatusToTimerStatus(task.status),
|
|
85
|
+
triggeredAt: task.lastRunAt,
|
|
86
|
+
lastError: task.lastError,
|
|
87
|
+
createdAt: task.createdAt,
|
|
88
|
+
updatedAt: task.updatedAt,
|
|
89
|
+
cancelledAt: task.cancelledAt,
|
|
90
|
+
controlSession: task.controlSession
|
|
91
|
+
};
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
function mapTimerStatusesToAutomationStatuses(statuses) {
|
|
95
|
+
return statuses?.map((status) => (status === "active" ? "active" : status));
|
|
96
|
+
}
|
|
97
|
+
function mapAutomationStatusToTimerStatus(status) {
|
|
98
|
+
if (status === "paused") {
|
|
99
|
+
return "active";
|
|
100
|
+
}
|
|
101
|
+
return status;
|
|
102
|
+
}
|
|
103
|
+
function parseOnceTriggerConfig(value) {
|
|
104
|
+
const parsed = JSON.parse(value);
|
|
105
|
+
const dueAt = parsed.dueAt?.trim();
|
|
106
|
+
if (!dueAt) {
|
|
107
|
+
throw new AppError({
|
|
108
|
+
statusCode: 500,
|
|
109
|
+
errorCode: "BUTLER_CONTROL_TIMER_COMPATIBILITY_ERROR",
|
|
110
|
+
detail: "自动化缺少 once 触发时间,无法映射为计时器"
|
|
111
|
+
});
|
|
112
|
+
}
|
|
113
|
+
return {
|
|
114
|
+
dueAt
|
|
115
|
+
};
|
|
116
|
+
}
|
|
117
|
+
function parseSendControlMessageActionConfig(value) {
|
|
118
|
+
const parsed = JSON.parse(value);
|
|
119
|
+
const content = parsed.content?.trim();
|
|
120
|
+
if (!content) {
|
|
121
|
+
throw new AppError({
|
|
122
|
+
statusCode: 500,
|
|
123
|
+
errorCode: "BUTLER_CONTROL_TIMER_COMPATIBILITY_ERROR",
|
|
124
|
+
detail: "自动化缺少控制会话消息内容,无法映射为计时器"
|
|
125
|
+
});
|
|
126
|
+
}
|
|
127
|
+
return {
|
|
128
|
+
content,
|
|
129
|
+
targetSessionId: parsed.targetSessionId?.trim() || null
|
|
130
|
+
};
|
|
131
|
+
}
|
|
132
|
+
//# sourceMappingURL=butler-control-timer-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"butler-control-timer-service.js","sourceRoot":"","sources":["../../../../src/modules/butler/butler-control-timer-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import type { FastifyReply, FastifyRequest } from "fastify";
|
|
2
|
+
import type { ButlerControlTimerStatus } from "../../types/domain.js";
|
|
2
3
|
import type { ButlerControlSessionService, SendButlerControlMessageInput, StartButlerControlSessionInput } from "./butler-control-session-service.js";
|
|
4
|
+
import type { ButlerControlTimerService } from "./butler-control-timer-service.js";
|
|
3
5
|
import type { ButlerControlActionService, ResumeButlerProjectSessionActionInput, StartButlerPatrolActionInput, StartButlerVerificationActionInput } from "./butler-control-action-service.js";
|
|
4
6
|
import type { ButlerProfilePatchInput, ButlerProfileService } from "./butler-profile-service.js";
|
|
5
7
|
import type { ButlerFollowUpService, CreateButlerFollowUpTaskInput } from "./butler-follow-up-service.js";
|
|
@@ -41,6 +43,11 @@ interface ButlerFollowUpTaskListQuery {
|
|
|
41
43
|
projectId?: string;
|
|
42
44
|
sessionId?: string;
|
|
43
45
|
}
|
|
46
|
+
interface ButlerControlTimerListQuery {
|
|
47
|
+
status?: ButlerControlTimerStatus;
|
|
48
|
+
controlSessionId?: string;
|
|
49
|
+
limit?: string;
|
|
50
|
+
}
|
|
44
51
|
interface ButlerProjectParams {
|
|
45
52
|
projectId: string;
|
|
46
53
|
}
|
|
@@ -53,9 +60,24 @@ interface ButlerNotificationParams {
|
|
|
53
60
|
interface ButlerFollowUpTaskParams {
|
|
54
61
|
taskId: string;
|
|
55
62
|
}
|
|
63
|
+
interface ButlerControlTimerParams {
|
|
64
|
+
timerId: string;
|
|
65
|
+
}
|
|
56
66
|
interface CancelButlerFollowUpTaskBody {
|
|
57
67
|
reason?: string;
|
|
58
68
|
}
|
|
69
|
+
interface CreateButlerControlTimerBody {
|
|
70
|
+
controlSessionId?: string | null;
|
|
71
|
+
projectId?: string | null;
|
|
72
|
+
targetSessionId?: string | null;
|
|
73
|
+
title?: string | null;
|
|
74
|
+
content?: string;
|
|
75
|
+
dueAt?: string | null;
|
|
76
|
+
afterSeconds?: number | null;
|
|
77
|
+
}
|
|
78
|
+
interface CancelButlerControlTimerBody {
|
|
79
|
+
reason?: string;
|
|
80
|
+
}
|
|
59
81
|
interface ButlerMemoryParams extends ButlerProjectParams {
|
|
60
82
|
memoryId: string;
|
|
61
83
|
}
|
|
@@ -174,7 +196,7 @@ interface StartPatrolRunBody {
|
|
|
174
196
|
suggestions?: string[];
|
|
175
197
|
}
|
|
176
198
|
interface ButlerVerificationListQuery {
|
|
177
|
-
status?: "queued" | "running" | "passed" | "failed" | "skipped";
|
|
199
|
+
status?: "queued" | "running" | "passed" | "failed" | "skipped" | "cancelled";
|
|
178
200
|
verificationType?: "test" | "health" | "browser" | "visual" | "metric";
|
|
179
201
|
}
|
|
180
202
|
interface StartVerificationRunBody {
|
|
@@ -213,7 +235,8 @@ export declare class ButlerController {
|
|
|
213
235
|
private readonly patrolExecutionService;
|
|
214
236
|
private readonly verificationRunService;
|
|
215
237
|
private readonly butlerActionContextService?;
|
|
216
|
-
|
|
238
|
+
private readonly butlerControlTimerService?;
|
|
239
|
+
constructor(butlerProfileService: ButlerProfileService, butlerControlSessionService: ButlerControlSessionService, butlerControlActionService: Pick<ButlerControlActionService, "listCurrentEvents" | "openProject" | "resumeProjectSession" | "startPatrol" | "startVerification">, butlerContextAggregator: Pick<ButlerContextAggregator, "getOverview" | "getSnapshot" | "getProjectContext" | "searchSummaries">, butlerFollowUpService: ButlerFollowUpService, butlerInboxService: ButlerInboxService, butlerNotificationService: ButlerNotificationService, butlerProjectService: ButlerProjectService, butlerSessionService: ButlerSessionService, projectMemoryService: ProjectMemoryService, patrolPlanService: PatrolPlanService, patrolRunService: PatrolRunService, patrolExecutionService: PatrolExecutionService, verificationRunService: VerificationRunService, butlerActionContextService?: Pick<ButlerActionContextService, "getSessionActionContext" | "invalidateSessionActionContext"> | undefined, butlerControlTimerService?: Pick<ButlerControlTimerService, "listTimers" | "getTimer" | "createTimer" | "cancelTimer"> | undefined);
|
|
217
240
|
readonly getProfile: (_request: FastifyRequest, reply: FastifyReply) => Promise<void>;
|
|
218
241
|
readonly initProfile: (request: FastifyRequest<{
|
|
219
242
|
Body: ButlerProfilePatchInput;
|
|
@@ -226,6 +249,12 @@ export declare class ButlerController {
|
|
|
226
249
|
readonly getControlSession: (request: FastifyRequest<{
|
|
227
250
|
Params: ButlerControlSessionParams;
|
|
228
251
|
}>, reply: FastifyReply) => Promise<void>;
|
|
252
|
+
readonly listControlTimers: (request: FastifyRequest<{
|
|
253
|
+
Querystring: ButlerControlTimerListQuery;
|
|
254
|
+
}>, reply: FastifyReply) => Promise<void>;
|
|
255
|
+
readonly getControlTimer: (request: FastifyRequest<{
|
|
256
|
+
Params: ButlerControlTimerParams;
|
|
257
|
+
}>, reply: FastifyReply) => Promise<void>;
|
|
229
258
|
readonly listControlSessionEvents: (_request: FastifyRequest, reply: FastifyReply) => Promise<void>;
|
|
230
259
|
readonly resetControlSession: (_request: FastifyRequest, reply: FastifyReply) => Promise<void>;
|
|
231
260
|
readonly startControlSession: (request: FastifyRequest<{
|
|
@@ -235,6 +264,13 @@ export declare class ButlerController {
|
|
|
235
264
|
readonly sendControlMessage: (request: FastifyRequest<{
|
|
236
265
|
Body: SendButlerControlMessageBody;
|
|
237
266
|
}>, reply: FastifyReply) => Promise<void>;
|
|
267
|
+
readonly createControlTimer: (request: FastifyRequest<{
|
|
268
|
+
Body: CreateButlerControlTimerBody;
|
|
269
|
+
}>, reply: FastifyReply) => Promise<void>;
|
|
270
|
+
readonly cancelControlTimer: (request: FastifyRequest<{
|
|
271
|
+
Params: ButlerControlTimerParams;
|
|
272
|
+
Body: CancelButlerControlTimerBody;
|
|
273
|
+
}>, reply: FastifyReply) => Promise<void>;
|
|
238
274
|
readonly getOverview: (request: FastifyRequest, reply: FastifyReply) => Promise<void>;
|
|
239
275
|
readonly listInboxItems: (request: FastifyRequest<{
|
|
240
276
|
Querystring: ButlerInboxListQuery;
|
|
@@ -377,8 +413,12 @@ export declare class ButlerController {
|
|
|
377
413
|
Params: ButlerProjectParams;
|
|
378
414
|
Body: StartVerificationRunBody;
|
|
379
415
|
}>, reply: FastifyReply) => Promise<void>;
|
|
416
|
+
readonly cancelVerificationRun: (request: FastifyRequest<{
|
|
417
|
+
Params: ButlerVerificationParams;
|
|
418
|
+
}>, reply: FastifyReply) => Promise<void>;
|
|
380
419
|
readonly getVerificationRun: (request: FastifyRequest<{
|
|
381
420
|
Params: ButlerVerificationParams;
|
|
382
421
|
}>, reply: FastifyReply) => Promise<void>;
|
|
422
|
+
private requireControlTimerService;
|
|
383
423
|
}
|
|
384
424
|
export {};
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { AppError } from "../../shared/errors/app-error.js";
|
|
1
2
|
import { requireUserId } from "../preferences/common.js";
|
|
2
3
|
export class ButlerController {
|
|
3
4
|
butlerProfileService;
|
|
@@ -15,7 +16,8 @@ export class ButlerController {
|
|
|
15
16
|
patrolExecutionService;
|
|
16
17
|
verificationRunService;
|
|
17
18
|
butlerActionContextService;
|
|
18
|
-
|
|
19
|
+
butlerControlTimerService;
|
|
20
|
+
constructor(butlerProfileService, butlerControlSessionService, butlerControlActionService, butlerContextAggregator, butlerFollowUpService, butlerInboxService, butlerNotificationService, butlerProjectService, butlerSessionService, projectMemoryService, patrolPlanService, patrolRunService, patrolExecutionService, verificationRunService, butlerActionContextService, butlerControlTimerService) {
|
|
19
21
|
this.butlerProfileService = butlerProfileService;
|
|
20
22
|
this.butlerControlSessionService = butlerControlSessionService;
|
|
21
23
|
this.butlerControlActionService = butlerControlActionService;
|
|
@@ -31,6 +33,7 @@ export class ButlerController {
|
|
|
31
33
|
this.patrolExecutionService = patrolExecutionService;
|
|
32
34
|
this.verificationRunService = verificationRunService;
|
|
33
35
|
this.butlerActionContextService = butlerActionContextService;
|
|
36
|
+
this.butlerControlTimerService = butlerControlTimerService;
|
|
34
37
|
}
|
|
35
38
|
getProfile = async (_request, reply) => {
|
|
36
39
|
const profile = this.butlerProfileService.getProfile();
|
|
@@ -68,6 +71,21 @@ export class ButlerController {
|
|
|
68
71
|
controlSession: this.butlerControlSessionService.getSession(request.params.controlSessionId, requireUserId(request))
|
|
69
72
|
});
|
|
70
73
|
};
|
|
74
|
+
listControlTimers = async (request, reply) => {
|
|
75
|
+
reply.send({
|
|
76
|
+
items: this.requireControlTimerService().listTimers({
|
|
77
|
+
userId: requireUserId(request),
|
|
78
|
+
statuses: request.query.status ? [request.query.status] : undefined,
|
|
79
|
+
controlSessionId: request.query.controlSessionId?.trim() || null,
|
|
80
|
+
limit: normalizePositiveInteger(request.query.limit)
|
|
81
|
+
})
|
|
82
|
+
});
|
|
83
|
+
};
|
|
84
|
+
getControlTimer = async (request, reply) => {
|
|
85
|
+
reply.send({
|
|
86
|
+
timer: this.requireControlTimerService().getTimer(request.params.timerId, requireUserId(request))
|
|
87
|
+
});
|
|
88
|
+
};
|
|
71
89
|
listControlSessionEvents = async (_request, reply) => {
|
|
72
90
|
reply.send({
|
|
73
91
|
items: this.butlerControlActionService.listCurrentEvents()
|
|
@@ -89,6 +107,25 @@ export class ButlerController {
|
|
|
89
107
|
sendControlMessage = async (request, reply) => {
|
|
90
108
|
reply.status(202).send(await this.butlerControlSessionService.sendMessage(requireUserId(request), request.body ?? {}));
|
|
91
109
|
};
|
|
110
|
+
createControlTimer = async (request, reply) => {
|
|
111
|
+
reply.status(201).send({
|
|
112
|
+
timer: this.requireControlTimerService().createTimer({
|
|
113
|
+
userId: requireUserId(request),
|
|
114
|
+
controlSessionId: request.body.controlSessionId,
|
|
115
|
+
projectId: request.body.projectId,
|
|
116
|
+
targetSessionId: request.body.targetSessionId,
|
|
117
|
+
title: request.body.title,
|
|
118
|
+
content: request.body.content ?? "",
|
|
119
|
+
dueAt: request.body.dueAt,
|
|
120
|
+
afterSeconds: request.body.afterSeconds
|
|
121
|
+
})
|
|
122
|
+
});
|
|
123
|
+
};
|
|
124
|
+
cancelControlTimer = async (request, reply) => {
|
|
125
|
+
reply.send({
|
|
126
|
+
timer: this.requireControlTimerService().cancelTimer(request.params.timerId, requireUserId(request))
|
|
127
|
+
});
|
|
128
|
+
};
|
|
92
129
|
getOverview = async (request, reply) => {
|
|
93
130
|
reply.send({
|
|
94
131
|
overview: await this.butlerContextAggregator.getOverview(requireUserId(request))
|
|
@@ -127,7 +164,7 @@ export class ButlerController {
|
|
|
127
164
|
});
|
|
128
165
|
};
|
|
129
166
|
cancelFollowUpTask = async (request, reply) => {
|
|
130
|
-
const task = this.butlerFollowUpService.cancelTask(request.params.taskId, requireUserId(request));
|
|
167
|
+
const task = await this.butlerFollowUpService.cancelTask(request.params.taskId, requireUserId(request));
|
|
131
168
|
this.butlerActionContextService?.invalidateSessionActionContext(task.sessionId);
|
|
132
169
|
reply.send({
|
|
133
170
|
task
|
|
@@ -236,6 +273,9 @@ export class ButlerController {
|
|
|
236
273
|
sessionId,
|
|
237
274
|
limit: 1
|
|
238
275
|
})[0] ?? null;
|
|
276
|
+
const latestVerificationRun = this.verificationRunService
|
|
277
|
+
.listRuns(project.id)
|
|
278
|
+
.find((run) => run.butlerSessionId === target.session.id) ?? null;
|
|
239
279
|
reply.send({
|
|
240
280
|
context: {
|
|
241
281
|
workspaceId: target.workspaceId,
|
|
@@ -248,7 +288,8 @@ export class ButlerController {
|
|
|
248
288
|
riskLevel: project.riskLevel
|
|
249
289
|
},
|
|
250
290
|
session: target.session,
|
|
251
|
-
latestFollowUpTask
|
|
291
|
+
latestFollowUpTask,
|
|
292
|
+
latestVerificationRun
|
|
252
293
|
}
|
|
253
294
|
});
|
|
254
295
|
};
|
|
@@ -278,16 +319,18 @@ export class ButlerController {
|
|
|
278
319
|
});
|
|
279
320
|
};
|
|
280
321
|
startVerificationAction = async (request, reply) => {
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
spec: request.body.spec
|
|
289
|
-
})
|
|
322
|
+
const result = await this.butlerControlActionService.startVerification({
|
|
323
|
+
projectId: request.body.projectId?.trim() ?? "",
|
|
324
|
+
verificationType: request.body.verificationType,
|
|
325
|
+
targetRef: request.body.targetRef?.trim() || null,
|
|
326
|
+
butlerSessionId: request.body.butlerSessionId?.trim() || null,
|
|
327
|
+
sourcePatrolRunId: request.body.sourcePatrolRunId?.trim() || null,
|
|
328
|
+
spec: request.body.spec
|
|
290
329
|
});
|
|
330
|
+
if (result.run.butlerSessionId) {
|
|
331
|
+
this.butlerActionContextService?.invalidateSessionActionContext(result.run.butlerSessionId);
|
|
332
|
+
}
|
|
333
|
+
reply.status(201).send({ result });
|
|
291
334
|
};
|
|
292
335
|
listProjects = async (request, reply) => {
|
|
293
336
|
reply.send({
|
|
@@ -485,10 +528,34 @@ export class ButlerController {
|
|
|
485
528
|
});
|
|
486
529
|
reply.status(201).send({ run });
|
|
487
530
|
};
|
|
531
|
+
cancelVerificationRun = async (request, reply) => {
|
|
532
|
+
const run = this.verificationRunService.cancelRun(request.params.projectId, request.params.verificationId);
|
|
533
|
+
if (run.butlerSessionId) {
|
|
534
|
+
this.butlerActionContextService?.invalidateSessionActionContext(run.butlerSessionId);
|
|
535
|
+
}
|
|
536
|
+
reply.send({ run });
|
|
537
|
+
};
|
|
488
538
|
getVerificationRun = async (request, reply) => {
|
|
489
539
|
reply.send({
|
|
490
540
|
run: this.verificationRunService.getRun(request.params.projectId, request.params.verificationId)
|
|
491
541
|
});
|
|
492
542
|
};
|
|
543
|
+
requireControlTimerService() {
|
|
544
|
+
if (!this.butlerControlTimerService) {
|
|
545
|
+
throw new AppError({
|
|
546
|
+
statusCode: 501,
|
|
547
|
+
errorCode: "BUTLER_CONTROL_TIMER_SERVICE_UNAVAILABLE",
|
|
548
|
+
detail: "当前实例尚未启用助手计时器服务"
|
|
549
|
+
});
|
|
550
|
+
}
|
|
551
|
+
return this.butlerControlTimerService;
|
|
552
|
+
}
|
|
553
|
+
}
|
|
554
|
+
function normalizePositiveInteger(value) {
|
|
555
|
+
if (!value?.trim()) {
|
|
556
|
+
return undefined;
|
|
557
|
+
}
|
|
558
|
+
const parsed = Number.parseInt(value, 10);
|
|
559
|
+
return Number.isFinite(parsed) && parsed > 0 ? parsed : undefined;
|
|
493
560
|
}
|
|
494
561
|
//# sourceMappingURL=butler-controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"butler-controller.js","sourceRoot":"","sources":["../../../../src/modules/butler/butler-controller.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"butler-controller.js","sourceRoot":"","sources":["../../../../src/modules/butler/butler-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import type { ButlerProject, SessionRunningState } from "../../types/domain.js";
|
|
2
|
-
export type ButlerFollowUpEvaluationDecision = "continue" | "waiting_user" | "completed" | "failed";
|
|
3
2
|
export interface ButlerFollowUpEvaluationInstructionEnvelope {
|
|
4
3
|
providerId: "codex" | "claude-code";
|
|
5
4
|
outputContractVersion: string;
|
|
@@ -13,10 +12,12 @@ export interface ButlerFollowUpEvaluationInstructionEnvelope {
|
|
|
13
12
|
};
|
|
14
13
|
}
|
|
15
14
|
export interface BuildButlerFollowUpEvaluationInstructionInput {
|
|
15
|
+
taskId: string;
|
|
16
16
|
providerId: "codex" | "claude-code";
|
|
17
17
|
project: ButlerProject;
|
|
18
18
|
sessionId: string;
|
|
19
19
|
butlerSessionId: string;
|
|
20
|
+
assistantSessionId: string;
|
|
20
21
|
sessionTitle: string | null;
|
|
21
22
|
objective: string;
|
|
22
23
|
completionCriteria: string;
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
const OUTPUT_CONTRACT_VERSION = "butler-follow-up-
|
|
1
|
+
const OUTPUT_CONTRACT_VERSION = "butler-follow-up-cli-v1";
|
|
2
2
|
export class ButlerFollowUpEvaluationInstructionAdapter {
|
|
3
3
|
buildInstruction(input) {
|
|
4
4
|
const transcript = input.transcriptLines.length > 0
|
|
5
5
|
? input.transcriptLines.join("\n")
|
|
6
6
|
: "- 最近没有可用消息,请保守判断,并明确说明缺口。";
|
|
7
7
|
const prompt = [
|
|
8
|
-
"
|
|
8
|
+
"你现在是在真实助手会话里执行的专用跟进助手,不负责和用户闲聊,也不负责直接开发当前仓库。",
|
|
9
9
|
"你的唯一职责是判断:当前开发会话是否已经真正完成用户目标,是否必须等用户决定,还是应该继续自动推动。",
|
|
10
10
|
"禁止用套话凑结论,禁止只看最后一句就草率下判断。要结合目标、当前运行态和最近消息整体判断。",
|
|
11
11
|
"如果目标或上下文里提到了 spec,完成标准只能按 spec 明确要求的必做项判断。",
|
|
@@ -14,25 +14,33 @@ export class ButlerFollowUpEvaluationInstructionAdapter {
|
|
|
14
14
|
"除非目标本身明确要求,否则重构、补测试、补体验优化、顺手整理代码都不是必须完成条件。",
|
|
15
15
|
"如果信息不足,可以明确说信息不足;但只有在真的缺关键决策信息时,才返回 waiting_user。",
|
|
16
16
|
"如果已经达到预设的自动推进轮数上限,你不能再通过新增目标来继续扩会话范围。",
|
|
17
|
+
"你可以直接调用 codingns assistant CLI 检查项目和目标会话状态。",
|
|
18
|
+
"这一轮的正式结论必须通过 `codingns assistant follow-ups.*` 命令回写到跟进任务,而不是输出 JSON 让 Host 猜。",
|
|
19
|
+
"只要决定继续推进,就必须先用 `codingns assistant sessions send` 把中文跟进消息发到目标开发会话,再用 `codingns assistant follow-ups continue` 回写。",
|
|
20
|
+
"如果决定等待用户,就使用 `codingns assistant follow-ups waiting-user`。",
|
|
21
|
+
"如果决定已经完成,就使用 `codingns assistant follow-ups complete`。",
|
|
22
|
+
"如果上下文损坏或确实无法可靠继续,就使用 `codingns assistant follow-ups fail`。",
|
|
17
23
|
"",
|
|
18
24
|
"判断标准:",
|
|
19
|
-
"1.
|
|
20
|
-
"2.
|
|
21
|
-
"3.
|
|
22
|
-
"4.
|
|
25
|
+
"1. 只有目标已经实质完成,而且满足预设结束条件,才调用 complete;不能把建议项没做当成未完成。",
|
|
26
|
+
"2. 只有确实需要用户做选择、补业务信息、确认高风险操作,或者已经达到自动推进轮数上限时,才调用 waiting-user。",
|
|
27
|
+
"3. 只要目标还没完成、而且继续推进不会越权,就先发消息到目标开发会话,再调用 continue。",
|
|
28
|
+
"4. 只有当前上下文已经无法可靠判断,或者会话明显坏掉到无法继续时,才调用 fail。",
|
|
23
29
|
"",
|
|
24
|
-
"
|
|
30
|
+
"执行要求:",
|
|
25
31
|
"- 全部使用中文。",
|
|
26
|
-
"-
|
|
27
|
-
"-
|
|
28
|
-
"-
|
|
29
|
-
"-
|
|
30
|
-
"-
|
|
32
|
+
"- 先自己检查当前项目、目标会话、跟进任务,再决定动作。",
|
|
33
|
+
"- 不要把命令建议写成自然语言结论后就停下,必须真的执行命令。",
|
|
34
|
+
"- 如果走 continue,`--continue-prompt` 必须回填你刚刚已经发到目标开发会话的那条中文消息原文。",
|
|
35
|
+
"- `--summary` 要写本轮结构化结论,后端会把它直接写入跟进任务。",
|
|
36
|
+
"- 命令执行完成后,你可以再补 1 到 2 句中文说明,但这段说明不是结构化结果来源。",
|
|
31
37
|
"",
|
|
38
|
+
`跟进任务 ID:${input.taskId}`,
|
|
32
39
|
`项目名称:${input.project.name}`,
|
|
33
40
|
`项目路径:${input.project.repoRoot}`,
|
|
34
41
|
`代码助手会话 ID:${input.butlerSessionId}`,
|
|
35
42
|
`真实会话 ID:${input.sessionId}`,
|
|
43
|
+
`当前跟进助手会话 ID:${input.assistantSessionId}`,
|
|
36
44
|
`会话标题:${input.sessionTitle ?? "未命名会话"}`,
|
|
37
45
|
`用户目标:${input.objective}`,
|
|
38
46
|
`预设结束条件:${input.completionCriteria}`,
|
|
@@ -45,20 +53,14 @@ export class ButlerFollowUpEvaluationInstructionAdapter {
|
|
|
45
53
|
`上一轮自动化摘要:${input.lastAutomationSummary?.trim() || "无"}`,
|
|
46
54
|
`最近一条助手结论:${input.latestAssistantText?.trim() || "无"}`,
|
|
47
55
|
"",
|
|
48
|
-
"
|
|
49
|
-
|
|
56
|
+
"命令模板:",
|
|
57
|
+
`- 继续推进:codingns assistant sessions send ${input.sessionId} --message \"<你刚发给目标会话的中文消息>\" && codingns assistant follow-ups continue ${input.taskId} --summary \"<本轮结论>\" --continue-prompt \"<同一条消息原文>\"`,
|
|
58
|
+
`- 等待用户:codingns assistant follow-ups waiting-user ${input.taskId} --summary \"<本轮结论>\" --waiting-reason \"<必须等用户的原因>\"`,
|
|
59
|
+
`- 已完成:codingns assistant follow-ups complete ${input.taskId} --summary \"<完成结论>\"`,
|
|
60
|
+
`- 失败:codingns assistant follow-ups fail ${input.taskId} --summary \"<失败结论>\" --reason \"<失败原因>\"`,
|
|
50
61
|
"",
|
|
51
|
-
"
|
|
52
|
-
|
|
53
|
-
JSON.stringify({
|
|
54
|
-
decision: "continue",
|
|
55
|
-
summary: "一句中文结论",
|
|
56
|
-
waitingReason: null,
|
|
57
|
-
continuePrompt: "继续未完成的开发工作,先核对当前目标还有哪些没做完,然后直接补齐,不要只做总结。",
|
|
58
|
-
riskLevel: "medium"
|
|
59
|
-
}, null, 2),
|
|
60
|
-
"```",
|
|
61
|
-
"riskLevel 只能是 low / medium / high。"
|
|
62
|
+
"最近消息摘录:",
|
|
63
|
+
transcript
|
|
62
64
|
].join("\n");
|
|
63
65
|
return {
|
|
64
66
|
providerId: input.providerId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"butler-follow-up-evaluation-instruction-adapter.js","sourceRoot":"","sources":["../../../../src/modules/butler/butler-follow-up-evaluation-instruction-adapter.ts"],"names":[],"mappings":"AAEA,MAAM,uBAAuB,GAAG,
|
|
1
|
+
{"version":3,"file":"butler-follow-up-evaluation-instruction-adapter.js","sourceRoot":"","sources":["../../../../src/modules/butler/butler-follow-up-evaluation-instruction-adapter.ts"],"names":[],"mappings":"AAEA,MAAM,uBAAuB,GAAG,yBAAyB,CAAC;AAmC1D,MAAM,OAAO,0CAA0C;IACrD,gBAAgB,CACd,KAAoD;QAEpD,MAAM,UAAU,GACd,KAAK,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC;YAC9B,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC;YAClC,CAAC,CAAC,2BAA2B,CAAC;QAClC,MAAM,MAAM,GAAG;YACb,8CAA8C;YAC9C,oDAAoD;YACpD,+CAA+C;YAC/C,4CAA4C;YAC5C,6CAA6C;YAC7C,oDAAoD;YACpD,4CAA4C;YAC5C,mDAAmD;YACnD,uCAAuC;YACvC,6CAA6C;YAC7C,+EAA+E;YAC/E,mHAAmH;YACnH,4DAA4D;YAC5D,wDAAwD;YACxD,4DAA4D;YAC5D,EAAE;YACF,OAAO;YACP,sDAAsD;YACtD,gEAAgE;YAChE,mDAAmD;YACnD,6CAA6C;YAC7C,EAAE;YACF,OAAO;YACP,WAAW;YACX,8BAA8B;YAC9B,iCAAiC;YACjC,gEAAgE;YAChE,wCAAwC;YACxC,6CAA6C;YAC7C,EAAE;YACF,WAAW,KAAK,CAAC,MAAM,EAAE;YACzB,QAAQ,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE;YAC5B,QAAQ,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE;YAChC,aAAa,KAAK,CAAC,eAAe,EAAE;YACpC,WAAW,KAAK,CAAC,SAAS,EAAE;YAC5B,eAAe,KAAK,CAAC,kBAAkB,EAAE;YACzC,QAAQ,KAAK,CAAC,YAAY,IAAI,OAAO,EAAE;YACvC,QAAQ,KAAK,CAAC,SAAS,EAAE;YACzB,UAAU,KAAK,CAAC,kBAAkB,EAAE;YACpC,SAAS,KAAK,CAAC,YAAY,IAAI,IAAI,EAAE;YACrC,SAAS,KAAK,CAAC,YAAY,EAAE;YAC7B,UAAU,KAAK,CAAC,aAAa,IAAI,IAAI,EAAE;YACvC,YAAY,KAAK,CAAC,iBAAiB,EAAE;YACrC,cAAc,KAAK,CAAC,oBAAoB,EAAE;YAC1C,YAAY,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAoB,GAAG,KAAK,CAAC,iBAAiB,EAAE,CAAC,CAAC,EAAE;YAC/E,YAAY,KAAK,CAAC,qBAAqB,EAAE,IAAI,EAAE,IAAI,GAAG,EAAE;YACxD,YAAY,KAAK,CAAC,mBAAmB,EAAE,IAAI,EAAE,IAAI,GAAG,EAAE;YACtD,EAAE;YACF,OAAO;YACP,2CAA2C,KAAK,CAAC,SAAS,4EAA4E,KAAK,CAAC,MAAM,uDAAuD;YACzM,qDAAqD,KAAK,CAAC,MAAM,uDAAuD;YACxH,gDAAgD,KAAK,CAAC,MAAM,uBAAuB;YACnF,2CAA2C,KAAK,CAAC,MAAM,2CAA2C;YAClG,EAAE;YACF,SAAS;YACT,UAAU;SACX,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEb,OAAO;YACL,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,qBAAqB,EAAE,uBAAuB;YAC9C,MAAM;YACN,QAAQ,EAAE;gBACR,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE;gBAC3B,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI;gBAC/B,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,eAAe,EAAE,KAAK,CAAC,eAAe;gBACtC,mBAAmB,EAAE,KAAK,CAAC,eAAe,CAAC,MAAM;aAClD;SACF,CAAC;IACJ,CAAC;CACF"}
|