berry-agent-sdk 0.1.0-alpha.2 → 0.1.0-alpha.3
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/LICENSE +21 -0
- package/dist/src/agent/loop.js +5 -4
- package/dist/src/agent/loop.js.map +1 -1
- package/dist/src/agent/queue.d.ts +23 -3
- package/dist/src/agent/queue.js +40 -5
- package/dist/src/agent/queue.js.map +1 -1
- package/dist/src/agent/tools-batch.js +3 -2
- package/dist/src/agent/tools-batch.js.map +1 -1
- package/dist/src/channels/engine/cell.js +7 -0
- package/dist/src/channels/engine/cell.js.map +1 -1
- package/dist/src/channels/engine/color.d.ts +41 -0
- package/dist/src/channels/engine/color.js +110 -0
- package/dist/src/channels/engine/color.js.map +1 -0
- package/dist/src/channels/engine/diff.js +6 -9
- package/dist/src/channels/engine/diff.js.map +1 -1
- package/dist/src/channels/engine/index.d.ts +8 -6
- package/dist/src/channels/engine/index.js +3 -2
- package/dist/src/channels/engine/index.js.map +1 -1
- package/dist/src/channels/engine/input-keys.js +1 -0
- package/dist/src/channels/engine/input-keys.js.map +1 -1
- package/dist/src/channels/engine/input.d.ts +31 -6
- package/dist/src/channels/engine/input.js +95 -10
- package/dist/src/channels/engine/input.js.map +1 -1
- package/dist/src/channels/engine/types.d.ts +33 -5
- package/dist/src/channels/engine/types.js +24 -0
- package/dist/src/channels/engine/types.js.map +1 -1
- package/dist/src/channels/index.d.ts +10 -3
- package/dist/src/channels/index.js +6 -0
- package/dist/src/channels/index.js.map +1 -1
- package/dist/src/channels/renderers.d.ts +67 -0
- package/dist/src/channels/renderers.js +26 -0
- package/dist/src/channels/renderers.js.map +1 -0
- package/dist/src/channels/sdk/jsonl.js +1 -1
- package/dist/src/channels/sdk/jsonl.js.map +1 -1
- package/dist/src/channels/sdk/protocol.d.ts +1 -1
- package/dist/src/channels/service.js +40 -0
- package/dist/src/channels/service.js.map +1 -1
- package/dist/src/channels/tui/autocomplete/async.d.ts +58 -0
- package/dist/src/channels/tui/autocomplete/async.js +88 -0
- package/dist/src/channels/tui/autocomplete/async.js.map +1 -0
- package/dist/src/channels/tui/autocomplete/autocomplete.d.ts +19 -21
- package/dist/src/channels/tui/autocomplete/autocomplete.js +36 -7
- package/dist/src/channels/tui/autocomplete/autocomplete.js.map +1 -1
- package/dist/src/channels/tui/autocomplete/file-mentions.js +25 -16
- package/dist/src/channels/tui/autocomplete/file-mentions.js.map +1 -1
- package/dist/src/channels/tui/autocomplete/fuzzy.d.ts +22 -0
- package/dist/src/channels/tui/autocomplete/fuzzy.js +53 -0
- package/dist/src/channels/tui/autocomplete/fuzzy.js.map +1 -0
- package/dist/src/channels/tui/autocomplete/popup.d.ts +26 -12
- package/dist/src/channels/tui/autocomplete/popup.js +38 -20
- package/dist/src/channels/tui/autocomplete/popup.js.map +1 -1
- package/dist/src/channels/tui/autocomplete/provider.d.ts +7 -6
- package/dist/src/channels/tui/autocomplete/provider.js +3 -1
- package/dist/src/channels/tui/autocomplete/provider.js.map +1 -1
- package/dist/src/channels/tui/backend/ansi-rows.d.ts +4 -4
- package/dist/src/channels/tui/backend/ansi-rows.js +4 -4
- package/dist/src/channels/tui/backend/ansi-rows.js.map +1 -1
- package/dist/src/channels/tui/backend/fixed-budget.d.ts +55 -0
- package/dist/src/channels/tui/backend/fixed-budget.js +52 -0
- package/dist/src/channels/tui/backend/fixed-budget.js.map +1 -0
- package/dist/src/channels/tui/backend/main-screen.d.ts +42 -11
- package/dist/src/channels/tui/backend/main-screen.js +131 -27
- package/dist/src/channels/tui/backend/main-screen.js.map +1 -1
- package/dist/src/channels/tui/backend/transcript.d.ts +119 -4
- package/dist/src/channels/tui/backend/transcript.js +308 -24
- package/dist/src/channels/tui/backend/transcript.js.map +1 -1
- package/dist/src/channels/tui/backend/tui-backend.d.ts +333 -7
- package/dist/src/channels/tui/backend/tui-backend.js +789 -58
- package/dist/src/channels/tui/backend/tui-backend.js.map +1 -1
- package/dist/src/channels/tui/blocks/thinking.d.ts +34 -0
- package/dist/src/channels/tui/blocks/thinking.js +60 -0
- package/dist/src/channels/tui/blocks/thinking.js.map +1 -0
- package/dist/src/channels/tui/blocks/tool-card.d.ts +38 -0
- package/dist/src/channels/tui/blocks/tool-card.js +222 -0
- package/dist/src/channels/tui/blocks/tool-card.js.map +1 -0
- package/dist/src/channels/tui/blocks/word-diff.d.ts +32 -0
- package/dist/src/channels/tui/blocks/word-diff.js +84 -0
- package/dist/src/channels/tui/blocks/word-diff.js.map +1 -0
- package/dist/src/channels/tui/editor/editor-model.d.ts +80 -14
- package/dist/src/channels/tui/editor/editor-model.js +274 -19
- package/dist/src/channels/tui/editor/editor-model.js.map +1 -1
- package/dist/src/channels/tui/editor/editor-view.d.ts +20 -3
- package/dist/src/channels/tui/editor/editor-view.js +44 -13
- package/dist/src/channels/tui/editor/editor-view.js.map +1 -1
- package/dist/src/channels/tui/editor/editor.d.ts +27 -7
- package/dist/src/channels/tui/editor/editor.js +60 -84
- package/dist/src/channels/tui/editor/editor.js.map +1 -1
- package/dist/src/channels/tui/editor/height-cap.d.ts +16 -0
- package/dist/src/channels/tui/editor/height-cap.js +26 -0
- package/dist/src/channels/tui/editor/height-cap.js.map +1 -0
- package/dist/src/channels/tui/editor/kill-ring.d.ts +46 -0
- package/dist/src/channels/tui/editor/kill-ring.js +69 -0
- package/dist/src/channels/tui/editor/kill-ring.js.map +1 -0
- package/dist/src/channels/tui/editor/paste-marker.d.ts +28 -0
- package/dist/src/channels/tui/editor/paste-marker.js +39 -0
- package/dist/src/channels/tui/editor/paste-marker.js.map +1 -0
- package/dist/src/channels/tui/history/history-viewer.d.ts +13 -0
- package/dist/src/channels/tui/history/history-viewer.js +7 -6
- package/dist/src/channels/tui/history/history-viewer.js.map +1 -1
- package/dist/src/channels/tui/history/session-picker.d.ts +63 -0
- package/dist/src/channels/tui/history/session-picker.js +175 -0
- package/dist/src/channels/tui/history/session-picker.js.map +1 -0
- package/dist/src/channels/tui/index.d.ts +5 -0
- package/dist/src/channels/tui/index.js +5 -0
- package/dist/src/channels/tui/index.js.map +1 -1
- package/dist/src/channels/tui/keys/registry.d.ts +99 -0
- package/dist/src/channels/tui/keys/registry.js +274 -0
- package/dist/src/channels/tui/keys/registry.js.map +1 -0
- package/dist/src/channels/tui/markdown/block-rows.d.ts +5 -0
- package/dist/src/channels/tui/markdown/block-rows.js +161 -0
- package/dist/src/channels/tui/markdown/block-rows.js.map +1 -0
- package/dist/src/channels/tui/markdown/blocks.d.ts +18 -3
- package/dist/src/channels/tui/markdown/blocks.js +116 -11
- package/dist/src/channels/tui/markdown/blocks.js.map +1 -1
- package/dist/src/channels/tui/markdown/highlight/index.d.ts +9 -0
- package/dist/src/channels/tui/markdown/highlight/index.js +61 -0
- package/dist/src/channels/tui/markdown/highlight/index.js.map +1 -0
- package/dist/src/channels/tui/markdown/highlight/languages.d.ts +36 -0
- package/dist/src/channels/tui/markdown/highlight/languages.js +143 -0
- package/dist/src/channels/tui/markdown/highlight/languages.js.map +1 -0
- package/dist/src/channels/tui/markdown/highlight/scan.d.ts +48 -0
- package/dist/src/channels/tui/markdown/highlight/scan.js +191 -0
- package/dist/src/channels/tui/markdown/highlight/scan.js.map +1 -0
- package/dist/src/channels/tui/markdown/layout.d.ts +36 -0
- package/dist/src/channels/tui/markdown/layout.js +81 -0
- package/dist/src/channels/tui/markdown/layout.js.map +1 -0
- package/dist/src/channels/tui/markdown/markdown.d.ts +37 -14
- package/dist/src/channels/tui/markdown/markdown.js +86 -123
- package/dist/src/channels/tui/markdown/markdown.js.map +1 -1
- package/dist/src/channels/tui/markdown/streaming.d.ts +38 -0
- package/dist/src/channels/tui/markdown/streaming.js +51 -0
- package/dist/src/channels/tui/markdown/streaming.js.map +1 -0
- package/dist/src/channels/tui/memory/memory-viewer.d.ts +54 -9
- package/dist/src/channels/tui/memory/memory-viewer.js +148 -26
- package/dist/src/channels/tui/memory/memory-viewer.js.map +1 -1
- package/dist/src/channels/tui/overlay/alt-screen.d.ts +10 -1
- package/dist/src/channels/tui/overlay/alt-screen.js +18 -1
- package/dist/src/channels/tui/overlay/alt-screen.js.map +1 -1
- package/dist/src/channels/tui/overlay/select-confirm.d.ts +5 -0
- package/dist/src/channels/tui/overlay/select-confirm.js +5 -5
- package/dist/src/channels/tui/overlay/select-confirm.js.map +1 -1
- package/dist/src/channels/tui/panels/debug-viewer.d.ts +78 -0
- package/dist/src/channels/tui/panels/debug-viewer.js +156 -0
- package/dist/src/channels/tui/panels/debug-viewer.js.map +1 -0
- package/dist/src/channels/tui/panels/diff-viewer.d.ts +117 -0
- package/dist/src/channels/tui/panels/diff-viewer.js +337 -0
- package/dist/src/channels/tui/panels/diff-viewer.js.map +1 -0
- package/dist/src/channels/tui/panels/help-viewer.d.ts +63 -0
- package/dist/src/channels/tui/panels/help-viewer.js +133 -0
- package/dist/src/channels/tui/panels/help-viewer.js.map +1 -0
- package/dist/src/channels/tui/panels/market-picker.d.ts +136 -0
- package/dist/src/channels/tui/panels/market-picker.js +290 -0
- package/dist/src/channels/tui/panels/market-picker.js.map +1 -0
- package/dist/src/channels/tui/panels/sandbox-picker.d.ts +77 -0
- package/dist/src/channels/tui/panels/sandbox-picker.js +176 -0
- package/dist/src/channels/tui/panels/sandbox-picker.js.map +1 -0
- package/dist/src/channels/tui/panels/skills-viewer.d.ts +75 -0
- package/dist/src/channels/tui/panels/skills-viewer.js +171 -0
- package/dist/src/channels/tui/panels/skills-viewer.js.map +1 -0
- package/dist/src/channels/tui/panels/status-viewer.d.ts +78 -0
- package/dist/src/channels/tui/panels/status-viewer.js +116 -0
- package/dist/src/channels/tui/panels/status-viewer.js.map +1 -0
- package/dist/src/channels/tui/panels/theme-picker.d.ts +75 -0
- package/dist/src/channels/tui/panels/theme-picker.js +175 -0
- package/dist/src/channels/tui/panels/theme-picker.js.map +1 -0
- package/dist/src/channels/tui/panels/thinking-picker.d.ts +73 -0
- package/dist/src/channels/tui/panels/thinking-picker.js +178 -0
- package/dist/src/channels/tui/panels/thinking-picker.js.map +1 -0
- package/dist/src/channels/tui/panels/todo-panel.js +10 -4
- package/dist/src/channels/tui/panels/todo-panel.js.map +1 -1
- package/dist/src/channels/tui/panels/tool-progress-panel.d.ts +34 -10
- package/dist/src/channels/tui/panels/tool-progress-panel.js +104 -23
- package/dist/src/channels/tui/panels/tool-progress-panel.js.map +1 -1
- package/dist/src/channels/tui/panels/usage-viewer.d.ts +50 -0
- package/dist/src/channels/tui/panels/usage-viewer.js +111 -0
- package/dist/src/channels/tui/panels/usage-viewer.js.map +1 -0
- package/dist/src/channels/tui/scroll/scroll-view.d.ts +1 -1
- package/dist/src/channels/tui/status/footer.d.ts +7 -0
- package/dist/src/channels/tui/status/footer.js +91 -0
- package/dist/src/channels/tui/status/footer.js.map +1 -0
- package/dist/src/channels/tui/status/status-line.d.ts +24 -1
- package/dist/src/channels/tui/status/status-line.js +60 -6
- package/dist/src/channels/tui/status/status-line.js.map +1 -1
- package/dist/src/channels/tui/theme/custom.d.ts +27 -0
- package/dist/src/channels/tui/theme/custom.js +183 -0
- package/dist/src/channels/tui/theme/custom.js.map +1 -0
- package/dist/src/channels/tui/theme/detect.d.ts +31 -0
- package/dist/src/channels/tui/theme/detect.js +50 -0
- package/dist/src/channels/tui/theme/detect.js.map +1 -0
- package/dist/src/channels/tui/theme/index.d.ts +18 -0
- package/dist/src/channels/tui/theme/index.js +7 -0
- package/dist/src/channels/tui/theme/index.js.map +1 -0
- package/dist/src/channels/tui/theme/palette.d.ts +31 -0
- package/dist/src/channels/tui/theme/palette.js +95 -0
- package/dist/src/channels/tui/theme/palette.js.map +1 -0
- package/dist/src/channels/tui/theme/resolve.d.ts +55 -0
- package/dist/src/channels/tui/theme/resolve.js +84 -0
- package/dist/src/channels/tui/theme/resolve.js.map +1 -0
- package/dist/src/channels/tui/theme/semantic.d.ts +67 -0
- package/dist/src/channels/tui/theme/semantic.js +20 -0
- package/dist/src/channels/tui/theme/semantic.js.map +1 -0
- package/dist/src/channels/tui/theme/session-color.d.ts +16 -0
- package/dist/src/channels/tui/theme/session-color.js +31 -0
- package/dist/src/channels/tui/theme/session-color.js.map +1 -0
- package/dist/src/channels/types.d.ts +15 -1
- package/dist/src/contracts/api.js +7 -6
- package/dist/src/contracts/api.js.map +1 -1
- package/dist/src/contracts/errors.d.ts +7 -1
- package/dist/src/contracts/errors.js +34 -0
- package/dist/src/contracts/errors.js.map +1 -1
- package/dist/src/contracts/events.d.ts +1 -1
- package/dist/src/contracts/events.js +2 -2
- package/dist/src/contracts/events.js.map +1 -1
- package/dist/src/contracts/ui.d.ts +47 -0
- package/package.json +1 -1
- package/dist/src/channels/tui/theme.d.ts +0 -27
- package/dist/src/channels/tui/theme.js +0 -42
- package/dist/src/channels/tui/theme.js.map +0 -1
package/LICENSE
ADDED
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
MIT License
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2026 berry-agent contributors
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
+
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
+
in the Software without restriction, including without limitation the rights
|
|
8
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
+
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
+
furnished to do so, subject to the following conditions:
|
|
11
|
+
|
|
12
|
+
The above copyright notice and this permission notice shall be included in all
|
|
13
|
+
copies or substantial portions of the Software.
|
|
14
|
+
|
|
15
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
+
SOFTWARE.
|
package/dist/src/agent/loop.js
CHANGED
|
@@ -111,10 +111,11 @@ async function runLoop(context, config, emit) {
|
|
|
111
111
|
break;
|
|
112
112
|
pushAll(context, followUps, emit, 'followUp');
|
|
113
113
|
}
|
|
114
|
-
// turn
|
|
115
|
-
//
|
|
116
|
-
// durable
|
|
117
|
-
//
|
|
114
|
+
// turn 间准备窗(prepareNextTurn = agent 件通用缝,非档位切换专用):
|
|
115
|
+
// adjustment 消费位在此(todo/goal 注入同窗)。档位切换面 2026-09-17 已落:
|
|
116
|
+
// 换档走 session/thinking-level durable 事件 + 驱动 run 起取值器钉定——
|
|
117
|
+
// 生效边界 = run 起(04 §5「run 内不可变」律),不经本缝(在飞 run 期
|
|
118
|
+
// 切档 = 下一 run 起跑生效,fold 现值随 run 起现取)。
|
|
118
119
|
const adjustment = await config.prepareNextTurn?.(context);
|
|
119
120
|
if (adjustment) {
|
|
120
121
|
if (adjustment.model !== undefined)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loop.js","sourceRoot":"","sources":["../../../../../src/agent/loop.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"loop.js","sourceRoot":"","sources":["../../../../../src/agent/loop.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAMlD,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,2DAA2D;AAC3D,SAAS,OAAO,CAAC,OAAqB,EAAE,QAAwB,EAAE,IAAY,EAAE,OAA8B;IAC5G,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/B,IAAI,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QACrF,IAAI,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAC1E,CAAC;AACH,CAAC;AAED,gDAAgD;AAChD,SAAS,WAAW,CAAC,OAAyB;IAC5C,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAA0B,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;AAC9F,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,QAAQ,CACtB,OAAqB,EACrB,MAAuB,EACvB,QAAwB,EAAE;IAE1B,MAAM,IAAI,GAAW,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,MAAM,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC;IAC7D,OAAO,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IAC9B,OAAO,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;AACxC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,WAAW,CAAC,OAAqB,EAAE,MAAuB;IACxE,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC3D,MAAM,SAAS,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACxE,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC;IAChG,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,YAAY,EAAE,CAAC;QAC7C,MAAM,IAAI,SAAS,CACjB,wBAAwB,EACxB,8BAA8B,MAAM,CAAC,IAAI,IAAI,GAAG,CAAC,mCAAmC,CACrF,CAAC;IACJ,CAAC;IACD,OAAO,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,MAAM,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;AAC3E,CAAC;AAED,2DAA2D;AAC3D,KAAK,UAAU,OAAO,CAAC,OAAqB,EAAE,MAAuB,EAAE,IAAY;IACjF,IAAI,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC;IAC9B,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,IAAI,UAAkC,CAAC;IACvC,IAAI,YAAgC,CAAC;IACrC,OAAO,IAAI,EAAE,CAAC;QACZ,8CAA8C;QAC9C,iDAAiD;QACjD,gDAAgD;QAChD,0BAA0B;QAC1B,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QACtE,+DAA+D;QAC/D,sDAAsD;QACtD,0CAA0C;QAC1C,IAAI,CAAC,MAAM,MAAM,CAAC,eAAe,EAAE,CAAC,OAAO,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC;YACzD,UAAU,GAAG,MAAM,CAAC;YACpB,MAAM;QACR,CAAC;QACD,IAAI,IAAI,CAAC,CAAC;QACV,IAAI,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;QACnC,MAAM,SAAS,GAAG,MAAM,uBAAuB,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QACvE,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC;QAClC,YAAY,GAAG,SAAS,CAAC,YAAY,CAAC;QACtC,0DAA0D;QAC1D,iFAAiF;QACjF,+DAA+D;QAC/D,uDAAuD;QACvD,+DAA+D;QAC/D,yBAAyB;QACzB,IACE,UAAU,KAAK,OAAO;YACtB,MAAM,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI;YAC/B,YAAY,KAAK,SAAS;YAC1B,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,EAC3B,CAAC;YACD,UAAU,GAAG,SAAS,CAAC;QACzB,CAAC;QACD,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;QAC7C,6CAA6C;QAC7C,IAAI,SAAS,CAAC,UAAU,KAAK,OAAO,IAAI,SAAS,CAAC,UAAU,KAAK,SAAS;YAAE,MAAM;QAClF,iDAAiD;QACjD,IAAI,SAAS,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;YACtC,YAAY,GAAG,SAAS,CAAC,YAAY,IAAI,+BAA+B,CAAC;YACzE,OAAO,CACL,OAAO,EACP,WAAW,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAqB,EAAE,CAAC,CAAC;gBACvD,IAAI,EAAE,YAAY;gBAClB,UAAU,EAAE,IAAI,CAAC,EAAE;gBACnB,QAAQ,EAAE,IAAI,CAAC,IAAI;gBACnB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,0BAA0B,EAAE,CAAC;gBAC7D,OAAO,EAAE,IAAI;gBACb,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;aACtB,CAAC,CAAC,EACH,IAAI,CACL,CAAC;YACF,MAAM;QACR,CAAC;QACD,IAAI,SAAS,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YACvC,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,CAAC;YACtF,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACxC,IAAI,OAAO,CAAC,SAAS;gBAAE,MAAM,CAAC,uBAAuB;QACvD,CAAC;QACD,qDAAqD;QACrD,IAAI,MAAM,MAAM,CAAC,mBAAmB,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC;YAAE,MAAM;QAClE,IAAI,SAAS,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YACvC,sDAAsD;YACtD,MAAM,SAAS,GAAG,MAAM,CAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,CAAC;YACvD,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;gBAAE,MAAM;YAClC,OAAO,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;QAChD,CAAC;QACD,mDAAmD;QACnD,wDAAwD;QACxD,0DAA0D;QAC1D,+CAA+C;QAC/C,sCAAsC;QACtC,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,eAAe,EAAE,CAAC,OAAO,CAAC,CAAC;QAC3D,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,UAAU,CAAC,KAAK,KAAK,SAAS;gBAAE,MAAM,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;YACpE,IAAI,UAAU,CAAC,aAAa,KAAK,SAAS;gBAAE,MAAM,CAAC,aAAa,GAAG,UAAU,CAAC,aAAa,CAAC;QAC9F,CAAC;IACH,CAAC;IACD,oFAAoF;IACpF,MAAM,MAAM,GACV,UAAU,KAAK,OAAO,IAAI,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC;IACpH,IAAI,CAAC;QACH,IAAI,EAAE,WAAW;QACjB,MAAM;QACN,GAAG,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnD,GAAG,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACxD,CAAC,CAAC;IACH,OAAO;QACL,MAAM;QACN,GAAG,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnD,GAAG,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACxD,CAAC;AACJ,CAAC"}
|
|
@@ -31,6 +31,12 @@ export interface PendingItem {
|
|
|
31
31
|
* 普通件(submit/steer)无此位——withdraw 只对操控件有意义。
|
|
32
32
|
*/
|
|
33
33
|
id?: string;
|
|
34
|
+
/**
|
|
35
|
+
* 候跑标记(04 §4 queueFollowUp——挂账解挂批 2026-09-15):busy 期显式
|
|
36
|
+
* 排队位(alt+enter 形)——不入在飞 run 的 steer 取件集,候 run 终态由
|
|
37
|
+
* 候跑取件点种子新起 run。队列只承载不判定(取件过滤归消费侧 drain 判据)。
|
|
38
|
+
*/
|
|
39
|
+
queueFollowUp?: boolean;
|
|
34
40
|
}
|
|
35
41
|
/** enqueue 回执:accepted=false 时 dropped 载被拒/被丢项(回执面可见,不静默) */
|
|
36
42
|
export interface EnqueueReceipt {
|
|
@@ -77,17 +83,31 @@ export declare class PendingMessageQueue {
|
|
|
77
83
|
* @param message 待发消息 @param channel 通道判定结果(驱动侧已裁)
|
|
78
84
|
* @param options.backgroundWake 后台唤醒标记位(随条目透传——消费侧合批/预算面)
|
|
79
85
|
* @param options.id 撤回关联键(随条目透传——withdraw 消费面;e-4)
|
|
86
|
+
* @param options.queueFollowUp 候跑标记位(随条目透传——busy 期 alt+enter
|
|
87
|
+
* 显式排队;消费侧取件过滤判据,见 drain/takeWaiting)
|
|
80
88
|
* @returns 回执:accepted=true 正常入列;false 时 dropped 载被丢/被拒项
|
|
81
89
|
*/
|
|
82
90
|
enqueue(message: AgentMessage, channel: DeliverChannel, options?: {
|
|
83
91
|
backgroundWake?: boolean;
|
|
84
92
|
id?: string;
|
|
93
|
+
queueFollowUp?: boolean;
|
|
85
94
|
}): EnqueueReceipt;
|
|
86
95
|
/**
|
|
87
|
-
* 取件(按 mode:one-at-a-time
|
|
88
|
-
* @
|
|
96
|
+
* 取件(按 mode:one-at-a-time 取满足判据的最早一件;all 取全部满足判据件)。
|
|
97
|
+
* @param options.skip 取件跳过判据(返回 true 的条目本次不取、留队保持原序)
|
|
98
|
+
* ——busy 在飞 run 的 steer 取件集以此滤除候跑件(候跑件堵队首时不遮蔽
|
|
99
|
+
* 后续 steer 件;缺省全纳——与既有取件形零差)。
|
|
100
|
+
* @returns 取出的条目(空队列 / 无满足件返回空数组)
|
|
101
|
+
*/
|
|
102
|
+
drain(options?: {
|
|
103
|
+
skip?: (item: PendingItem) => boolean;
|
|
104
|
+
}): PendingItem[];
|
|
105
|
+
/**
|
|
106
|
+
* 候跑批取(挂账解挂批 2026-09-15——run 终态种子批单源):全取候跑标记件
|
|
107
|
+
* (跨 mode 恒全取——同批候跑件一并作新 run 种子,非逐件起 run);
|
|
108
|
+
* 普通件留队不受累。空(无候跑件)返回空数组。
|
|
89
109
|
*/
|
|
90
|
-
|
|
110
|
+
takeWaiting(): PendingItem[];
|
|
91
111
|
/** 清空(run 收场/会话拆解用;返回被清条目供回执) */
|
|
92
112
|
clear(): PendingItem[];
|
|
93
113
|
/**
|
package/dist/src/agent/queue.js
CHANGED
|
@@ -58,6 +58,8 @@ export class PendingMessageQueue {
|
|
|
58
58
|
* @param message 待发消息 @param channel 通道判定结果(驱动侧已裁)
|
|
59
59
|
* @param options.backgroundWake 后台唤醒标记位(随条目透传——消费侧合批/预算面)
|
|
60
60
|
* @param options.id 撤回关联键(随条目透传——withdraw 消费面;e-4)
|
|
61
|
+
* @param options.queueFollowUp 候跑标记位(随条目透传——busy 期 alt+enter
|
|
62
|
+
* 显式排队;消费侧取件过滤判据,见 drain/takeWaiting)
|
|
61
63
|
* @returns 回执:accepted=true 正常入列;false 时 dropped 载被丢/被拒项
|
|
62
64
|
*/
|
|
63
65
|
enqueue(message, channel, options) {
|
|
@@ -67,6 +69,7 @@ export class PendingMessageQueue {
|
|
|
67
69
|
enqueuedAt: Date.now(),
|
|
68
70
|
...(options?.backgroundWake !== undefined ? { backgroundWake: options.backgroundWake } : {}),
|
|
69
71
|
...(options?.id !== undefined ? { id: options.id } : {}),
|
|
72
|
+
...(options?.queueFollowUp !== undefined ? { queueFollowUp: options.queueFollowUp } : {}),
|
|
70
73
|
};
|
|
71
74
|
if (this.items.length < this.capacityValue) {
|
|
72
75
|
this.items.push(item);
|
|
@@ -82,16 +85,48 @@ export class PendingMessageQueue {
|
|
|
82
85
|
return { accepted: true, dropped };
|
|
83
86
|
}
|
|
84
87
|
/**
|
|
85
|
-
* 取件(按 mode:one-at-a-time
|
|
86
|
-
* @
|
|
88
|
+
* 取件(按 mode:one-at-a-time 取满足判据的最早一件;all 取全部满足判据件)。
|
|
89
|
+
* @param options.skip 取件跳过判据(返回 true 的条目本次不取、留队保持原序)
|
|
90
|
+
* ——busy 在飞 run 的 steer 取件集以此滤除候跑件(候跑件堵队首时不遮蔽
|
|
91
|
+
* 后续 steer 件;缺省全纳——与既有取件形零差)。
|
|
92
|
+
* @returns 取出的条目(空队列 / 无满足件返回空数组)
|
|
87
93
|
*/
|
|
88
|
-
drain() {
|
|
94
|
+
drain(options) {
|
|
89
95
|
if (this.items.length === 0)
|
|
90
96
|
return [];
|
|
91
97
|
if (this.modeValue === 'all') {
|
|
92
|
-
|
|
98
|
+
// 全取形态:按判据分账——满足者全取(序保持),跳过者留队
|
|
99
|
+
if (options?.skip === undefined)
|
|
100
|
+
return this.items.splice(0, this.items.length);
|
|
101
|
+
const taken = [];
|
|
102
|
+
const kept = [];
|
|
103
|
+
for (const item of this.items)
|
|
104
|
+
(options.skip(item) ? kept : taken).push(item);
|
|
105
|
+
if (taken.length === 0)
|
|
106
|
+
return [];
|
|
107
|
+
this.items.splice(0, this.items.length, ...kept);
|
|
108
|
+
return taken;
|
|
93
109
|
}
|
|
94
|
-
|
|
110
|
+
// one-at-a-time:取满足判据的最早一件(跳过件不挡道)
|
|
111
|
+
if (options?.skip === undefined)
|
|
112
|
+
return [this.items.shift()];
|
|
113
|
+
const index = this.items.findIndex((item) => !options.skip(item));
|
|
114
|
+
if (index === -1)
|
|
115
|
+
return [];
|
|
116
|
+
return this.items.splice(index, 1);
|
|
117
|
+
}
|
|
118
|
+
/**
|
|
119
|
+
* 候跑批取(挂账解挂批 2026-09-15——run 终态种子批单源):全取候跑标记件
|
|
120
|
+
* (跨 mode 恒全取——同批候跑件一并作新 run 种子,非逐件起 run);
|
|
121
|
+
* 普通件留队不受累。空(无候跑件)返回空数组。
|
|
122
|
+
*/
|
|
123
|
+
takeWaiting() {
|
|
124
|
+
const waiting = this.items.filter((item) => item.queueFollowUp === true);
|
|
125
|
+
if (waiting.length === 0)
|
|
126
|
+
return [];
|
|
127
|
+
const kept = this.items.filter((item) => item.queueFollowUp !== true);
|
|
128
|
+
this.items.splice(0, this.items.length, ...kept);
|
|
129
|
+
return waiting;
|
|
95
130
|
}
|
|
96
131
|
/** 清空(run 收场/会话拆解用;返回被清条目供回执) */
|
|
97
132
|
clear() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../../../../src/agent/queue.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;
|
|
1
|
+
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../../../../src/agent/queue.ts"],"names":[],"mappings":"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"}
|
|
@@ -144,10 +144,11 @@ export async function executeToolBatch(config, context, calls, emit) {
|
|
|
144
144
|
let allTerminate = true;
|
|
145
145
|
let index = 0;
|
|
146
146
|
while (index < calls.length) {
|
|
147
|
-
// 段前中止检查:已中止 → 余量全部配对 isError 收口(无孤儿 toolUse;配对腿不参与 terminate
|
|
147
|
+
// 段前中止检查:已中止 → 余量全部配对 isError 收口(无孤儿 toolUse;配对腿不参与 terminate 表决——与旧串行路径同律);
|
|
148
|
+
// details 结构化中止标记(批 10i R4——TUI 工具卡 ⏹ 三态判据位)
|
|
148
149
|
if (config.signal?.aborted) {
|
|
149
150
|
for (const call of calls.slice(index)) {
|
|
150
|
-
outcome.results.push(buildResult(call, '工具批已被打断(run 中止——余量配对收口)', true));
|
|
151
|
+
outcome.results.push(buildResult(call, '工具批已被打断(run 中止——余量配对收口)', true, { aborted: true }));
|
|
151
152
|
}
|
|
152
153
|
outcome.terminate = calls.length > 0 && allTerminate;
|
|
153
154
|
return outcome;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools-batch.js","sourceRoot":"","sources":["../../../../../src/agent/tools-batch.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tools-batch.js","sourceRoot":"","sources":["../../../../../src/agent/tools-batch.ts"],"names":[],"mappings":"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"}
|
|
@@ -76,6 +76,13 @@ export class CellGrid {
|
|
|
76
76
|
writeText(row, col, text, style) {
|
|
77
77
|
let cursor = col;
|
|
78
78
|
for (const g of splitGraphemes(text)) {
|
|
79
|
+
// 控制字素防御位(2026-09-17 TUI 余量收官批):cell 是呈现面字素容器,
|
|
80
|
+
// 控制字节落 cell 会被差分发射器原样写出、终端误解执行(LF 落行、底行
|
|
81
|
+
// 触滚——tmux e2e /help 副屏真缺陷的物理载体);跳过不写不占宽。行模型
|
|
82
|
+
// 的多行拆分归面板语义层(buildHelpLines 拆行律),本位只兜底不越权
|
|
83
|
+
const code = g.charCodeAt(0);
|
|
84
|
+
if (code < 0x20 || code === 0x7f)
|
|
85
|
+
continue;
|
|
79
86
|
this.setCell(row, cursor, g, style);
|
|
80
87
|
cursor += graphemeWidth(g);
|
|
81
88
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cell.js","sourceRoot":"","sources":["../../../../../../src/channels/engine/cell.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE3D,kCAAkC;AAClC,MAAM,CAAC,MAAM,WAAW,GAAwB,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAElE,0CAA0C;AAC1C,MAAM,YAAY,GAAmB,MAAM,CAAC,MAAM,CAAC;IACjD,QAAQ,EAAE,GAAG;IACb,KAAK,EAAE,WAAW;IAClB,KAAK,EAAE,CAAU;CAClB,CAAC,CAAC;AAEH,4CAA4C;AAC5C,MAAM,UAAU,WAAW,CAAC,CAAY,EAAE,CAAY;IACpD,OAAO,CACL,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC;QACjC,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC;QACjC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI;QACrB,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM;QACzB,CAAC,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;QAC/B,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG;QACnB,CAAC,CAAC,CAAC,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAC5B,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,CAAc,EAAE,CAAc;IACvD,MAAM,EAAE,GAAG,CAAC,IAAI,YAAY,CAAC;IAC7B,MAAM,EAAE,GAAG,CAAC,IAAI,YAAY,CAAC;IAC7B,OAAO,EAAE,CAAC,QAAQ,KAAK,EAAE,CAAC,QAAQ,IAAI,EAAE,CAAC,KAAK,KAAK,EAAE,CAAC,KAAK,IAAI,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;AACjG,CAAC;AAED;;;;;;GAMG;AACH,MAAM,OAAO,QAAQ;IACZ,OAAO,CAAS;IAChB,IAAI,CAAS;IACpB,sCAAsC;IAC9B,IAAI,CAAkB;IAC9B,0CAA0C;IAClC,WAAW,GAAuB,IAAI,CAAC;IAE/C,YAAY,OAAO,GAAG,EAAE,EAAE,IAAI,GAAG,EAAE;QACjC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,KAAK,CAAc,OAAO,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChE,CAAC;IAED,qCAAqC;IACrC,KAAK;QACH,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IAC1B,CAAC;IAED,OAAO,CAAC,GAAW,EAAE,GAAW;QAC9B,IAAI,GAAG,GAAG,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,IAAI,GAAG,GAAG,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAC;QAC/E,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,8BAA8B;IACpF,CAAC;IAED,OAAO,CAAC,GAAW,EAAE,GAAW,EAAE,QAAgB,EAAE,QAAmB,WAAW;QAChF,qCAAqC;QACrC,IAAI,GAAG,GAAG,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,IAAI,GAAG,GAAG,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO;QAC1E,MAAM,KAAK,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAI,KAAK,KAAK,CAAC;YAAE,OAAO,CAAC,kCAAkC;QAC3D,+BAA+B;QAC/B,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;QACzC,oCAAoC;QACpC,kCAAkC;QAClC,MAAM,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC;QAChC,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,KAAc,EAAE,CAAC;QACnE,IAAI,KAAK,KAAK,CAAC,IAAI,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;YAC1C,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;QAChE,CAAC;IACH,CAAC;IAED,SAAS,CAAC,GAAW,EAAE,GAAW,EAAE,IAAY,EAAE,KAAiB;QACjE,IAAI,MAAM,GAAG,GAAG,CAAC;QACjB,KAAK,MAAM,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;YACrC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;YACpC,MAAM,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC;QAC7B,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,SAAS,CAAC,GAAW,EAAE,GAAW;QAChC,IAAI,CAAC,WAAW,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IACjD,CAAC;IAED,WAAW;QACT,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IAC1B,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,OAAe,EAAE,IAAY;QAClC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,KAAK,CAAc,OAAO,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9D,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IAC1B,CAAC;IAED;;;OAGG;IACK,kBAAkB,CAAC,GAAW,EAAE,GAAW,EAAE,IAAY;QAC/D,MAAM,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC;QAChC,KAAK,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,IAAI,EAAE,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YACnE,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;YACjC,IAAI,CAAC,IAAI;gBAAE,SAAS;YACpB,IAAI,IAAI,CAAC,KAAK,KAAK,CAAC,EAAE,CAAC;gBACrB,gBAAgB;gBAChB,IAAI,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;gBACjB,OAAO,IAAI,IAAI,CAAC,EAAE,CAAC;oBACjB,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;oBACrC,IAAI,KAAK,IAAI,KAAK,CAAC,KAAK,KAAK,CAAC;wBAAE,MAAM;oBACtC,IAAI,EAAE,CAAC;gBACT,CAAC;gBACD,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,CAAC;oBACrD,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;oBAC9B,sCAAsC;oBACtC,IAAI,IAAI,GAAG,IAAI,GAAG,CAAC,CAAC;oBACpB,OAAO,IAAI,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,CAAC;wBAClE,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;wBAC9B,IAAI,EAAE,CAAC;oBACT,CAAC;gBACH,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC;YAC7B,CAAC;iBAAM,IAAI,IAAI,CAAC,KAAK,KAAK,CAAC,EAAE,CAAC;gBAC5B,gBAAgB;gBAChB,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC;gBAC3B,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,CAAC;oBACjE,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC;gBACjC,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"cell.js","sourceRoot":"","sources":["../../../../../../src/channels/engine/cell.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 三档色域实现件(07 §4.1 引擎节件 3 R2 改裁——批 10g)。
|
|
3
|
+
*
|
|
4
|
+
* 职责三块(纯函数、零 IO):
|
|
5
|
+
* - **SGR 序列化**:ColorValue → SGR 参数段(16 色 30+n/90+(n-8) 与 38;5/38;2
|
|
6
|
+
* 扩展形——与既有 buildSgr 双胞胎〔diff 件 / ansi-rows 件〕字节同源,本件
|
|
7
|
+
* 是两处序列化的单源参数生成器);
|
|
8
|
+
* - **降采样**:真彩 → 256(6×6×6 cube + 24 灰阶 + 饱和度感知)与真彩 → 16
|
|
9
|
+
* (标准 xterm 16 色板最近邻)——主题层按终端档位在构造 ResolvedTheme 时
|
|
10
|
+
* 一次性降采(渲染路径零降采开销,样式恒等比较不被降采抖动破坏);
|
|
11
|
+
* - **通道拆解与亮度**:ColorRgb → RgbChannels 与相对亮度判据(OSC 11 背景
|
|
12
|
+
* 明暗裁定的数值面)。
|
|
13
|
+
*/
|
|
14
|
+
import type { AnsiColor, Color256, ColorRgb, ColorValue, RgbChannels } from './types.js';
|
|
15
|
+
/** 真彩通道拆解(`#rrggbb` → 三通道;colorRgb 构造已保证形合法——此处零再校验) */
|
|
16
|
+
export declare function rgbChannels(hex: ColorRgb): RgbChannels;
|
|
17
|
+
/**
|
|
18
|
+
* 相对亮度(WCAG 感知亮度——绿色权重最高贴合人眼;OSC 11 背景明暗裁定判据)。
|
|
19
|
+
* 阈值惯例 0.5:低于即暗底(主题层消费,本件只产数值)。
|
|
20
|
+
*/
|
|
21
|
+
export declare function relativeLuminance({ r, g, b }: RgbChannels): number;
|
|
22
|
+
/** 前景 SGR 参数段('36' / '38;5;n' / '38;2;r;g;b'——buildSgr 消费拼段) */
|
|
23
|
+
export declare function colorSgrFg(color: ColorValue): string;
|
|
24
|
+
/** 背景 SGR 参数段('46' / '48;5;n' / '48;2;r;g;b'——与前景同律) */
|
|
25
|
+
export declare function colorSgrBg(color: ColorValue): string;
|
|
26
|
+
/** 标准 xterm 16 色板(降采最近邻基准表——rgbTo16 单源;测试直锁表完整性) */
|
|
27
|
+
export declare const ANSI16_TABLE: readonly RgbChannels[];
|
|
28
|
+
/**
|
|
29
|
+
* 真彩 → 16 色(标准 xterm 16 色板最近邻——三档降采兜底档)。
|
|
30
|
+
* 8 色降级终端由 SGR 亮位(90+ 段)+ bold 亮色映射惯例兜底(07 支持矩阵)。
|
|
31
|
+
*/
|
|
32
|
+
export declare function rgbTo16({ r, g, b }: RgbChannels): AnsiColor;
|
|
33
|
+
/**
|
|
34
|
+
* 真彩 → 256 色(三档中档降采)。
|
|
35
|
+
*
|
|
36
|
+
* 饱和度感知(saturation-aware):低饱和(灰系)优先 24 级灰阶带
|
|
37
|
+
* 〔232-255——均匀灰阶,cube 端点灰只有 6 级〕,高饱和走 6×6×6 cube
|
|
38
|
+
* 〔16-231,各通道 5 级量化 0/95/135/175/215/255〕。判据 = 最大通道差
|
|
39
|
+
* (max-min < 8 ≈ 视觉无彩)——比 HSV 饱和度更稳定(零除支)。
|
|
40
|
+
*/
|
|
41
|
+
export declare function rgbTo256({ r, g, b }: RgbChannels): Color256;
|
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
import { ansiColor, color256 } from './types.js';
|
|
2
|
+
/** 真彩通道拆解(`#rrggbb` → 三通道;colorRgb 构造已保证形合法——此处零再校验) */
|
|
3
|
+
export function rgbChannels(hex) {
|
|
4
|
+
return {
|
|
5
|
+
r: parseInt(hex.slice(1, 3), 16),
|
|
6
|
+
g: parseInt(hex.slice(3, 5), 16),
|
|
7
|
+
b: parseInt(hex.slice(5, 7), 16),
|
|
8
|
+
};
|
|
9
|
+
}
|
|
10
|
+
/**
|
|
11
|
+
* 相对亮度(WCAG 感知亮度——绿色权重最高贴合人眼;OSC 11 背景明暗裁定判据)。
|
|
12
|
+
* 阈值惯例 0.5:低于即暗底(主题层消费,本件只产数值)。
|
|
13
|
+
*/
|
|
14
|
+
export function relativeLuminance({ r, g, b }) {
|
|
15
|
+
// 感知线性化分段:≤0.03928 走斜率支(数值上 ≈ /12.92),否则幂律支
|
|
16
|
+
const lin = (c) => {
|
|
17
|
+
const v = c / 255;
|
|
18
|
+
return v <= 0.03928 ? v / 12.92 : ((v + 0.055) / 1.055) ** 2.4;
|
|
19
|
+
};
|
|
20
|
+
return 0.2126 * lin(r) + 0.7152 * lin(g) + 0.0722 * lin(b);
|
|
21
|
+
}
|
|
22
|
+
/** 前景 SGR 参数段('36' / '38;5;n' / '38;2;r;g;b'——buildSgr 消费拼段) */
|
|
23
|
+
export function colorSgrFg(color) {
|
|
24
|
+
if (typeof color === 'number') {
|
|
25
|
+
return isAnsi16(color) ? String(color < 8 ? 30 + color : 82 + color) : `38;5;${color}`;
|
|
26
|
+
}
|
|
27
|
+
const { r, g, b } = rgbChannels(color);
|
|
28
|
+
return `38;2;${r};${g};${b}`;
|
|
29
|
+
}
|
|
30
|
+
/** 背景 SGR 参数段('46' / '48;5;n' / '48;2;r;g;b'——与前景同律) */
|
|
31
|
+
export function colorSgrBg(color) {
|
|
32
|
+
if (typeof color === 'number') {
|
|
33
|
+
return isAnsi16(color) ? String(color < 8 ? 40 + color : 92 + color) : `48;5;${color}`;
|
|
34
|
+
}
|
|
35
|
+
const { r, g, b } = rgbChannels(color);
|
|
36
|
+
return `48;2;${r};${g};${b}`;
|
|
37
|
+
}
|
|
38
|
+
/** 数值色判档:brand 无法在运行时区分(同为 number)——16 色域恒 0-15、256 色 16-255 全域交叠在 0-15 */
|
|
39
|
+
function isAnsi16(color) {
|
|
40
|
+
// ColorValue 联合在类型层已收口两 brand;运行时按值域分档:0-15 视作 16 色
|
|
41
|
+
// (256 色板的 0-15 恒指标准 16 色——xterm 语义,两档在该值域同义无须区分)
|
|
42
|
+
return color >= 0 && color <= 15;
|
|
43
|
+
}
|
|
44
|
+
/** 标准 xterm 16 色板(降采最近邻基准表——rgbTo16 单源;测试直锁表完整性) */
|
|
45
|
+
export const ANSI16_TABLE = [
|
|
46
|
+
{ r: 0x00, g: 0x00, b: 0x00 }, // 0 黑
|
|
47
|
+
{ r: 0x80, g: 0x00, b: 0x00 }, // 1 红
|
|
48
|
+
{ r: 0x00, g: 0x80, b: 0x00 }, // 2 绿
|
|
49
|
+
{ r: 0x80, g: 0x80, b: 0x00 }, // 3 黄
|
|
50
|
+
{ r: 0x00, g: 0x00, b: 0x80 }, // 4 蓝
|
|
51
|
+
{ r: 0x80, g: 0x00, b: 0x80 }, // 5 品红
|
|
52
|
+
{ r: 0x00, g: 0x80, b: 0x80 }, // 6 青(accent 缺省域)
|
|
53
|
+
{ r: 0xc0, g: 0xc0, b: 0xc0 }, // 7 亮灰
|
|
54
|
+
{ r: 0x80, g: 0x80, b: 0x80 }, // 8 暗灰
|
|
55
|
+
{ r: 0xff, g: 0x00, b: 0x00 }, // 9 亮红
|
|
56
|
+
{ r: 0x00, g: 0xff, b: 0x00 }, // 10 亮绿
|
|
57
|
+
{ r: 0xff, g: 0xff, b: 0x00 }, // 11 亮黄
|
|
58
|
+
{ r: 0x00, g: 0x00, b: 0xff }, // 12 亮蓝
|
|
59
|
+
{ r: 0xff, g: 0x00, b: 0xff }, // 13 亮品红
|
|
60
|
+
{ r: 0x00, g: 0xff, b: 0xff }, // 14 亮青
|
|
61
|
+
{ r: 0xff, g: 0xff, b: 0xff }, // 15 白
|
|
62
|
+
];
|
|
63
|
+
/** 平方距离(无开方比较——单调等价) */
|
|
64
|
+
function dist2(a, b) {
|
|
65
|
+
const dr = a.r - b.r;
|
|
66
|
+
const dg = a.g - b.g;
|
|
67
|
+
const db = a.b - b.b;
|
|
68
|
+
return dr * dr + dg * dg + db * db;
|
|
69
|
+
}
|
|
70
|
+
/**
|
|
71
|
+
* 真彩 → 16 色(标准 xterm 16 色板最近邻——三档降采兜底档)。
|
|
72
|
+
* 8 色降级终端由 SGR 亮位(90+ 段)+ bold 亮色映射惯例兜底(07 支持矩阵)。
|
|
73
|
+
*/
|
|
74
|
+
export function rgbTo16({ r, g, b }) {
|
|
75
|
+
const target = { r, g, b };
|
|
76
|
+
let best = 0;
|
|
77
|
+
let bestDist = Number.POSITIVE_INFINITY;
|
|
78
|
+
for (let i = 0; i < ANSI16_TABLE.length; i++) {
|
|
79
|
+
const d = dist2(target, ANSI16_TABLE[i]);
|
|
80
|
+
if (d < bestDist) {
|
|
81
|
+
bestDist = d;
|
|
82
|
+
best = i;
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
return ansiColor(best);
|
|
86
|
+
}
|
|
87
|
+
/**
|
|
88
|
+
* 真彩 → 256 色(三档中档降采)。
|
|
89
|
+
*
|
|
90
|
+
* 饱和度感知(saturation-aware):低饱和(灰系)优先 24 级灰阶带
|
|
91
|
+
* 〔232-255——均匀灰阶,cube 端点灰只有 6 级〕,高饱和走 6×6×6 cube
|
|
92
|
+
* 〔16-231,各通道 5 级量化 0/95/135/175/215/255〕。判据 = 最大通道差
|
|
93
|
+
* (max-min < 8 ≈ 视觉无彩)——比 HSV 饱和度更稳定(零除支)。
|
|
94
|
+
*/
|
|
95
|
+
export function rgbTo256({ r, g, b }) {
|
|
96
|
+
const max = Math.max(r, g, b);
|
|
97
|
+
const min = Math.min(r, g, b);
|
|
98
|
+
if (max - min < 8) {
|
|
99
|
+
// 灰系 → 24 级灰阶带:亮度线性映射 232-255
|
|
100
|
+
const luma = Math.round(((r + g + b) / 3 / 255) * 23);
|
|
101
|
+
return color256(232 + luma);
|
|
102
|
+
}
|
|
103
|
+
// cube 量化表:5 级均匀锚点 → 段位(含端点吸附防 254→4 段漂移)
|
|
104
|
+
const quant = (v) => (v < 48 ? 0 : v < 115 ? 1 : v < 155 ? 2 : v < 195 ? 3 : v < 235 ? 4 : 5);
|
|
105
|
+
const r6 = quant(r);
|
|
106
|
+
const g6 = quant(g);
|
|
107
|
+
const b6 = quant(b);
|
|
108
|
+
return color256(16 + 36 * r6 + 6 * g6 + b6);
|
|
109
|
+
}
|
|
110
|
+
//# sourceMappingURL=color.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"color.js","sourceRoot":"","sources":["../../../../../../src/channels/engine/color.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@
|
|
|
15
15
|
* 重绘不走本函数,几何不同即编程错、fail-loud。
|
|
16
16
|
*/
|
|
17
17
|
import { cellEquals, EMPTY_STYLE, styleEquals } from './cell.js';
|
|
18
|
+
import { colorSgrBg, colorSgrFg } from './color.js';
|
|
18
19
|
const ESC = '\x1b';
|
|
19
20
|
/** 光标定位(1 基转义序列——row/col 为 0 基入参) */
|
|
20
21
|
const cup = (row, col) => `${ESC}[${row + 1};${col + 1}H`;
|
|
@@ -22,7 +23,7 @@ const EL_TO_EOL = `${ESC}[K`; // EL 0:自光标至行尾
|
|
|
22
23
|
const SGR_RESET = `${ESC}[0m`;
|
|
23
24
|
const HIDE_CURSOR = `${ESC}[?25l`;
|
|
24
25
|
const SHOW_CURSOR = `${ESC}[?25h`;
|
|
25
|
-
/** 样式 → SGR 序列(全量形——属性位 +
|
|
26
|
+
/** 样式 → SGR 序列(全量形——属性位 + 三档前景背景;空样式返回空串由调用方复位。色段生成单源 = color 件 colorSgrFg/Bg——与 ansi-rows 件 buildSgr 字节同源) */
|
|
26
27
|
function buildSgr(style) {
|
|
27
28
|
const params = [];
|
|
28
29
|
if (style.bold)
|
|
@@ -35,14 +36,10 @@ function buildSgr(style) {
|
|
|
35
36
|
params.push('4');
|
|
36
37
|
if (style.inverse)
|
|
37
38
|
params.push('7');
|
|
38
|
-
if (style.fg !== undefined)
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
if (style.bg !== undefined) {
|
|
43
|
-
// 背景 16 色:0-7 标准位 40+n / 8-15 亮位 100+(n-8)
|
|
44
|
-
params.push(String(style.bg < 8 ? 40 + style.bg : 92 + style.bg));
|
|
45
|
-
}
|
|
39
|
+
if (style.fg !== undefined)
|
|
40
|
+
params.push(colorSgrFg(style.fg));
|
|
41
|
+
if (style.bg !== undefined)
|
|
42
|
+
params.push(colorSgrBg(style.bg));
|
|
46
43
|
return params.length > 0 ? `${ESC}[${params.join(';')}m` : '';
|
|
47
44
|
}
|
|
48
45
|
/** 单帧行级差分:返回本帧应写出的 ANSI 字节串(零变更返回空串) */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../../../../../src/channels/engine/diff.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../../../../../src/channels/engine/diff.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,17 +2,19 @@
|
|
|
2
2
|
* 自研 TUI 引擎公共面(07 篇 §4.1 自研引擎节——件内子目录聚合面)。
|
|
3
3
|
*
|
|
4
4
|
* 批 10b 引擎核心四件 + 内存终端 + 批 10c 编排与输入解码:契约件(types)/
|
|
5
|
-
* 文本度量(width)/ 缓冲(cell)/ 差分(diff)/
|
|
6
|
-
* InputDecoder(含键名表拆件)/ Engine 帧管线编排 /
|
|
7
|
-
*
|
|
5
|
+
* 文本度量(width)/ 缓冲(cell)/ 差分(diff)/ 三档色域(color——批 10g)/
|
|
6
|
+
* MemoryTerminalIO / InputDecoder(含键名表拆件)/ Engine 帧管线编排 /
|
|
7
|
+
* ProcessTerminalIO 真终端适配。组件层归批 10d、TUI 实装装配归批 10e——
|
|
8
|
+
* 本面随批扩。
|
|
8
9
|
*
|
|
9
10
|
* 件内消费(channels 件内 TUI 实装侧)经本面导入;件外(其他模块)只准走
|
|
10
11
|
* channels 公开面三名(02 §4.3 契约面执法——engine/ 非公开面)。
|
|
11
12
|
*/
|
|
12
|
-
export type { AnsiColor, Cell, CellBuffer, CellStyle, CursorState, ImeEvent, InputEvent, KeyEvent, KeyPhase, KeyboardProtocol, MouseButton, MousePhase, MouseEvent, PasteEvent, Region, Renderable, TerminalIO, TextInputEvent, } from './types.js';
|
|
13
|
-
export { ansiColor } from './types.js';
|
|
13
|
+
export type { AnsiColor, Cell, CellBuffer, CellStyle, Color256, ColorRgb, ColorValue, CursorState, ImeEvent, InputEvent, KeyEvent, KeyPhase, KeyboardProtocol, MouseButton, MousePhase, MouseEvent, PasteEvent, Region, Renderable, RgbChannels, TerminalIO, TextInputEvent, } from './types.js';
|
|
14
|
+
export { ansiColor, color256, colorRgb, colorRgbOf } from './types.js';
|
|
15
|
+
export { colorSgrBg, colorSgrFg, relativeLuminance, rgbChannels, rgbTo16, rgbTo256 } from './color.js';
|
|
14
16
|
export { MemoryTerminalIO } from './memory-io.js';
|
|
15
|
-
export { graphemeWidth, splitGraphemes, truncateToWidth, wrapText } from './width.js';
|
|
17
|
+
export { graphemeWidth, splitGraphemes, stringWidth, truncateToWidth, wrapText } from './width.js';
|
|
16
18
|
export { CellGrid, cellEquals, EMPTY_STYLE, styleEquals } from './cell.js';
|
|
17
19
|
export { renderFrameDiff } from './diff.js';
|
|
18
20
|
export type { InputDecoderOptions } from './input.js';
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
export { ansiColor } from './types.js';
|
|
1
|
+
export { ansiColor, color256, colorRgb, colorRgbOf } from './types.js';
|
|
2
|
+
export { colorSgrBg, colorSgrFg, relativeLuminance, rgbChannels, rgbTo16, rgbTo256 } from './color.js';
|
|
2
3
|
export { MemoryTerminalIO } from './memory-io.js';
|
|
3
|
-
export { graphemeWidth, splitGraphemes, truncateToWidth, wrapText } from './width.js';
|
|
4
|
+
export { graphemeWidth, splitGraphemes, stringWidth, truncateToWidth, wrapText } from './width.js';
|
|
4
5
|
export { CellGrid, cellEquals, EMPTY_STYLE, styleEquals } from './cell.js';
|
|
5
6
|
export { renderFrameDiff } from './diff.js';
|
|
6
7
|
export { InputDecoder } from './input.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/channels/engine/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/channels/engine/index.ts"],"names":[],"mappings":"AAoCA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,iBAAiB,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACvG,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,WAAW,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACnG,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAE5C,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"input-keys.js","sourceRoot":"","sources":["../../../../../../src/channels/engine/input-keys.ts"],"names":[],"mappings":"AASA,wCAAwC;AACxC,MAAM,CAAC,MAAM,OAAO,GAAmE;IACrF,IAAI,EAAE,KAAK;IACX,GAAG,EAAE,KAAK;IACV,KAAK,EAAE,KAAK;IACZ,IAAI,EAAE,KAAK;CACZ,CAAC;AAEF,oDAAoD;AACpD,MAAM,CAAC,MAAM,UAAU,GAA2B;IAChD,CAAC,EAAE,MAAM;IACT,CAAC,EAAE,QAAQ;IACX,CAAC,EAAE,QAAQ;IACX,CAAC,EAAE,QAAQ;IACX,CAAC,EAAE,UAAU;IACb,CAAC,EAAE,MAAM;IACT,CAAC,EAAE,KAAK;IACR,EAAE,EAAE,IAAI;IACR,EAAE,EAAE,IAAI;IACR,EAAE,EAAE,IAAI;IACR,EAAE,EAAE,IAAI;IACR,EAAE,EAAE,IAAI;IACR,EAAE,EAAE,IAAI;IACR,EAAE,EAAE,IAAI;IACR,EAAE,EAAE,IAAI;IACR,EAAE,EAAE,IAAI;IACR,EAAE,EAAE,KAAK;IACT,EAAE,EAAE,KAAK;IACT,EAAE,EAAE,KAAK;IACT,EAAE,EAAE,MAAM;CACX,CAAC;AAEF;uCACuC;AACvC,MAAM,CAAC,MAAM,cAAc,GAA2B;IACpD,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,OAAO;IACd,KAAK,EAAE,IAAI;IACX,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,QAAQ;IACf,KAAK,EAAE,UAAU;IACjB,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,KAAK;IACZ,KAAK,EAAE,QAAQ;IACf,KAAK,EAAE,QAAQ;CAChB,CAAC;AAEF,0EAA0E;AAC1E,MAAM,CAAC,MAAM,WAAW,GAA2B;IACjD,CAAC,EAAE,IAAI;IACP,CAAC,EAAE,MAAM;IACT,CAAC,EAAE,OAAO;IACV,CAAC,EAAE,MAAM;IACT,CAAC,EAAE,OAAO;IACV,CAAC,EAAE,MAAM;IACT,CAAC,EAAE,KAAK;IACR,CAAC,EAAE,IAAI;IACP,CAAC,EAAE,IAAI;IACP,CAAC,EAAE,IAAI;IACP,CAAC,EAAE,IAAI;CACR,CAAC;AAEF;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,KAAyB;IAMlD,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;IACnC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,GAAG,OAAO,EAAE,CAAC;IACzD,OAAO;QACL,KAAK,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC;QACtB,GAAG,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QACrB,IAAI,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC;QACvB,IAAI,EAAE,CAAC,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC;KAC3B,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,WAAW,CAAC,SAAiB;IAC3C,IAAI,SAAS,KAAK,CAAC;QAAE,OAAO,QAAQ,CAAC;IACrC,IAAI,SAAS,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IACtC,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
|
1
|
+
{"version":3,"file":"input-keys.js","sourceRoot":"","sources":["../../../../../../src/channels/engine/input-keys.ts"],"names":[],"mappings":"AASA,wCAAwC;AACxC,MAAM,CAAC,MAAM,OAAO,GAAmE;IACrF,IAAI,EAAE,KAAK;IACX,GAAG,EAAE,KAAK;IACV,KAAK,EAAE,KAAK;IACZ,IAAI,EAAE,KAAK;CACZ,CAAC;AAEF,oDAAoD;AACpD,MAAM,CAAC,MAAM,UAAU,GAA2B;IAChD,CAAC,EAAE,MAAM;IACT,CAAC,EAAE,QAAQ;IACX,CAAC,EAAE,QAAQ;IACX,CAAC,EAAE,KAAK,EAAE,mFAAmF;IAC7F,CAAC,EAAE,QAAQ;IACX,CAAC,EAAE,UAAU;IACb,CAAC,EAAE,MAAM;IACT,CAAC,EAAE,KAAK;IACR,EAAE,EAAE,IAAI;IACR,EAAE,EAAE,IAAI;IACR,EAAE,EAAE,IAAI;IACR,EAAE,EAAE,IAAI;IACR,EAAE,EAAE,IAAI;IACR,EAAE,EAAE,IAAI;IACR,EAAE,EAAE,IAAI;IACR,EAAE,EAAE,IAAI;IACR,EAAE,EAAE,IAAI;IACR,EAAE,EAAE,KAAK;IACT,EAAE,EAAE,KAAK;IACT,EAAE,EAAE,KAAK;IACT,EAAE,EAAE,MAAM;CACX,CAAC;AAEF;uCACuC;AACvC,MAAM,CAAC,MAAM,cAAc,GAA2B;IACpD,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,OAAO;IACd,KAAK,EAAE,IAAI;IACX,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,QAAQ;IACf,KAAK,EAAE,UAAU;IACjB,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,KAAK;IACZ,KAAK,EAAE,QAAQ;IACf,KAAK,EAAE,QAAQ;CAChB,CAAC;AAEF,0EAA0E;AAC1E,MAAM,CAAC,MAAM,WAAW,GAA2B;IACjD,CAAC,EAAE,IAAI;IACP,CAAC,EAAE,MAAM;IACT,CAAC,EAAE,OAAO;IACV,CAAC,EAAE,MAAM;IACT,CAAC,EAAE,OAAO;IACV,CAAC,EAAE,MAAM;IACT,CAAC,EAAE,KAAK;IACR,CAAC,EAAE,IAAI;IACP,CAAC,EAAE,IAAI;IACP,CAAC,EAAE,IAAI;IACP,CAAC,EAAE,IAAI;CACR,CAAC;AAEF;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,KAAyB;IAMlD,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;IACnC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,GAAG,OAAO,EAAE,CAAC;IACzD,OAAO;QACL,KAAK,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC;QACtB,GAAG,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QACrB,IAAI,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC;QACvB,IAAI,EAAE,CAAC,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC;KAC3B,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,WAAW,CAAC,SAAiB;IAC3C,IAAI,SAAS,KAAK,CAAC;QAAE,OAAO,QAAQ,CAAC;IACrC,IAAI,SAAS,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IACtC,OAAO,OAAO,CAAC;AACjB,CAAC"}
|