@waq666/pneuma 0.7.1 → 0.8.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +242 -206
- package/bin/dsc.js +9 -3
- package/bin/headless.cjs +1 -1
- package/lib/adapter/transcript.d.ts +19 -2
- package/lib/adapter/transcript.js +71 -14
- package/lib/app/AgentsOverlay.js +7 -6
- package/lib/app/App.js +1 -1
- package/lib/app/ApprovalCard.js +15 -9
- package/lib/app/ChatView.d.ts +3 -1
- package/lib/app/ChatView.js +21 -17
- package/lib/app/Composer.js +22 -4
- package/lib/app/MarkdownView.js +2 -1
- package/lib/app/ModelPicker.js +7 -6
- package/lib/app/PickerFrame.d.ts +4 -0
- package/lib/app/PickerFrame.js +18 -0
- package/lib/app/PlanReviewCard.js +2 -1
- package/lib/app/PresetPicker.js +8 -7
- package/lib/app/SessionPicker.js +21 -20
- package/lib/app/SettingsOverlay.js +1 -1
- package/lib/app/SkillsPicker.js +7 -6
- package/lib/app/StatusBar.js +3 -15
- package/lib/app/TaskStrips.js +1 -4
- package/lib/app/TimelineRail.js +2 -1
- package/lib/app/ToolCard.js +2 -6
- package/lib/app/Welcome.d.ts +1 -0
- package/lib/app/Welcome.js +1 -4
- package/lib/app/click.d.ts +0 -2
- package/lib/app/click.js +2 -21
- package/lib/app/display-width.d.ts +16 -0
- package/lib/app/display-width.js +33 -0
- package/lib/app/markdown.d.ts +1 -3
- package/lib/app/markdown.js +2 -19
- package/lib/app/scroll-model.js +1 -1
- package/lib/contract/approval.d.ts +91 -0
- package/lib/contract/approval.js +1 -0
- package/lib/contract/mode.d.ts +69 -0
- package/lib/contract/mode.js +1 -0
- package/lib/contract/plugin.d.ts +240 -0
- package/lib/contract/plugin.js +1 -0
- package/lib/contract/runtime.d.ts +282 -0
- package/lib/contract/runtime.js +1 -0
- package/lib/contract/session.d.ts +208 -0
- package/lib/contract/session.js +36 -0
- package/lib/contract/settings.d.ts +242 -0
- package/lib/contract/settings.js +1 -0
- package/lib/contract/snapshot.d.ts +453 -0
- package/lib/contract/snapshot.js +1 -0
- package/lib/contract/task.d.ts +189 -0
- package/lib/contract/task.js +10 -0
- package/lib/contract/transcript.d.ts +358 -0
- package/lib/contract/transcript.js +1 -0
- package/lib/contract/usage.d.ts +132 -0
- package/lib/contract/usage.js +10 -0
- package/lib/contract.d.ts +20 -1968
- package/lib/contract.js +19 -30
- package/lib/core/agent-roles.d.ts +1 -1
- package/lib/core/agent-roles.js +6 -5
- package/lib/core/approval-floor.d.ts +9 -0
- package/lib/core/approval-floor.js +152 -25
- package/lib/core/attachments.d.ts +185 -0
- package/lib/core/attachments.js +425 -0
- package/lib/core/bytes.d.ts +14 -0
- package/lib/core/bytes.js +28 -0
- package/lib/core/call-meaning.d.ts +20 -0
- package/lib/core/call-meaning.js +347 -0
- package/lib/core/cdp/actions.js +6 -0
- package/lib/core/cdp/launch.js +2 -2
- package/lib/core/cdp/report.d.ts +27 -0
- package/lib/core/cdp/report.js +50 -0
- package/lib/core/cdp/ring-buffer.d.ts +25 -0
- package/lib/core/cdp/ring-buffer.js +44 -0
- package/lib/core/cdp/snapshot.js +5 -9
- package/lib/core/cdp/transport.js +1 -1
- package/lib/core/clamp.d.ts +20 -0
- package/lib/core/clamp.js +24 -0
- package/lib/core/clock.d.ts +16 -0
- package/lib/core/clock.js +20 -0
- package/lib/core/command-policy.js +33 -1
- package/lib/core/commands-completion.d.ts +28 -0
- package/lib/core/commands-completion.js +108 -30
- package/lib/core/compact.d.ts +36 -6
- package/lib/core/compact.js +89 -17
- package/lib/core/desktop-control.js +1 -3
- package/lib/core/dsh-compat/llm-usage-event.d.ts +78 -0
- package/lib/core/dsh-compat/llm-usage-event.js +91 -0
- package/lib/core/dsh-compat/presentation.d.ts +84 -0
- package/lib/core/dsh-compat/presentation.js +105 -0
- package/lib/core/dsh-compat/resolve-hook.d.ts +3 -3
- package/lib/core/dsh-compat/resolve-hook.js +41 -13
- package/lib/core/dsh-compat/service-map.d.ts +52 -0
- package/lib/core/dsh-compat/service-map.js +87 -0
- package/lib/core/dsh-compat/session-bridge.d.ts +107 -0
- package/lib/core/dsh-compat/session-bridge.js +376 -0
- package/lib/core/dsh-compat/session-events.d.ts +54 -0
- package/lib/core/dsh-compat/session-events.js +297 -0
- package/lib/core/dsh-compat/shims/credentials.d.ts +62 -0
- package/lib/core/dsh-compat/shims/credentials.js +86 -0
- package/lib/core/dsh-compat/shims/home-paths.d.ts +77 -0
- package/lib/core/dsh-compat/shims/home-paths.js +143 -0
- package/lib/core/dsh-compat/tools-facade.d.ts +31 -1
- package/lib/core/dsh-compat/tools-facade.js +207 -3
- package/lib/core/err-text.d.ts +5 -0
- package/lib/core/err-text.js +5 -0
- package/lib/core/events.d.ts +31 -2
- package/lib/core/git-info.d.ts +127 -15
- package/lib/core/git-info.js +315 -34
- package/lib/core/git-surface.d.ts +17 -0
- package/lib/core/git-surface.js +7 -0
- package/lib/core/hooks.d.ts +19 -2
- package/lib/core/hooks.js +57 -13
- package/lib/core/host-methods.d.ts +1 -1
- package/lib/core/host-methods.js +4 -0
- package/lib/core/image-diet.js +1 -4
- package/lib/core/json-text.d.ts +11 -0
- package/lib/core/json-text.js +18 -0
- package/lib/core/learnings/skill-write.d.ts +1 -7
- package/lib/core/learnings/skill-write.js +3 -37
- package/lib/core/lifecycle-hooks.d.ts +11 -3
- package/lib/core/lifecycle-hooks.js +33 -42
- package/lib/core/llm.d.ts +42 -0
- package/lib/core/llm.js +40 -25
- package/lib/core/loop.d.ts +11 -1
- package/lib/core/loop.js +95 -28
- package/lib/core/lsp/client.js +30 -17
- package/lib/core/lsp/normalize.d.ts +0 -2
- package/lib/core/lsp/normalize.js +1 -6
- package/lib/core/lsp/servers.js +1 -4
- package/lib/core/mcp.d.ts +18 -0
- package/lib/core/mcp.js +60 -16
- package/lib/core/microcompact.d.ts +45 -0
- package/lib/core/microcompact.js +128 -0
- package/lib/core/native-bridge.js +2 -10
- package/lib/core/path-policy.d.ts +13 -1
- package/lib/core/path-policy.js +87 -18
- package/lib/core/permission-presets.d.ts +9 -5
- package/lib/core/permission-presets.js +14 -7
- package/lib/core/permission-scope.d.ts +65 -0
- package/lib/core/permission-scope.js +109 -0
- package/lib/core/plugin-bundle.d.ts +95 -0
- package/lib/core/plugin-bundle.js +137 -0
- package/lib/core/plugin-loader.d.ts +36 -1
- package/lib/core/plugin-loader.js +336 -12
- package/lib/core/plugin-patch.d.ts +64 -0
- package/lib/core/plugin-patch.js +146 -0
- package/lib/core/plugin-registry.d.ts +14 -0
- package/lib/core/plugin-registry.js +2 -0
- package/lib/core/prefs.js +40 -2
- package/lib/core/presets.d.ts +11 -0
- package/lib/core/presets.js +61 -22
- package/lib/core/profile-dir.d.ts +5 -0
- package/lib/core/profile-dir.js +40 -0
- package/lib/core/prompt.js +55 -19
- package/lib/core/ptc.d.ts +8 -2
- package/lib/core/ptc.js +18 -4
- package/lib/core/records.d.ts +16 -0
- package/lib/core/records.js +22 -0
- package/lib/core/remote/notify.js +1 -3
- package/lib/core/remote/push.js +2 -6
- package/lib/core/sandbox/execpolicy.js +27 -3
- package/lib/core/sandbox/net-proxy.js +2 -2
- package/lib/core/sandbox/policy.d.ts +1 -1
- package/lib/core/sandbox/policy.js +21 -15
- package/lib/core/sandbox/win/account.js +1 -4
- package/lib/core/sandbox/win/acl.js +1 -6
- package/lib/core/sandbox/win/backend.d.ts +24 -3
- package/lib/core/sandbox/win/backend.js +73 -23
- package/lib/core/sandbox/win/doctor.js +1 -4
- package/lib/core/sandbox/win/runner-entry.js +1 -6
- package/lib/core/sandbox/win/setup.js +1 -4
- package/lib/core/sandbox/win/utf16.d.ts +11 -0
- package/lib/core/sandbox/win/utf16.js +15 -0
- package/lib/core/sandbox/win/wfp.js +1 -4
- package/lib/core/schedule/rule.d.ts +0 -17
- package/lib/core/schedule/rule.js +1 -3
- package/lib/core/schedule/runner.d.ts +5 -2
- package/lib/core/schedule/runner.js +32 -9
- package/lib/core/schedule/store.d.ts +0 -2
- package/lib/core/schedule/store.js +2 -9
- package/lib/core/session-index.d.ts +50 -0
- package/lib/core/session-index.js +169 -3
- package/lib/core/session.d.ts +89 -13
- package/lib/core/session.js +385 -32
- package/lib/core/shell-quote.d.ts +21 -0
- package/lib/core/shell-quote.js +24 -0
- package/lib/core/side-ask.d.ts +52 -0
- package/lib/core/side-ask.js +89 -0
- package/lib/core/skills.d.ts +16 -0
- package/lib/core/skills.js +45 -8
- package/lib/core/snapshot-throttle.d.ts +8 -0
- package/lib/core/snapshot-throttle.js +24 -0
- package/lib/core/spill.d.ts +11 -5
- package/lib/core/spill.js +35 -36
- package/lib/core/strings.d.ts +21 -0
- package/lib/core/strings.js +33 -0
- package/lib/core/terminal-env.d.ts +61 -0
- package/lib/core/terminal-env.js +327 -0
- package/lib/core/text-format.d.ts +17 -0
- package/lib/core/text-format.js +26 -0
- package/lib/core/todo-reminder.d.ts +19 -14
- package/lib/core/todo-reminder.js +14 -23
- package/lib/core/token-estimate.d.ts +18 -2
- package/lib/core/token-estimate.js +10 -2
- package/lib/core/tool-result-prune.d.ts +42 -0
- package/lib/core/tool-result-prune.js +47 -0
- package/lib/core/tool-search.d.ts +3 -2
- package/lib/core/tool-search.js +3 -2
- package/lib/core/tools/bash.d.ts +35 -3
- package/lib/core/tools/bash.js +168 -41
- package/lib/core/tools/fs-tools.js +18 -17
- package/lib/core/tools/image-tool.d.ts +2 -0
- package/lib/core/tools/image-tool.js +59 -0
- package/lib/core/tools/path-args.d.ts +4 -0
- package/lib/core/tools/path-args.js +22 -0
- package/lib/core/tools/search-tools.d.ts +30 -0
- package/lib/core/tools/search-tools.js +321 -34
- package/lib/core/tools.d.ts +82 -0
- package/lib/core/tools.js +21 -0
- package/lib/core/transcript-text.d.ts +19 -0
- package/lib/core/transcript-text.js +44 -0
- package/lib/core/ui-boot-source.d.ts +5 -0
- package/lib/core/ui-boot-source.js +10 -3
- package/lib/core/ui-bundles.d.ts +80 -6
- package/lib/core/ui-bundles.js +700 -76
- package/lib/core/ui-events.d.ts +10 -0
- package/lib/core/ui-events.js +25 -0
- package/lib/core/ui-methods.d.ts +1 -1
- package/lib/core/ui-methods.js +42 -13
- package/lib/core/ui-route.js +11 -7
- package/lib/core/ui-server.d.ts +6 -0
- package/lib/core/ui-server.js +106 -1
- package/lib/core/unified-diff.d.ts +35 -0
- package/lib/core/unified-diff.js +86 -0
- package/lib/core/usage-log.js +39 -0
- package/lib/core/web-http.d.ts +1 -1
- package/lib/core/web-http.js +1 -3
- package/lib/host/kernel.js +57 -41
- package/lib/plugins/agent.js +101 -20
- package/lib/plugins/approval-floor.js +12 -8
- package/lib/plugins/approval.js +252 -80
- package/lib/plugins/ask.js +60 -8
- package/lib/plugins/browser.js +32 -84
- package/lib/plugins/commands.js +167 -57
- package/lib/plugins/compact.d.ts +2 -2
- package/lib/plugins/compact.js +200 -30
- package/lib/plugins/computer-use.js +34 -18
- package/lib/plugins/dock-browser.js +24 -65
- package/lib/plugins/dsh-compat.js +7 -0
- package/lib/plugins/file-review.js +59 -15
- package/lib/plugins/git.js +16 -8
- package/lib/plugins/goal.js +9 -8
- package/lib/plugins/hooks.js +4 -2
- package/lib/plugins/host-stdio.js +14 -16
- package/lib/plugins/lifecycle-hooks.d.ts +5 -4
- package/lib/plugins/lifecycle-hooks.js +12 -10
- package/lib/plugins/llm.js +74 -33
- package/lib/plugins/lsp.js +22 -27
- package/lib/plugins/mcp.js +16 -17
- package/lib/plugins/memory.js +3 -24
- package/lib/plugins/microcompact.d.ts +4 -1
- package/lib/plugins/microcompact.js +117 -19
- package/lib/plugins/mode.js +30 -11
- package/lib/plugins/permission-presets.d.ts +2 -1
- package/lib/plugins/permission-presets.js +55 -35
- package/lib/plugins/plugin-manager.js +4 -6
- package/lib/plugins/presets.js +56 -27
- package/lib/plugins/prompt.js +54 -11
- package/lib/plugins/ptc.d.ts +13 -0
- package/lib/plugins/ptc.js +121 -24
- package/lib/plugins/remote/types.d.ts +1 -1
- package/lib/plugins/remote/types.js +11 -0
- package/lib/plugins/remote.js +14 -15
- package/lib/plugins/runtime.js +91 -14
- package/lib/plugins/sandbox.js +181 -60
- package/lib/plugins/schedule.js +12 -11
- package/lib/plugins/self-improve.js +28 -18
- package/lib/plugins/session-search.js +18 -13
- package/lib/plugins/session-title.js +1 -1
- package/lib/plugins/session.js +103 -25
- package/lib/plugins/settings.js +16 -40
- package/lib/plugins/skills.js +18 -1
- package/lib/plugins/spill.js +18 -11
- package/lib/plugins/subagent.js +208 -42
- package/lib/plugins/team.js +11 -5
- package/lib/plugins/todo.d.ts +1 -1
- package/lib/plugins/todo.js +25 -19
- package/lib/plugins/tool-search.js +47 -28
- package/lib/plugins/tools-default.js +89 -5
- package/lib/plugins/tools.js +3 -3
- package/lib/plugins/transcript.js +116 -9
- package/lib/plugins/web-search.d.ts +1 -1
- package/lib/plugins/web-search.js +25 -16
- package/lib/plugins/webserver.js +40 -7
- package/lib/remote/assets/app-B3Id1EBq.js +14 -0
- package/lib/remote/assets/index.html +2 -2
- package/lib/remote/assets/{style-DIB6729x.css → style-NtlpbKOI.css} +1 -1
- package/lib/services/types.d.ts +247 -29
- package/lib/tools/plugin-cli.d.ts +1 -0
- package/lib/tools/plugin-cli.js +209 -0
- package/lib/ui/assets/app-B-Jx5dnh.js +90 -0
- package/lib/ui/assets/{chunk-BajyYBss.js → chunk-Bfdlo8Me.js} +1 -1
- package/lib/ui/assets/chunk-DGX-i4eb.js +12 -0
- package/lib/ui/assets/index.html +62 -14
- package/lib/ui/assets/style-WzxwEPaE.css +1 -0
- package/lib/ui/frames.js +1 -3
- package/lib/ui/index.d.ts +30 -1
- package/lib/ui/index.js +29 -0
- package/lib/ui/manifest.d.ts +24 -6
- package/lib/ui/manifest.js +3 -2
- package/lib/ui/plugins/actions/bundle.json +8 -0
- package/lib/ui/plugins/actions/client.js +43 -0
- package/lib/ui/plugins/ask/bundle.json +8 -0
- package/lib/ui/plugins/ask/client.js +415 -0
- package/lib/ui/plugins/browser/bundle.json +8 -0
- package/lib/ui/plugins/composer/bundle.json +9 -0
- package/lib/ui/plugins/composer/client.js +1806 -1087
- package/lib/ui/plugins/files/bundle.json +8 -0
- package/lib/ui/plugins/files/client.js +13 -98
- package/lib/ui/plugins/manifest.json +1 -104
- package/lib/ui/plugins/palette/bundle.json +8 -0
- package/lib/ui/plugins/palette/client.js +360 -0
- package/lib/ui/plugins/plugins/bundle.json +8 -0
- package/lib/ui/plugins/plugins/client.js +116 -38
- package/lib/ui/plugins/preview/bundle.json +8 -0
- package/lib/ui/plugins/preview/client.js +6 -16
- package/lib/ui/plugins/prompt/bundle.json +8 -0
- package/lib/ui/plugins/prompt/client.js +81 -47
- package/lib/ui/plugins/sessions/bundle.json +8 -0
- package/lib/ui/plugins/sessions/client.js +157 -111
- package/lib/ui/plugins/settings/bundle.json +8 -0
- package/lib/ui/plugins/settings/client.js +184 -170
- package/lib/ui/plugins/skills/bundle.json +8 -0
- package/lib/ui/plugins/skills/client.js +161 -79
- package/lib/ui/plugins/status/bundle.json +8 -0
- package/lib/ui/plugins/status/client.js +165 -26
- package/lib/ui/plugins/statusbar/bundle.json +9 -0
- package/lib/ui/plugins/statusbar/client.js +100 -144
- package/lib/ui/plugins/tasks/bundle.json +8 -0
- package/lib/ui/plugins/team/bundle.json +8 -0
- package/lib/ui/plugins/team/client.js +60 -58
- package/lib/ui/plugins/terminal/bundle.json +8 -0
- package/lib/ui/plugins/terminal/client.js +1 -7
- package/lib/ui/plugins/trace/bundle.json +11 -0
- package/lib/ui/plugins/trace/client.js +86 -179
- package/lib/ui/plugins/transcript/bundle.json +8 -0
- package/lib/ui/plugins/transcript/client.js +1608 -1243
- package/lib/ui/sdk/@dsc/ui/index.d.ts +54 -16
- package/lib/ui/sdk/@dsc/ui/package.json +1 -1
- package/lib/ui/sdk/@dsc/ui-core/contract.d.ts +20 -1968
- package/lib/ui/sdk/@dsc/ui-core/core/attachments.d.ts +185 -0
- package/lib/ui/sdk/@dsc/ui-core/core/bytes.d.ts +14 -0
- package/lib/ui/sdk/@dsc/ui-core/core/err-text.d.ts +18 -0
- package/lib/ui/sdk/@dsc/ui-core/core/git-surface.d.ts +17 -0
- package/lib/ui/sdk/@dsc/ui-core/core/json-text.d.ts +11 -0
- package/lib/ui/sdk/@dsc/ui-core/core/path-policy.d.ts +44 -0
- package/lib/ui/sdk/@dsc/ui-core/core/records.d.ts +16 -0
- package/lib/ui/sdk/@dsc/ui-core/core/throughput.d.ts +46 -0
- package/lib/ui/sdk/@dsc/ui-core/core/token-estimate.d.ts +18 -2
- package/lib/ui/sdk/@dsc/ui-core/core/unified-diff.d.ts +35 -0
- package/lib/ui/sdk/@dsc/ui-core/package.json +1 -1
- package/lib/ui/sdk/@dsc/ui-core/ui/index.d.ts +30 -1
- package/lib/ui/sdk/@dsc/ui-core/ui/manifest.d.ts +24 -6
- package/lib/ui/sdk/@dsc/ui-core/ui/services.d.ts +19 -8
- package/lib/ui/sdk/@dsc/ui-core/ui/signal.d.ts +49 -0
- package/lib/ui/sdk/@dsc/ui-dockkit/dock-model.d.ts +17 -3
- package/lib/ui/sdk/@dsc/ui-dockkit/dock-state.d.ts +1 -1
- package/lib/ui/sdk/@dsc/ui-dockkit/package.json +1 -1
- package/lib/ui/sdk/@dsc/ui-layout/app.d.ts +4 -0
- package/lib/ui/sdk/@dsc/ui-layout/appearance.d.ts +6 -1
- package/lib/ui/sdk/@dsc/ui-layout/host-channel.d.ts +21 -0
- package/lib/ui/sdk/@dsc/ui-layout/index.d.ts +1 -0
- package/lib/ui/sdk/@dsc/ui-layout/package.json +1 -1
- package/lib/ui/sdk/@dsc/ui-layout/page-state.d.ts +1 -1
- package/lib/ui/sdk/@dsc/ui-layout/runtime-context.d.ts +10 -1
- package/lib/ui/sdk/@dsc/ui-layout/thread-view.d.ts +1 -1
- package/lib/ui/sdk/@dsc/ui-layout/usage-today.d.ts +11 -0
- package/lib/ui/sdk/@dsc/ui-primitives/dialog-focus.d.ts +30 -0
- package/lib/ui/sdk/@dsc/ui-primitives/error-text.d.ts +12 -0
- package/lib/ui/sdk/@dsc/ui-primitives/git-surface.d.ts +9 -0
- package/lib/ui/sdk/@dsc/ui-primitives/highlight.d.ts +23 -0
- package/lib/ui/sdk/@dsc/ui-primitives/humanize-error.d.ts +35 -0
- package/lib/ui/sdk/@dsc/ui-primitives/icons-workspace.d.ts +33 -0
- package/lib/ui/sdk/@dsc/ui-primitives/icons.d.ts +21 -3
- package/lib/ui/sdk/@dsc/ui-primitives/image-lightbox.d.ts +21 -0
- package/lib/ui/sdk/@dsc/ui-primitives/index.d.ts +16 -0
- package/lib/ui/sdk/@dsc/ui-primitives/markdown.d.ts +10 -14
- package/lib/ui/sdk/@dsc/ui-primitives/package.json +1 -1
- package/lib/ui/sdk/@dsc/ui-primitives/panels.d.ts +31 -8
- package/lib/ui/sdk/@dsc/ui-primitives/paths.d.ts +2 -0
- package/lib/ui/sdk/@dsc/ui-primitives/review-findings-card.d.ts +25 -0
- package/lib/ui/sdk/@dsc/ui-primitives/review-findings.d.ts +64 -0
- package/lib/ui/sdk/@dsc/ui-primitives/review-notice-card.d.ts +27 -0
- package/lib/ui/sdk/@dsc/ui-primitives/review-notice.d.ts +80 -0
- package/lib/ui/sdk/@dsc/ui-primitives/signal.d.ts +9 -0
- package/lib/ui/sdk/@dsc/ui-primitives/sizes.d.ts +15 -0
- package/lib/ui/sdk/@dsc/ui-primitives/skeleton.d.ts +39 -0
- package/lib/ui/sdk/@dsc/ui-primitives/snapshot.d.ts +46 -0
- package/lib/ui/sdk/@dsc/ui-primitives/thread-resizer.d.ts +3 -3
- package/lib/ui/sdk/@dsc/ui-primitives/throughput.d.ts +13 -0
- package/lib/ui/sdk/@dsc/ui-primitives/tokens.d.ts +9 -0
- package/lib/ui/sdk/@dsc/ui-primitives/tool-args.d.ts +1 -1
- package/lib/ui/sdk/@dsc/ui-primitives/tool-summary.d.ts +30 -6
- package/lib/ui/sdk/@dsc/ui-primitives/unified-diff.d.ts +10 -0
- package/lib/ui/sdk/@dsc/ui-renderer/boot.d.ts +10 -1
- package/lib/ui/sdk/@dsc/ui-renderer/cordis-host.d.ts +113 -0
- package/lib/ui/sdk/@dsc/ui-renderer/package.json +1 -1
- package/lib/ui/sdk/@dsc/ui-slots/package.json +1 -1
- package/lib/ui/services.d.ts +19 -8
- package/lib/ui/services.js +20 -12
- package/lib/ui/signal.d.ts +49 -0
- package/lib/ui/signal.js +57 -0
- package/lib/ui/tui-plugins.js +36 -16
- package/package.json +71 -58
- package/lib/remote/assets/app-DAcUCOEn.js +0 -14
- package/lib/ui/assets/app-B70nVIKd.js +0 -69
- package/lib/ui/assets/chunk-BGcgwlCI.js +0 -12
- package/lib/ui/assets/style-Bq01xH_b.css +0 -1
|
@@ -528,6 +528,8 @@ function unwrapHeads(tokens) {
|
|
|
528
528
|
return ['env'];
|
|
529
529
|
return tokens.slice(index);
|
|
530
530
|
}
|
|
531
|
+
/** 「问它自己是谁」的开关:只打印版本或帮助,不动盘。 */
|
|
532
|
+
const INFO_FLAGS = new Set(['--version', '-v', '-V', '--help', '-h', '/?', '--usage', 'version', 'help']);
|
|
531
533
|
/**
|
|
532
534
|
* 这一段是不是只读动作。
|
|
533
535
|
*
|
|
@@ -545,6 +547,11 @@ function isReadOnlySegment(segment) {
|
|
|
545
547
|
const head = tokens[0]?.toLowerCase().replace(/\.exe$/, '');
|
|
546
548
|
if (head === undefined)
|
|
547
549
|
return false;
|
|
550
|
+
// 「问它自己是谁」类的开关(pnpm --version、node -v、eslint --help):只打印版本或帮助,
|
|
551
|
+
// 不改盘、不联网、不执行脚本。这一条要排在只读名单与解释器判断**之前**——
|
|
552
|
+
// node / pnpm 本身都不在只读名单里,落到后面就变成「每次问你一次版本号」(0.7.1 实况)。
|
|
553
|
+
if (tokens.length >= 2 && tokens.slice(1).every((token) => INFO_FLAGS.has(token)))
|
|
554
|
+
return true;
|
|
548
555
|
if (!READONLY_HEADS.has(head)) {
|
|
549
556
|
// 大小写混排的命令名(Get-ChildItem)在 Set 里按原样存过,这里再比一次小写。
|
|
550
557
|
const known = [...READONLY_HEADS].some((name) => name.toLowerCase() === head);
|
|
@@ -560,12 +567,37 @@ function isReadOnlySegment(segment) {
|
|
|
560
567
|
if (head === 'sed' || head === 'awk')
|
|
561
568
|
return !STREAM_EDITOR_WRITES.test(segment.raw);
|
|
562
569
|
if (head === 'git') {
|
|
563
|
-
const sub = tokens
|
|
570
|
+
const sub = gitSubcommand(tokens);
|
|
564
571
|
if (sub !== undefined && WRITING_SUBCOMMANDS.has(sub))
|
|
565
572
|
return false;
|
|
566
573
|
}
|
|
567
574
|
return true;
|
|
568
575
|
}
|
|
576
|
+
/**
|
|
577
|
+
* git 真正要跑的子命令(跳过 `-c key=value`、`-C dir`、`--git-dir=…` 这类全局开关)。
|
|
578
|
+
*
|
|
579
|
+
* 为什么不能只看 `tokens[1]`:`git -c core.pager=calc log` 的 tokens[1] 是 `-c`,
|
|
580
|
+
* 不在写操作名单里,整条就被判成只读——而 `git -c x=y reset --hard` 同理,
|
|
581
|
+
* 只读档会直接把未提交改动丢掉(2026-10-28 实测)。
|
|
582
|
+
*/
|
|
583
|
+
function gitSubcommand(tokens) {
|
|
584
|
+
// 带值的全局开关:它们后面那个词是参数,不是子命令。
|
|
585
|
+
const valueFlags = new Set(['-c', '-C', '--git-dir', '--work-tree', '--namespace', '--exec-path']);
|
|
586
|
+
let index = 1;
|
|
587
|
+
while (index < tokens.length) {
|
|
588
|
+
const token = tokens[index];
|
|
589
|
+
if (valueFlags.has(token)) {
|
|
590
|
+
index += 2;
|
|
591
|
+
continue;
|
|
592
|
+
}
|
|
593
|
+
if (token.startsWith('-')) {
|
|
594
|
+
index += 1;
|
|
595
|
+
continue;
|
|
596
|
+
}
|
|
597
|
+
return token.toLowerCase();
|
|
598
|
+
}
|
|
599
|
+
return undefined;
|
|
600
|
+
}
|
|
569
601
|
/** 建议一个可持久化的前缀:取前 2-3 个词,别把整条命令塞进去(抄 Codex 的告诫)。 */
|
|
570
602
|
function suggestPrefix(segment) {
|
|
571
603
|
const head = segment.tokens[0];
|
|
@@ -74,5 +74,33 @@ export declare function completionsFor(input: string, models: readonly ModelChoi
|
|
|
74
74
|
/**
|
|
75
75
|
* 命令名唯一前缀自动展开(`/ne` → `/new`);多候选或已精确匹配时原样返回。
|
|
76
76
|
* 供 Enter 提交前调用,避免"输了一半按回车报未知命令"。
|
|
77
|
+
*
|
|
78
|
+
* 带参数时只展开**名字那一段**,参数原样接回去:`/di HEAD` → `/diff HEAD`。
|
|
79
|
+
* 以前见空格就整条返回,于是「/di 能跑、/di HEAD 却被拒」,同一个前缀两种命(2026-10-27 查账)。
|
|
77
80
|
*/
|
|
78
81
|
export declare function expandCommand(input: string): string;
|
|
82
|
+
/**
|
|
83
|
+
* 这一行是不是「要收输入」的命令、且还没写参数;是就给出补全文本与提示语。
|
|
84
|
+
*
|
|
85
|
+
* 口径(TUI 与桌面壳共用这一份,不许各写一套):
|
|
86
|
+
* - 去尾空格后整体必须是 `/名字` 或 `/名字 参数`;
|
|
87
|
+
* - 名字先按 {@link expandCommand} 做唯一前缀展开(与回车那条路同一条规矩);
|
|
88
|
+
* - 名字后面已经写了非空参数 → null:这时回车就是「带着要求执行」,不再补全;
|
|
89
|
+
* - 这条命令没有 `input` 字段 → null:行为与改造前一模一样。
|
|
90
|
+
*
|
|
91
|
+
* 撞名的那一档(`/rev` 同时是 `/review` 与 `/reviewer` 的前缀)单独兜一下:
|
|
92
|
+
* 只有 `/review` 要收输入,就认它。补全这件事只对「要收输入」的命令有意义,
|
|
93
|
+
* 所以在这一批里取唯一前缀比让用户手打全名更顺;打全 `/reviewer` 照旧直接执行。
|
|
94
|
+
*/
|
|
95
|
+
export declare function inputClaimOf(line: string): {
|
|
96
|
+
insert: string;
|
|
97
|
+
hint: string;
|
|
98
|
+
} | null;
|
|
99
|
+
/**
|
|
100
|
+
* 壳里 `/help` 的文本:只列**这个通道真跑得了**的那批(`shell: true`)。
|
|
101
|
+
*
|
|
102
|
+
* 为什么不能沿用全量表:壳输入框打 `/help` 会把 23 条全列出来,其中 16 条经
|
|
103
|
+
* `runUiCommand` 会被当场拒绝(`/export`、`/exit`、`/model`…),用户照着敲却跑不了;
|
|
104
|
+
* 而输入框打 `/` 弹出的菜单只列 7 条,两处说法对不上(2026-10-27 查账)。
|
|
105
|
+
*/
|
|
106
|
+
export declare function shellHelpText(): string;
|
|
@@ -19,33 +19,49 @@
|
|
|
19
19
|
export const BUILT_IN_COMMANDS = [
|
|
20
20
|
// T44:duringTask = 回合跑着的时候还能不能用。new/resume 会打断挂着审批的回合、
|
|
21
21
|
// compact 会和进行中的落库交错,运行中一律挡下;其余随时可用。
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
{ name: '
|
|
22
|
+
//
|
|
23
|
+
// label = 菜单第一列的中文短名(2–4 字),英文 name 排在它后面。说明列那句取
|
|
24
|
+
// description,与 /help 同一句——菜单和帮助各说各话的那种漂移就是这么来的,别再抄一份。
|
|
25
|
+
{ name: 'new', args: '', label: '新会话', description: '新建一个空会话', duringTask: 'deny', shell: true },
|
|
26
|
+
{ name: 'resume', args: '', label: '恢复会话', description: '恢复历史会话(先选工作区再选会话)', duringTask: 'deny' },
|
|
27
|
+
{ name: 'agents', args: '', label: '子代理', description: '查看子代理与后台会话(转录只读)' },
|
|
28
|
+
{ name: 'compact', args: '', label: '压缩', description: '压缩以上对话内容', duringTask: 'deny', shell: true },
|
|
26
29
|
{
|
|
27
30
|
name: 'model',
|
|
28
31
|
args: '<[端点/]模型名>',
|
|
29
|
-
|
|
32
|
+
label: '模型',
|
|
33
|
+
description: '选择本会话使用的模型(无参数打开选择器)',
|
|
30
34
|
},
|
|
31
|
-
{ name: 'policy', args: '[readonly|auto-edit|full-access]', description: '查看或切换权限模式(自动放行集那一轴)' },
|
|
32
|
-
{ name: 'reviewer', args: '[user|auto-review]', description: '查看或切换审批审阅者(要问的事先给谁看)' },
|
|
33
|
-
{ name: 'permission', args: '[预设名]', description: '查看或切换打包权限预设(沙箱 + 权限模式 + 审阅者三合一)' },
|
|
34
|
-
{ name: 'effort', args: '[default|off|low|high|max]', description: '查看或切换思考强度' },
|
|
35
|
-
{ name: 'thinking', args: '[on|off]', description: '切换思考块展开显示(无参数 = 翻转,会话内生效)' },
|
|
36
|
-
{ name: 'fork', args: '', description: '分叉当前会话为可恢复的副本(当前会话不变)', duringTask: 'deny' },
|
|
37
|
-
{ name: 'plugins', args: '', description: '查看已挂载插件清单(启停与详情在桌面端插件中心)' },
|
|
38
|
-
{ name: 'ui-trust', args: '<插件目录名>', description: '信任一个第三方界面插件(首次安装的确认动作)' },
|
|
39
|
-
{ name: 'update', args: '', description: '检查有没有新版(只查不装)', duringTask: 'deny' },
|
|
40
|
-
{ name: 'status', args: '', description: '查看上下文占用与压缩余量', shell: true },
|
|
41
|
-
{ name: 'usage', args: '', description: '查看累计用量统计(含缓存命中率)', shell: true },
|
|
42
|
-
{ name: 'diff', args: '[文件]',
|
|
43
|
-
{ name: 'copy', args: '', description: '复制上一条回复到剪贴板' },
|
|
44
|
-
{ name: 'export', args: '[文件路径]', description: '导出当前会话为 markdown' },
|
|
45
|
-
{
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
35
|
+
{ name: 'policy', args: '[readonly|auto-edit|full-access]', label: '权限模式', description: '查看或切换权限模式(自动放行集那一轴)' },
|
|
36
|
+
{ name: 'reviewer', args: '[user|auto-review]', label: '审阅者', description: '查看或切换审批审阅者(要问的事先给谁看)' },
|
|
37
|
+
{ name: 'permission', args: '[预设名]', label: '权限预设', description: '查看或切换打包权限预设(沙箱 + 权限模式 + 审阅者三合一)' },
|
|
38
|
+
{ name: 'effort', args: '[default|off|low|high|max]', label: '思考强度', description: '查看或切换思考强度' },
|
|
39
|
+
{ name: 'thinking', args: '[on|off]', label: '思考显示', description: '切换思考块展开显示(无参数 = 翻转,会话内生效)' },
|
|
40
|
+
{ name: 'fork', args: '', label: '分叉', description: '分叉当前会话为可恢复的副本(当前会话不变)', duringTask: 'deny' },
|
|
41
|
+
{ name: 'plugins', args: '', label: '插件', description: '查看已挂载插件清单(启停与详情在桌面端插件中心)' },
|
|
42
|
+
{ name: 'ui-trust', args: '<插件目录名>', label: '信任界面', description: '信任一个第三方界面插件(首次安装的确认动作)' },
|
|
43
|
+
{ name: 'update', args: '', label: '检查更新', description: '检查有没有新版(只查不装)', duringTask: 'deny' },
|
|
44
|
+
{ name: 'status', args: '', label: '状态', description: '查看上下文占用与压缩余量', shell: true },
|
|
45
|
+
{ name: 'usage', args: '', label: '用量', description: '查看累计用量统计(含缓存命中率)', shell: true },
|
|
46
|
+
{ name: 'diff', args: '[文件]', label: '差异', description: '查看工作区未提交改动(可跟一个文件名只看它)', shell: true },
|
|
47
|
+
{ name: 'copy', args: '', label: '复制回复', description: '复制上一条回复到剪贴板' },
|
|
48
|
+
{ name: 'export', args: '[文件路径]', label: '导出', description: '导出当前会话为 markdown' },
|
|
49
|
+
{
|
|
50
|
+
name: 'review',
|
|
51
|
+
args: '[关注点]',
|
|
52
|
+
label: '代码审查',
|
|
53
|
+
description: '审查工作区未提交改动(可跟一句关注点收窄范围)',
|
|
54
|
+
shell: true,
|
|
55
|
+
// 这条命令要收一段自由文本:回车先补成 `/review `,别当场跑审查——用户还没说要审什么。
|
|
56
|
+
input: { hint: '写上关注点;不写就先选审查范围(未提交改动 / 基准分支 / 某次提交)' },
|
|
57
|
+
},
|
|
58
|
+
// 审查跑起来之后的两条配套命令:一条回看,一条叫停。与 /review 一样只往会话里写通知,
|
|
59
|
+
// 所以同样进壳的命令清单(shell: true)。
|
|
60
|
+
{ name: 'review-status', args: '', label: '审查状态', description: '查看最近一次代码审查的状态与结论', shell: true },
|
|
61
|
+
{ name: 'review-cancel', args: '', label: '取消审查', description: '取消正在跑的代码审查', shell: true },
|
|
62
|
+
{ name: 'settings', args: '', label: '设置', description: '打开设置页' },
|
|
63
|
+
{ name: 'help', args: '', label: '帮助', description: '查看命令帮助', shell: true },
|
|
64
|
+
{ name: 'exit', args: '', label: '退出', description: '退出' },
|
|
49
65
|
];
|
|
50
66
|
/** 外部插件注册的命令(补全与唯一前缀展开用;模块级单例,进程内唯一注册表)。 */
|
|
51
67
|
const extraSpecs = [];
|
|
@@ -114,12 +130,18 @@ export function commandCompletions(input) {
|
|
|
114
130
|
if (body.includes(' '))
|
|
115
131
|
return [];
|
|
116
132
|
const lower = body.toLowerCase();
|
|
117
|
-
|
|
118
|
-
|
|
133
|
+
const matched = allSpecs().filter((command) => command.name.startsWith(lower));
|
|
134
|
+
// 精确同名排第一:`/review` 同时也是 `/reviewer` 的前缀,而表里 `/reviewer` 在前,
|
|
135
|
+
// 不排序的话「打全 `/review` 再回车」会被高亮项截成 `/reviewer`(2026-11-02 实测)。
|
|
136
|
+
// 其余保持表内次序(表本身就是展示次序,不重排)。
|
|
137
|
+
const ordered = [...matched.filter((command) => command.name === lower), ...matched.filter((command) => command.name !== lower)];
|
|
138
|
+
return ordered
|
|
119
139
|
.map((command) => ({
|
|
120
140
|
insert: `/${command.name}${command.args === '' ? '' : ' '}`,
|
|
121
141
|
label: `/${command.name}${command.args === '' ? '' : ` ${command.args}`}`,
|
|
122
142
|
description: command.description,
|
|
143
|
+
// 菜单第一列的中文短名;插件注册的命令多半没有,终端面板会退回去只画英文名。
|
|
144
|
+
...(command.label === undefined ? {} : { title: command.label }),
|
|
123
145
|
}));
|
|
124
146
|
}
|
|
125
147
|
/**
|
|
@@ -153,15 +175,71 @@ export function completionsFor(input, models) {
|
|
|
153
175
|
/**
|
|
154
176
|
* 命令名唯一前缀自动展开(`/ne` → `/new`);多候选或已精确匹配时原样返回。
|
|
155
177
|
* 供 Enter 提交前调用,避免"输了一半按回车报未知命令"。
|
|
178
|
+
*
|
|
179
|
+
* 带参数时只展开**名字那一段**,参数原样接回去:`/di HEAD` → `/diff HEAD`。
|
|
180
|
+
* 以前见空格就整条返回,于是「/di 能跑、/di HEAD 却被拒」,同一个前缀两种命(2026-10-27 查账)。
|
|
156
181
|
*/
|
|
157
182
|
export function expandCommand(input) {
|
|
158
183
|
if (!input.startsWith('/'))
|
|
159
184
|
return input;
|
|
160
185
|
const body = input.slice(1);
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
186
|
+
const split = body.search(/\s/);
|
|
187
|
+
const name = split < 0 ? body : body.slice(0, split);
|
|
188
|
+
const rest = split < 0 ? '' : body.slice(split);
|
|
189
|
+
if (allSpecs().some((command) => command.name === name))
|
|
164
190
|
return input;
|
|
165
|
-
const matches = allSpecs().filter((command) => command.name.startsWith(
|
|
166
|
-
return matches.length === 1 ? `/${matches[0].name}` : input;
|
|
191
|
+
const matches = allSpecs().filter((command) => command.name.startsWith(name.toLowerCase()));
|
|
192
|
+
return matches.length === 1 ? `/${matches[0].name}${rest}` : input;
|
|
193
|
+
}
|
|
194
|
+
/**
|
|
195
|
+
* 这一行是不是「要收输入」的命令、且还没写参数;是就给出补全文本与提示语。
|
|
196
|
+
*
|
|
197
|
+
* 口径(TUI 与桌面壳共用这一份,不许各写一套):
|
|
198
|
+
* - 去尾空格后整体必须是 `/名字` 或 `/名字 参数`;
|
|
199
|
+
* - 名字先按 {@link expandCommand} 做唯一前缀展开(与回车那条路同一条规矩);
|
|
200
|
+
* - 名字后面已经写了非空参数 → null:这时回车就是「带着要求执行」,不再补全;
|
|
201
|
+
* - 这条命令没有 `input` 字段 → null:行为与改造前一模一样。
|
|
202
|
+
*
|
|
203
|
+
* 撞名的那一档(`/rev` 同时是 `/review` 与 `/reviewer` 的前缀)单独兜一下:
|
|
204
|
+
* 只有 `/review` 要收输入,就认它。补全这件事只对「要收输入」的命令有意义,
|
|
205
|
+
* 所以在这一批里取唯一前缀比让用户手打全名更顺;打全 `/reviewer` 照旧直接执行。
|
|
206
|
+
*/
|
|
207
|
+
export function inputClaimOf(line) {
|
|
208
|
+
// 尾空格不算参数:`/review ` 与 `/review` 是同一条「还没写要求」的命令。
|
|
209
|
+
const trimmed = line.trimEnd();
|
|
210
|
+
if (!trimmed.startsWith('/'))
|
|
211
|
+
return null;
|
|
212
|
+
const body = expandCommand(trimmed).slice(1);
|
|
213
|
+
const match = /^(\S+)(?:\s+([\s\S]*))?$/.exec(body);
|
|
214
|
+
if (match === null)
|
|
215
|
+
return null;
|
|
216
|
+
const name = match[1] ?? '';
|
|
217
|
+
// 名字后面已经有内容:那是参数,回车该执行了。
|
|
218
|
+
if ((match[2] ?? '').trim() !== '')
|
|
219
|
+
return null;
|
|
220
|
+
const spec = allSpecs().find((command) => command.name === name) ?? uniqueInputPrefix(name);
|
|
221
|
+
if (spec === undefined || spec.input === undefined)
|
|
222
|
+
return null;
|
|
223
|
+
return { insert: `/${spec.name} `, hint: spec.input.hint };
|
|
224
|
+
}
|
|
225
|
+
/** 名字没能在全表里唯一展开时,在「要收输入」的这批命令里再取一次唯一前缀。 */
|
|
226
|
+
function uniqueInputPrefix(name) {
|
|
227
|
+
const lower = name.toLowerCase();
|
|
228
|
+
const matched = allSpecs().filter((command) => command.input !== undefined && command.name.startsWith(lower));
|
|
229
|
+
return matched.length === 1 ? matched[0] : undefined;
|
|
230
|
+
}
|
|
231
|
+
/**
|
|
232
|
+
* 壳里 `/help` 的文本:只列**这个通道真跑得了**的那批(`shell: true`)。
|
|
233
|
+
*
|
|
234
|
+
* 为什么不能沿用全量表:壳输入框打 `/help` 会把 23 条全列出来,其中 16 条经
|
|
235
|
+
* `runUiCommand` 会被当场拒绝(`/export`、`/exit`、`/model`…),用户照着敲却跑不了;
|
|
236
|
+
* 而输入框打 `/` 弹出的菜单只列 7 条,两处说法对不上(2026-10-27 查账)。
|
|
237
|
+
*/
|
|
238
|
+
export function shellHelpText() {
|
|
239
|
+
return [
|
|
240
|
+
`桌面壳里能用的命令(${String(shellCommands().length)} 条):`,
|
|
241
|
+
helpText(shellCommands()),
|
|
242
|
+
'',
|
|
243
|
+
'其余命令(权限、模型、思考强度、导出、退出…)在终端里用,或点输入框底栏的旋钮。',
|
|
244
|
+
].join('\n');
|
|
167
245
|
}
|
package/lib/core/compact.d.ts
CHANGED
|
@@ -53,10 +53,16 @@ export interface PruneOutcome {
|
|
|
53
53
|
* - 用户消息图片按预算保留,超出的换「图片已卸载」占位。
|
|
54
54
|
*/
|
|
55
55
|
export declare function pruneRegion(messages: readonly ChatMessage[], sessionId: string, options: PruneOptions): PruneOutcome;
|
|
56
|
-
/**
|
|
56
|
+
/** 一次压缩的几个上限。字符预算由 compact 插件的配置给值。 */
|
|
57
57
|
export interface CompactLimits {
|
|
58
|
-
/**
|
|
58
|
+
/** 摘要之外原样保留的最近消息条数(条数下限,token 预算只可能让它留得更多)。 */
|
|
59
59
|
keepRecent: number;
|
|
60
|
+
/**
|
|
61
|
+
* 摘要之外原样保留的最近消息的 token 预算(绝对值)。
|
|
62
|
+
* 缺省 0 表示不按 token 选,退回纯条数口径(与改造前的行为一致)。
|
|
63
|
+
* 配了值之后,尾部至少留够这么多 token,再退到工具配对的安全边界。
|
|
64
|
+
*/
|
|
65
|
+
retainTokens?: number;
|
|
60
66
|
/** 锚点索引的字符预算。 */
|
|
61
67
|
anchorChars: number;
|
|
62
68
|
/** 摘要里逐字引用的用户原话的字符预算。 */
|
|
@@ -72,7 +78,15 @@ export declare const DEFAULT_COMPACT_LIMITS: CompactLimits;
|
|
|
72
78
|
* 粗略 token 估算(口径见 core/token-estimate.ts 的模块注释:中文 0.65、其余 0.33)。
|
|
73
79
|
*/
|
|
74
80
|
export declare function estimateTokens(messages: readonly ChatMessage[]): number;
|
|
75
|
-
|
|
81
|
+
/** 一次压缩的结果:压没压成,以及压前压后的 token 估算(调用方据此判断要不要再压)。 */
|
|
82
|
+
export interface CompactResult {
|
|
83
|
+
/** 'compacted' = 真写了摘要;'noop' = 历史太短,或切点退到 0(整段都是工具结果)。 */
|
|
84
|
+
outcome: 'compacted' | 'noop';
|
|
85
|
+
/** 进函数时整段历史的估算 token 数(摘要模型算的是这一份)。 */
|
|
86
|
+
beforeTokens: number;
|
|
87
|
+
/** 压缩后的估算 token 数(摘要 + 尾部);noop 时与 beforeTokens 相等。 */
|
|
88
|
+
afterTokens: number;
|
|
89
|
+
}
|
|
76
90
|
/**
|
|
77
91
|
* 把切点往前退到安全边界:切出来的尾部不能以孤儿 tool 消息开头。
|
|
78
92
|
*
|
|
@@ -85,7 +99,23 @@ export type CompactOutcome = 'compacted' | 'noop';
|
|
|
85
99
|
* @returns 安全切点;前面全是工具结果时可能退到 0(调用方按无法压缩处理)。
|
|
86
100
|
*/
|
|
87
101
|
export declare function safeCut(messages: readonly ChatMessage[], cut: number): number;
|
|
88
|
-
/**
|
|
102
|
+
/**
|
|
103
|
+
* 选压缩切点:先按 token 预算从末尾倒着留够尾巴,再兜住条数下限,最后退到工具配对的安全边界。
|
|
104
|
+
*
|
|
105
|
+
* 为什么改成按 token 选(2026-11-02,对齐 dsh 的 selectCompactableRange):固定留 20 条在
|
|
106
|
+
* 「一条工具结果就几十万字符」的会话里等于没压——20 条里只要夹着一次构建日志或一份 bundle,
|
|
107
|
+
* 压完照样爆窗。token 才是「留多少内容」的真实口径;条数下限仍然兜着,免得预算没配时
|
|
108
|
+
* 连最近的上下文都不留。
|
|
109
|
+
*
|
|
110
|
+
* 顺序与 dsh 一致:倒着累加 → 够预算就停 → 退到工具配对安全的位置(切出来的尾部
|
|
111
|
+
* 不能以孤儿 tool 消息开头,见 {@link safeCut})。
|
|
112
|
+
*
|
|
113
|
+
* @param messages - 当前会话消息。
|
|
114
|
+
* @param caps - 压缩上限;`retainTokens` 缺省或 0 时退回纯条数口径。
|
|
115
|
+
* @returns 安全切点;前面全是工具结果时可能退到 0(调用方按无法压缩处理)。
|
|
116
|
+
*/
|
|
117
|
+
export declare function selectCut(messages: readonly ChatMessage[], caps: CompactLimits): number;
|
|
118
|
+
/** 压缩一次;历史太短(或没有可折的内容)返回 outcome = 'noop',不写任何记录。 */
|
|
89
119
|
export declare function compactSession(session: Session,
|
|
90
120
|
/** 当前模型路由(api 字段决定走哪个协议适配器)。 */
|
|
91
121
|
route: LlmRoute,
|
|
@@ -93,7 +123,7 @@ route: LlmRoute,
|
|
|
93
123
|
stream: LlmStream, signal: AbortSignal,
|
|
94
124
|
/** 摘要之外要原样带过去的内容(任务清单、会话目标这类状态,不能被摘要吃掉)。 */
|
|
95
125
|
extra: string | undefined,
|
|
96
|
-
/**
|
|
126
|
+
/** 本次压缩的各项上限;compact 插件把它的配置值传进来。 */
|
|
97
127
|
limits: CompactLimits | undefined,
|
|
98
128
|
/** 爆窗重试用:忽略「历史太短」的 noop 检查直接压一次(切点退到 0 时仍放弃)。 */
|
|
99
129
|
force: boolean | undefined,
|
|
@@ -107,4 +137,4 @@ prune: PruneOptions | undefined,
|
|
|
107
137
|
context: {
|
|
108
138
|
system: string;
|
|
109
139
|
tools?: readonly ToolSchema[];
|
|
110
|
-
}): Promise<
|
|
140
|
+
}): Promise<CompactResult>;
|
package/lib/core/compact.js
CHANGED
|
@@ -97,17 +97,45 @@ export function estimateTokens(messages) {
|
|
|
97
97
|
}
|
|
98
98
|
return Math.ceil(tokens);
|
|
99
99
|
}
|
|
100
|
-
/**
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
100
|
+
/**
|
|
101
|
+
* 交接摘要的写法(照 dsh 的 checkpoint 结构,标题改中文)——作为请求末尾的 user 指令发出。
|
|
102
|
+
*
|
|
103
|
+
* 为什么是固定的八节、而且不许省段:摘要的读者是「下一轮的你」,缺哪一节都是事后才发现,
|
|
104
|
+
* 而那时原文已经折掉了。空段写「(无)」让人一眼看出是真的没有,而不是模型漏写了。
|
|
105
|
+
* 为什么不再限制 600 字:八节各写两三行就已经超过 600,硬压字数只会让模型砍掉路径与报错原文。
|
|
106
|
+
*/
|
|
107
|
+
const COMPACT_PROMPT = `现在换一个任务:把上面的对话压缩成一份交接摘要,让接手的人(就是下一轮的你)不看原文也能接着干活。
|
|
108
|
+
按下面八个标题写,一个都不能少、顺序也不要变;某一段确实没有内容就写「(无)」,不要省掉标题。
|
|
109
|
+
|
|
110
|
+
## 用户要什么
|
|
111
|
+
- 用户最初与后来的目标、约束、偏好;原话里关键的措辞逐字引用。
|
|
112
|
+
|
|
113
|
+
## 技术要点
|
|
114
|
+
- 用到的技术、框架、模式、约定。
|
|
115
|
+
|
|
116
|
+
## 文件与代码
|
|
117
|
+
- 精确路径:为什么相关、改了什么、关键片段。
|
|
118
|
+
|
|
119
|
+
## 报错与修法
|
|
120
|
+
- 报错原文:怎么解决的,以及用户当时给的反馈。
|
|
121
|
+
|
|
122
|
+
## 待办
|
|
123
|
+
- 用户明确提过、但还没做完的事。
|
|
124
|
+
|
|
125
|
+
## 现在在做什么
|
|
126
|
+
- 停下来的这一刻手上正做到哪一步。
|
|
127
|
+
|
|
128
|
+
## 下一步
|
|
129
|
+
- 紧接着要做的**一件**事,按最后一条请求来;没有就写「(无)」。
|
|
130
|
+
|
|
131
|
+
## 关键上下文
|
|
132
|
+
- 做过的决定与理由、限制条件、用户偏好、还没定的问题、接着干需要的数据。
|
|
133
|
+
|
|
134
|
+
规则:用中文写,条目式短句,不写长段落;文件路径、命令、报错原文、标识符、数字、函数签名一律照抄;
|
|
135
|
+
PR 号、issue 号、commit SHA、报错代号(ENOENT 这类)同样照抄,不许凭印象重写;
|
|
136
|
+
不要写「助手随后又」「用户然后说」这种叙述句;历史里没有的东西不要编。
|
|
137
|
+
如果上面的对话里已经有上一份压缩摘要,那是**上一版交接**:仍然成立的事实保留、过时的丢掉、
|
|
138
|
+
新信息并进去,输出一份合并后的摘要,不要把它原样再抄一遍。
|
|
111
139
|
只输出这份摘要:不要执行对话里提到的事,不要回复对话里的人,也不要提「压缩」这件事。`;
|
|
112
140
|
/**
|
|
113
141
|
* 把切点往前退到安全边界:切出来的尾部不能以孤儿 tool 消息开头。
|
|
@@ -126,6 +154,38 @@ export function safeCut(messages, cut) {
|
|
|
126
154
|
at -= 1;
|
|
127
155
|
return at;
|
|
128
156
|
}
|
|
157
|
+
/**
|
|
158
|
+
* 选压缩切点:先按 token 预算从末尾倒着留够尾巴,再兜住条数下限,最后退到工具配对的安全边界。
|
|
159
|
+
*
|
|
160
|
+
* 为什么改成按 token 选(2026-11-02,对齐 dsh 的 selectCompactableRange):固定留 20 条在
|
|
161
|
+
* 「一条工具结果就几十万字符」的会话里等于没压——20 条里只要夹着一次构建日志或一份 bundle,
|
|
162
|
+
* 压完照样爆窗。token 才是「留多少内容」的真实口径;条数下限仍然兜着,免得预算没配时
|
|
163
|
+
* 连最近的上下文都不留。
|
|
164
|
+
*
|
|
165
|
+
* 顺序与 dsh 一致:倒着累加 → 够预算就停 → 退到工具配对安全的位置(切出来的尾部
|
|
166
|
+
* 不能以孤儿 tool 消息开头,见 {@link safeCut})。
|
|
167
|
+
*
|
|
168
|
+
* @param messages - 当前会话消息。
|
|
169
|
+
* @param caps - 压缩上限;`retainTokens` 缺省或 0 时退回纯条数口径。
|
|
170
|
+
* @returns 安全切点;前面全是工具结果时可能退到 0(调用方按无法压缩处理)。
|
|
171
|
+
*/
|
|
172
|
+
export function selectCut(messages, caps) {
|
|
173
|
+
const budget = caps.retainTokens ?? 0;
|
|
174
|
+
let keepFrom = messages.length;
|
|
175
|
+
let accumulated = 0;
|
|
176
|
+
// 从末尾往前累加,累计到够预算(或走到 0)就停;keepFrom 因此落在这条消息上。
|
|
177
|
+
// budget 为 0 时第一轮就满足,keepFrom = 最后一条,由下面的条数下限拉回去。
|
|
178
|
+
for (let index = messages.length - 1; index >= 0; index -= 1) {
|
|
179
|
+
accumulated += estimateTokens([messages[index]]);
|
|
180
|
+
keepFrom = index;
|
|
181
|
+
if (accumulated >= budget)
|
|
182
|
+
break;
|
|
183
|
+
}
|
|
184
|
+
// 条数下限仍然生效:至少留 keepRecent 条(再小只会留得更多,不会更少)。
|
|
185
|
+
const floor = Math.max(0, messages.length - Math.max(0, caps.keepRecent));
|
|
186
|
+
keepFrom = Math.max(0, Math.min(keepFrom, floor));
|
|
187
|
+
return safeCut(messages, keepFrom);
|
|
188
|
+
}
|
|
129
189
|
/**
|
|
130
190
|
* 把一段历史渲染成纯文本——只给锚点索引/原话引用的机械抽取当输入。
|
|
131
191
|
* 工具参数一字不截:SHA、路径、报错可能就藏在参数里,机械抽取要全量保真。
|
|
@@ -139,7 +199,7 @@ function renderRegion(messages) {
|
|
|
139
199
|
})
|
|
140
200
|
.join('\n\n');
|
|
141
201
|
}
|
|
142
|
-
/**
|
|
202
|
+
/** 压缩一次;历史太短(或没有可折的内容)返回 outcome = 'noop',不写任何记录。 */
|
|
143
203
|
export async function compactSession(session,
|
|
144
204
|
/** 当前模型路由(api 字段决定走哪个协议适配器)。 */
|
|
145
205
|
route,
|
|
@@ -147,7 +207,7 @@ route,
|
|
|
147
207
|
stream, signal,
|
|
148
208
|
/** 摘要之外要原样带过去的内容(任务清单、会话目标这类状态,不能被摘要吃掉)。 */
|
|
149
209
|
extra,
|
|
150
|
-
/**
|
|
210
|
+
/** 本次压缩的各项上限;compact 插件把它的配置值传进来。 */
|
|
151
211
|
limits,
|
|
152
212
|
/** 爆窗重试用:忽略「历史太短」的 noop 检查直接压一次(切点退到 0 时仍放弃)。 */
|
|
153
213
|
force,
|
|
@@ -161,12 +221,15 @@ prune,
|
|
|
161
221
|
context) {
|
|
162
222
|
const caps = limits ?? DEFAULT_COMPACT_LIMITS;
|
|
163
223
|
const messages = session.messages;
|
|
224
|
+
// 压前读数取「进函数时这份全量」:noop 时 before / after 相等,调用方据此判断是否要再压
|
|
225
|
+
const beforeTokens = estimateTokens(messages);
|
|
226
|
+
const noop = () => ({ outcome: 'noop', beforeTokens, afterTokens: beforeTokens });
|
|
164
227
|
if (force !== true && messages.length <= caps.keepRecent + 2)
|
|
165
|
-
return
|
|
166
|
-
const cut =
|
|
228
|
+
return noop();
|
|
229
|
+
const cut = selectCut(messages, caps);
|
|
167
230
|
// 切点退到 0 = 整个历史都是工具结果,没有可折的内容(正常历史首条必然是用户消息)
|
|
168
231
|
if (cut === 0)
|
|
169
|
-
return
|
|
232
|
+
return noop();
|
|
170
233
|
const raw = messages.slice(0, cut);
|
|
171
234
|
// T19:送摘要模型前先机械瘦身(超长工具结果留 spill 指针、老图卸载);
|
|
172
235
|
// 锚点索引与原话引用仍取自原文——机械抽取要全量保真,不能跟着裁剪走
|
|
@@ -204,7 +267,16 @@ context) {
|
|
|
204
267
|
const carry = extra === undefined || extra.trim() === '' ? '' : `\n\n${extra.trim()}`;
|
|
205
268
|
// 顺序固定:摘要正文 → 原样带过去的状态 → 用户原话 → 锚点 → read-state → 细节找回
|
|
206
269
|
const summary = `${SUMMARY_BANNER}\n${result.text.trim()}${carry}${quotes}${anchors}${readState}${recovery}`;
|
|
270
|
+
// 摘要压不小就放弃(对齐 dsh:「summary is not smaller than the shadowed content」)。
|
|
271
|
+
// 为什么宁可抛错也不写回去:摘要比被折的内容还长,等于用「压缩」把上下文撑得更大,
|
|
272
|
+
// 下一次请求只会更接近爆窗;调用方看到失败(手动压缩会提示、自动压缩会照常继续下一轮),
|
|
273
|
+
// 比历史悄悄变长好。
|
|
274
|
+
const summaryTokens = estimateTokens([{ role: 'user', content: summary }]);
|
|
275
|
+
if (summaryTokens >= beforeTokens) {
|
|
276
|
+
throw new Error(`压缩没有意义:摘要估算 ${summaryTokens} tokens 不小于被折叠的 ${beforeTokens} tokens`);
|
|
277
|
+
}
|
|
207
278
|
const kept = [{ role: 'user', content: summary }, ...messages.slice(cut)];
|
|
279
|
+
const afterTokens = estimateTokens(kept);
|
|
208
280
|
session.replaceWithSummary(summary, kept);
|
|
209
|
-
return 'compacted';
|
|
281
|
+
return { outcome: 'compacted', beforeTokens, afterTokens };
|
|
210
282
|
}
|
|
@@ -24,6 +24,7 @@
|
|
|
24
24
|
import { spawn } from 'node:child_process';
|
|
25
25
|
import { appendFileSync, mkdirSync } from 'node:fs';
|
|
26
26
|
import { dirname, join } from 'node:path';
|
|
27
|
+
import { errText } from './err-text.js';
|
|
27
28
|
/** 桌面动作(工具 action 枚举;名字尽量照 ZCode 语义)。 */
|
|
28
29
|
export const DESKTOP_ACTIONS = [
|
|
29
30
|
'screenshot',
|
|
@@ -175,9 +176,6 @@ const KEY_MAP = {
|
|
|
175
176
|
const BANNED_KEYS = ['win', 'cmd', 'super', 'meta'];
|
|
176
177
|
/** 观察/遍历上限(防止一棵病态树把上下文撑爆;超了在文本里明说被截断)。 */
|
|
177
178
|
export const OBSERVE_MAX_ELEMENTS = 400;
|
|
178
|
-
function errText(error) {
|
|
179
|
-
return error instanceof Error ? error.message : String(error);
|
|
180
|
-
}
|
|
181
179
|
/** PowerShell 单引号字符串转义。 */
|
|
182
180
|
function psQuote(text) {
|
|
183
181
|
return `'${text.replace(/'/g, "''")}'`;
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 把一次模型调用的用量,按 dsh 的 `llm/stream` 事件发出去。
|
|
3
|
+
*
|
|
4
|
+
* 为什么需要:dsh 的计费类插件(`dsh-cost-meter` 就是)记**实时花费**不听用量日志,而是
|
|
5
|
+
* 在 `llm/stream` 这个 **waterfall 事件**上包一层流:拿到下游流之后自己逐个 chunk 读,
|
|
6
|
+
* 见到 `{ type: 'usage', usage }` 就记账,再把 chunk 原样吐给调用方。只做会话历史读取
|
|
7
|
+
* (core/dsh-compat/session-bridge)不会让它有数——2026-10-26 真包验收时确认过。
|
|
8
|
+
*
|
|
9
|
+
* 我们这边没有 dsh 那种流式 chunk 协议,所以走**最小可信的合成**:把这一次调用的用量
|
|
10
|
+
* 包成**唯一一个 chunk** 交出去,然后把这个(被插件包过的)迭代器消费掉,让插件的
|
|
11
|
+
* `finally` 与记账逻辑跑完。谁也没看见假数据:chunk 里的数字就是本次请求真实的 token 数。
|
|
12
|
+
*
|
|
13
|
+
* 边界:这条事件只影响「听它的插件」,不改变回合本身的流式路径——我们的流仍然是回调式
|
|
14
|
+
* (`LlmService.stream` 的 handlers),这里只是并行发一条旁路读数。插件抛错一律吞掉:
|
|
15
|
+
* 记账失败绝不能把用户的回合带崩。
|
|
16
|
+
*
|
|
17
|
+
* @module dsc/core/dsh-compat/llm-usage-event
|
|
18
|
+
*/
|
|
19
|
+
/** 一次模型调用的用量(与 `core/usage-log` 的字段一一对应)。 */
|
|
20
|
+
export interface LlmUsageInfo {
|
|
21
|
+
readonly sessionId: string;
|
|
22
|
+
readonly provider: string;
|
|
23
|
+
readonly model: string;
|
|
24
|
+
/** prompt_tokens 总量(命中**包含在内**,与内核 `usage` 事件同口径)。 */
|
|
25
|
+
readonly inputTokens: number;
|
|
26
|
+
readonly outputTokens: number;
|
|
27
|
+
/** 输入里的缓存命中 token 数。 */
|
|
28
|
+
readonly cacheHitTokens?: number;
|
|
29
|
+
/** 输入里的未命中 token 数(不报时按总量减命中算)。 */
|
|
30
|
+
readonly cacheMissTokens?: number;
|
|
31
|
+
readonly reasoningTokens?: number;
|
|
32
|
+
}
|
|
33
|
+
/** dsh 的用量形状:各分项**互斥**(见下面的换算)。 */
|
|
34
|
+
export interface DshTokenUsage {
|
|
35
|
+
readonly inputTokens: number;
|
|
36
|
+
readonly outputTokens: number;
|
|
37
|
+
readonly cacheReadTokens: number;
|
|
38
|
+
readonly cacheWriteTokens: number;
|
|
39
|
+
readonly reasoningTokens: number;
|
|
40
|
+
readonly totalTokens: number;
|
|
41
|
+
}
|
|
42
|
+
/** 我们这边的用量读数(内核 `usage` 事件 + 用量日志的字段)。 */
|
|
43
|
+
export interface KernelUsageLike {
|
|
44
|
+
readonly inputTokens: number;
|
|
45
|
+
readonly outputTokens: number;
|
|
46
|
+
readonly cacheHitTokens?: number;
|
|
47
|
+
readonly cacheMissTokens?: number;
|
|
48
|
+
readonly reasoningTokens?: number;
|
|
49
|
+
}
|
|
50
|
+
/**
|
|
51
|
+
* 把我们的用量换算成 dsh 的分项。
|
|
52
|
+
*
|
|
53
|
+
* 两边的口径不一样,直接抄会**多算钱**:我们的 `inputTokens` 是 prompt_tokens 总量,
|
|
54
|
+
* 缓存命中**包含在内**;dsh 的 `inputTokens` 只算未命中的部分,命中另记
|
|
55
|
+
* `cacheReadTokens`,计费时三项相加。照搬就把命中那部分按未命中价又收了一遍。
|
|
56
|
+
*
|
|
57
|
+
* `cacheWriteTokens` 一律 0:我们这边没有「缓存写入」这个概念(命中的补集是未命中,
|
|
58
|
+
* 不是写入)。dsh 的 `totalTokens` 是四项相加,这里按同一口径给出。
|
|
59
|
+
*
|
|
60
|
+
* @param usage - 内核读数
|
|
61
|
+
* @returns dsh 口径的分项
|
|
62
|
+
*/
|
|
63
|
+
export declare function toDshUsage(usage: KernelUsageLike): DshTokenUsage;
|
|
64
|
+
/** dsh 的 chunk 形状(只用到 `usage` 这一种;其余字段我们不发)。 */
|
|
65
|
+
export interface DshStreamChunk {
|
|
66
|
+
readonly type: 'usage';
|
|
67
|
+
readonly usage: DshTokenUsage;
|
|
68
|
+
}
|
|
69
|
+
/** 事件名。抽成常量:发布侧与自检都引它,拼错一个字符就两边同时红。 */
|
|
70
|
+
export declare const LLM_STREAM_EVENT = "llm/stream";
|
|
71
|
+
/**
|
|
72
|
+
* 派发一次 `llm/stream`,把用量作为唯一 chunk 交给监听者链。
|
|
73
|
+
*
|
|
74
|
+
* @param ctx - 宿主上下文(waterfall 在它上面派发)
|
|
75
|
+
* @param info - 本次调用的用量与会话归属
|
|
76
|
+
* @returns 派发完成(无论有没有监听者);永不抛错
|
|
77
|
+
*/
|
|
78
|
+
export declare function publishDshUsage(ctx: unknown, info: LlmUsageInfo): Promise<void>;
|