micro-models-agent 2.10.0 → 2.12.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +33 -0
- package/dist/assets/app.js +22 -4
- package/dist/assets/index.html +29 -0
- package/dist/assets/js/dom.js +2 -1
- package/dist/assets/js/feed.js +38 -26
- package/dist/assets/js/format.js +1 -1
- package/dist/assets/js/rail.js +114 -0
- package/dist/assets/js/settings-controls.js +2 -2
- package/dist/assets/js/settings.js +246 -51
- package/dist/assets/js/store.js +3 -0
- package/dist/assets/js/tabs.js +104 -2
- package/dist/assets/styles.css +215 -66
- package/dist/cli/cache-line.js +1 -0
- package/dist/cli/command-suggest.js +5 -4
- package/dist/cli/commands.js +231 -122
- package/dist/cli/completer.js +132 -31
- package/dist/cli/index.js +1 -0
- package/dist/cli/json-payload.js +4 -4
- package/dist/cli/main.js +166 -61
- package/dist/cli/onboarding-commands.js +126 -0
- package/dist/cli/plugin-commands.js +2 -1
- package/dist/cli/relaunch.js +16 -13
- package/dist/cli/repl-commands-lsp.js +75 -0
- package/dist/cli/repl-commands-skills.js +105 -0
- package/dist/cli/repl-commands.js +589 -266
- package/dist/cli/repl.js +436 -177
- package/dist/cli/run-result.js +5 -6
- package/dist/cli/security-commands.js +37 -28
- package/dist/cli/setup-order.js +4 -55
- package/dist/cli/setup-prompt.js +3 -2
- package/dist/cli/setup.js +27 -107
- package/dist/cli/web-command.js +98 -0
- package/dist/config/budget.js +5 -5
- package/dist/config/config.js +103 -96
- package/dist/config/defaults.js +38 -8
- package/dist/config/domains.js +24 -27
- package/dist/config/env.js +46 -0
- package/dist/config/experts.js +2 -0
- package/dist/config/index.js +1 -0
- package/dist/config/paths.js +56 -0
- package/dist/config/redact.js +44 -0
- package/dist/config/registry-extra.js +334 -0
- package/dist/config/registry.js +584 -0
- package/dist/config/security.js +35 -36
- package/dist/config/timeouts.js +74 -0
- package/dist/config/utils.js +16 -15
- package/dist/core/agent/artifact-progress.js +59 -0
- package/dist/core/agent/artifact-resolve.js +79 -0
- package/dist/core/agent/audit-gate.js +7 -3
- package/dist/core/agent/compaction.js +2 -2
- package/dist/core/agent/constants.js +33 -4
- package/dist/core/agent/context-log.js +454 -0
- package/dist/core/agent/context-renderer.js +5 -0
- package/dist/core/agent/critic-gate.js +132 -0
- package/dist/core/agent/hallucination-gate.js +148 -38
- package/dist/core/agent/loop-state.js +15 -0
- package/dist/core/agent/prefix-monitor.js +1 -1
- package/dist/core/agent/reasoning-resolver.js +10 -1
- package/dist/core/agent/token-tracker.js +7 -4
- package/dist/core/agent/tool-batch.js +93 -18
- package/dist/core/agent/tool-images.js +18 -0
- package/dist/core/agent/tool-output.js +65 -11
- package/dist/core/agent/tool-pairing.js +60 -0
- package/dist/core/agent-moe.js +25 -24
- package/dist/core/agent.js +429 -108
- package/dist/core/bootstrap/agent-phase.js +66 -0
- package/dist/core/bootstrap/config-phase.js +86 -0
- package/dist/core/bootstrap/modules-phase.js +269 -0
- package/dist/core/bootstrap/provider-phase.js +183 -0
- package/dist/core/bootstrap/session-phase.js +204 -0
- package/dist/core/bootstrap/state.js +94 -0
- package/dist/core/bootstrap/workspace-phase.js +115 -0
- package/dist/core/bootstrap.js +92 -660
- package/dist/core/crash-handler.js +17 -7
- package/dist/core/environment.js +37 -12
- package/dist/core/host-plan.js +43 -0
- package/dist/core/host.js +23 -0
- package/dist/core/index.js +1 -0
- package/dist/core/prompt-builder.js +17 -1
- package/dist/core/prompt-overflow.js +42 -43
- package/dist/core/session-logger.js +122 -30
- package/dist/core/system-prompt.js +117 -0
- package/dist/core/version.js +6 -4
- package/dist/core/web-host.js +34 -0
- package/dist/core/workspace.js +19 -15
- package/dist/i18n/en.json +106 -21
- package/dist/i18n/index.js +37 -3
- package/dist/i18n/ru.json +109 -21
- package/dist/index.js +7 -3
- package/dist/llm/image-utils.js +55 -64
- package/dist/llm/llm-errors.js +9 -0
- package/dist/llm/model-loader.js +10 -32
- package/dist/llm/models-dev.js +121 -0
- package/dist/llm/openai-compat.js +146 -73
- package/dist/llm/orchestrator.js +33 -11
- package/dist/llm/provider-budget.js +2 -2
- package/dist/llm/provider-context.js +233 -0
- package/dist/llm/provider.js +1 -1
- package/dist/llm/response.js +5 -0
- package/dist/llm/token-counter.js +27 -11
- package/dist/logger/app-logger.js +48 -22
- package/dist/logger/file-log.js +28 -19
- package/dist/logger/index.js +1 -0
- package/dist/main.js +24285 -22447
- package/dist/migration/backup.js +14 -3
- package/dist/migration/detect.js +12 -3
- package/dist/migration/index.js +1 -0
- package/dist/modules/artifacts/store.js +9 -8
- package/dist/modules/browser/actions.js +6 -0
- package/dist/modules/browser/bridge-client.js +14 -12
- package/dist/modules/browser/bridge-path.js +4 -4
- package/dist/modules/browser/console-buffer.js +37 -0
- package/dist/modules/browser/cookie-store.js +5 -0
- package/dist/modules/browser/driver-types.js +1 -0
- package/dist/modules/browser/driver.js +19 -11
- package/dist/modules/browser/index.js +3 -1
- package/dist/modules/browser/module.js +2 -1
- package/dist/modules/browser/session.js +10 -30
- package/dist/modules/browser/snapshot.js +19 -13
- package/dist/modules/browser/types.js +1 -0
- package/dist/modules/certification/cli.js +28 -20
- package/dist/modules/certification/fact-checker.js +9 -1
- package/dist/modules/certification/loader.js +9 -2
- package/dist/modules/certification/manifest.js +83 -21
- package/dist/modules/certification/runner.js +23 -13
- package/dist/modules/certification/scenarios.js +20 -20
- package/dist/modules/certification/syntax-scenarios.js +1 -2
- package/dist/modules/context/chunk-query.js +11 -9
- package/dist/modules/context/fact-extractor.js +37 -39
- package/dist/modules/context/index.js +1 -0
- package/dist/modules/context/manager.js +106 -80
- package/dist/modules/critic/client.js +176 -0
- package/dist/modules/critic/evidence.js +81 -0
- package/dist/modules/critic/provider.js +45 -0
- package/dist/modules/critic/tools.js +78 -0
- package/dist/modules/critic/types.js +1 -0
- package/dist/modules/execution/audit-runners.js +28 -34
- package/dist/modules/execution/auditor.js +53 -49
- package/dist/modules/execution/execution-plugin.js +142 -102
- package/dist/modules/execution/index.js +1 -1
- package/dist/modules/execution/input-from.js +37 -13
- package/dist/modules/execution/module.js +368 -191
- package/dist/modules/execution/moe-executor.js +53 -26
- package/dist/modules/execution/plan-actions.js +320 -202
- package/dist/modules/execution/plan-checks.js +35 -0
- package/dist/modules/execution/plan-coverage.js +36 -33
- package/dist/modules/execution/plan-steps.js +11 -3
- package/dist/modules/execution/plan-store.js +83 -17
- package/dist/modules/execution/plan-tool.js +89 -35
- package/dist/modules/execution/plan-validator.js +30 -10
- package/dist/modules/execution/planner.js +22 -13
- package/dist/modules/execution/stuck-detector.js +196 -93
- package/dist/modules/execution/tracker.js +22 -8
- package/dist/modules/execution/verifier.js +69 -48
- package/dist/modules/execution/windows-commands.js +12 -12
- package/dist/modules/hallucination/artifact-claim.js +93 -0
- package/dist/modules/hallucination/confidence.js +13 -11
- package/dist/modules/hallucination/consistency.js +10 -2
- package/dist/modules/hallucination/detector.js +10 -5
- package/dist/modules/hallucination/factual.js +43 -26
- package/dist/modules/hallucination/index.js +1 -0
- package/dist/modules/hallucination/js-identifiers.js +44 -45
- package/dist/modules/hallucination/llm-judge.js +17 -12
- package/dist/modules/hallucination/success-claim.js +59 -0
- package/dist/modules/indexer/cache.js +52 -4
- package/dist/modules/indexer/index.js +1 -0
- package/dist/modules/indexer/map-command.js +2 -4
- package/dist/modules/indexer/map-select.js +16 -16
- package/dist/modules/indexer/module.js +47 -12
- package/dist/modules/indexer/project-profile.js +8 -7
- package/dist/modules/indexer/symbols.js +15 -15
- package/dist/modules/indexer/walker.js +159 -29
- package/dist/modules/lsp/check-tool.js +7 -5
- package/dist/modules/lsp/client.js +39 -39
- package/dist/modules/lsp/command.js +17 -24
- package/dist/modules/lsp/config.js +12 -11
- package/dist/modules/lsp/index.js +1 -0
- package/dist/modules/lsp/module.js +48 -46
- package/dist/modules/lsp/probe.js +13 -14
- package/dist/modules/lsp/project-root.js +14 -17
- package/dist/modules/lsp/startup-check.js +18 -16
- package/dist/modules/mcp/client.js +59 -62
- package/dist/modules/mcp/index.js +1 -0
- package/dist/modules/mcp/module.js +66 -37
- package/dist/modules/mcp/registry.js +5 -0
- package/dist/modules/memory/index.js +1 -0
- package/dist/modules/memory/module.js +12 -8
- package/dist/modules/memory/search.js +4 -1
- package/dist/modules/memory/store.js +40 -2
- package/dist/modules/onboarding/init.js +47 -0
- package/dist/modules/onboarding/meet.js +30 -0
- package/dist/modules/onboarding/mode.js +30 -0
- package/dist/modules/onboarding/prompts.js +43 -0
- package/dist/modules/pipelines/engine.js +10 -0
- package/dist/modules/pipelines/index.js +1 -0
- package/dist/modules/pipelines/parser.js +4 -1
- package/dist/modules/pipelines/template.js +4 -0
- package/dist/modules/plugins/builtin/lint-on-write.js +80 -67
- package/dist/modules/plugins/builtin/notify.js +2 -0
- package/dist/modules/plugins/index.js +1 -0
- package/dist/modules/plugins/loader.js +18 -3
- package/dist/modules/plugins/manager.js +37 -17
- package/dist/modules/pricing/index.js +10 -11
- package/dist/modules/pricing/prices.js +12 -12
- package/dist/modules/processes/index.js +1 -0
- package/dist/modules/processes/kill-tree.js +27 -31
- package/dist/modules/processes/registry.js +44 -25
- package/dist/modules/processes/runner.js +4 -4
- package/dist/modules/providers/capabilities.js +28 -0
- package/dist/modules/providers/create.js +3 -4
- package/dist/modules/providers/factory.js +7 -7
- package/dist/modules/providers/fallback.js +12 -12
- package/dist/modules/providers/health.js +4 -4
- package/dist/modules/providers/manager.js +50 -19
- package/dist/modules/providers/naming.js +15 -0
- package/dist/modules/providers/preflight.js +71 -0
- package/dist/modules/providers/presets.js +39 -8
- package/dist/modules/providers/registry.js +7 -2
- package/dist/modules/reasoning/policy.js +8 -6
- package/dist/modules/reasoning/probe.js +30 -25
- package/dist/modules/security/audit-log.js +19 -36
- package/dist/modules/security/audit-notifier.js +35 -75
- package/dist/modules/security/command-validator.js +99 -51
- package/dist/modules/security/content-scanner.js +8 -8
- package/dist/modules/security/data-sanitizer.js +9 -16
- package/dist/modules/security/encryption.js +32 -52
- package/dist/modules/security/index.js +2 -1
- package/dist/modules/security/network-validator.js +120 -43
- package/dist/modules/security/path-validator.js +61 -46
- package/dist/modules/security/protected-paths.js +73 -0
- package/dist/modules/security/rate-limiter.js +17 -49
- package/dist/modules/security/security-policies.js +25 -57
- package/dist/modules/security/session-encryption.js +32 -71
- package/dist/modules/security/session-isolation.js +15 -28
- package/dist/modules/session/auto-name.js +63 -0
- package/dist/modules/session/export.js +98 -0
- package/dist/modules/session/index.js +1 -0
- package/dist/modules/session/manager.js +79 -28
- package/dist/modules/session/module.js +4 -3
- package/dist/modules/session/store.js +57 -20
- package/dist/modules/setup/answers.js +35 -0
- package/dist/modules/setup/apply.js +79 -0
- package/dist/modules/setup/discovery.js +72 -0
- package/dist/modules/skills/index.js +1 -0
- package/dist/modules/skills/loader.js +9 -1
- package/dist/modules/skills/module.js +11 -0
- package/dist/modules/updater/changelog-reader.js +15 -16
- package/dist/modules/updater/checker.js +9 -4
- package/dist/modules/updater/dev-detect.js +7 -6
- package/dist/modules/updater/index.js +1 -0
- package/dist/modules/updater/module.js +17 -15
- package/dist/modules/user-profile/compressor.js +2 -0
- package/dist/modules/user-profile/index.js +1 -0
- package/dist/modules/user-profile/profile.js +10 -1
- package/dist/modules/webui/answer-api.js +29 -0
- package/dist/modules/webui/assets.js +50 -0
- package/dist/modules/webui/body.js +21 -0
- package/dist/modules/webui/commands-settings.js +209 -0
- package/dist/modules/webui/commands-shared.js +60 -0
- package/dist/modules/webui/commands.js +174 -0
- package/dist/modules/webui/config-api.js +134 -0
- package/dist/modules/webui/file-api.js +202 -0
- package/dist/modules/webui/forward.js +159 -0
- package/dist/modules/webui/history-api.js +112 -0
- package/dist/modules/webui/host-state.js +60 -0
- package/dist/modules/webui/i18n-api.js +9 -0
- package/dist/modules/webui/limits.js +6 -0
- package/dist/modules/webui/log-forward.js +20 -0
- package/dist/modules/webui/memory-commands.js +64 -0
- package/dist/modules/webui/model-cache.js +18 -0
- package/dist/modules/webui/module.js +148 -0
- package/dist/modules/webui/persist.js +24 -0
- package/dist/modules/webui/prompt-io.js +97 -0
- package/dist/modules/webui/providers-api.js +337 -0
- package/dist/modules/webui/providers-view.js +56 -0
- package/dist/modules/webui/reasoning-view.js +15 -0
- package/dist/modules/webui/run-agent.js +81 -0
- package/dist/modules/webui/server.js +284 -0
- package/dist/modules/webui/sessions-api.js +178 -0
- package/dist/modules/webui/settings-api.js +561 -0
- package/dist/modules/webui/setup-api.js +201 -0
- package/dist/modules/webui/state.js +74 -0
- package/dist/modules/webui/util.js +261 -0
- package/dist/output/bus.js +7 -2
- package/dist/output/channel.js +80 -28
- package/dist/output/format.js +2 -1
- package/dist/output/index.js +1 -0
- package/dist/output/json-sink.js +5 -3
- package/dist/output/machine.js +4 -3
- package/dist/output/session-sink.js +4 -4
- package/dist/tools/approve.js +4 -0
- package/dist/tools/attach-image.js +5 -4
- package/dist/tools/auto-fixer.js +26 -44
- package/dist/tools/auto-tags.js +83 -0
- package/dist/tools/bash.js +193 -116
- package/dist/tools/browser.js +76 -31
- package/dist/tools/chunk-query.js +14 -6
- package/dist/tools/create-dir.js +9 -5
- package/dist/tools/delete-file.js +9 -5
- package/dist/tools/download-file.js +32 -7
- package/dist/tools/edit-file.js +52 -14
- package/dist/tools/enable-tools.js +6 -6
- package/dist/tools/executor.js +132 -27
- package/dist/tools/file-info.js +3 -1
- package/dist/tools/filter-tools.js +3 -3
- package/dist/tools/glob-tool.js +4 -1
- package/dist/tools/grep-tool.js +13 -10
- package/dist/tools/hidden-tools-block.js +6 -6
- package/dist/tools/index.js +16 -8
- package/dist/tools/list-dir.js +4 -2
- package/dist/tools/load-skill.js +7 -0
- package/dist/tools/mcp-call.js +15 -4
- package/dist/tools/meet-done.js +14 -0
- package/dist/tools/move-file.js +14 -7
- package/dist/tools/path-utils.js +29 -29
- package/dist/tools/pipeline-run.js +29 -7
- package/dist/tools/preview.js +1 -1
- package/dist/tools/process-ids.js +31 -0
- package/dist/tools/process-kill.js +9 -16
- package/dist/tools/process-list.js +1 -0
- package/dist/tools/process-log.js +11 -16
- package/dist/tools/process-wait.js +63 -0
- package/dist/tools/prompt-io.js +4 -3
- package/dist/tools/question.js +172 -25
- package/dist/tools/read-file.js +55 -34
- package/dist/tools/recall.js +14 -8
- package/dist/tools/registry.js +6 -5
- package/dist/tools/remember.js +8 -4
- package/dist/tools/scope-request.js +11 -6
- package/dist/tools/search-history.js +5 -2
- package/dist/tools/session-info.js +2 -0
- package/dist/tools/set-thinking.js +8 -4
- package/dist/tools/subagent.js +59 -39
- package/dist/tools/syntax-validator.js +292 -90
- package/dist/tools/user-input.js +22 -18
- package/dist/tools/web-browse.js +9 -3
- package/dist/tools/web-fetch.js +12 -23
- package/dist/tools/web-search.js +7 -5
- package/dist/tools/write-file.js +45 -15
- package/dist/ui/action-log.js +13 -0
- package/dist/ui/box.js +4 -3
- package/dist/ui/colors.js +2 -0
- package/dist/ui/diff.js +6 -5
- package/dist/ui/index.js +1 -0
- package/dist/ui/line-editor.js +230 -122
- package/dist/ui/line-math.js +10 -2
- package/dist/ui/md-formatter.js +57 -37
- package/dist/ui/output.js +8 -3
- package/dist/ui/plan-view.js +21 -10
- package/dist/ui/renderer.js +393 -67
- package/dist/ui/spinner.js +16 -5
- package/dist/ui/table.js +15 -17
- package/dist/ui/theme.js +143 -0
- package/dist/utils/child-run.js +20 -0
- package/dist/utils/error.js +1 -1
- package/dist/utils/index.js +2 -0
- package/dist/utils/retry.js +2 -2
- package/dist/utils/truncate.js +1 -1
- package/package.json +1 -1
package/dist/ui/renderer.js
CHANGED
|
@@ -1,6 +1,9 @@
|
|
|
1
|
+
// Рендерер чата: события агента в терминальные строки по STYLE.md.
|
|
1
2
|
import { pc } from "./colors";
|
|
2
3
|
import { FormattingStream } from "./md-formatter";
|
|
3
4
|
import { Spinner } from "./spinner";
|
|
5
|
+
import { actionMarkFor, failureMark, glyph, successMark, formatDuration, toolAccent, } from "./theme";
|
|
6
|
+
import { recordLastAction } from "./action-log";
|
|
4
7
|
import { getTerminalWidth } from "./table";
|
|
5
8
|
import { t } from "../i18n/index";
|
|
6
9
|
import { formatCost } from "../modules/pricing/prices";
|
|
@@ -9,7 +12,7 @@ import { isAbsolute, relative, sep } from "path";
|
|
|
9
12
|
function formatUsd(cost) {
|
|
10
13
|
return formatCost(cost);
|
|
11
14
|
}
|
|
12
|
-
/**
|
|
15
|
+
/** Тулы, чей аргумент `path` показывается в шапке. */
|
|
13
16
|
const PATH_TOOLS = new Set([
|
|
14
17
|
"read_file",
|
|
15
18
|
"write_file",
|
|
@@ -24,41 +27,53 @@ function toDisplayPath(baseDir, p) {
|
|
|
24
27
|
if (!baseDir || !isAbsolute(p))
|
|
25
28
|
return p;
|
|
26
29
|
const rel = relative(baseDir, p);
|
|
27
|
-
//
|
|
30
|
+
// Вне baseDir (префикс ../) или другой диск (абсолютный результат) — как есть.
|
|
28
31
|
if (!rel || rel.startsWith("..") || isAbsolute(rel))
|
|
29
32
|
return p;
|
|
30
33
|
return rel.split(sep).join("/");
|
|
31
34
|
}
|
|
32
35
|
const GUTTER = " ";
|
|
33
36
|
const MAX_OUTPUT_LINES = 50;
|
|
34
|
-
|
|
37
|
+
const ANSI_RE = /\x1b\[[0-9;]*m/g;
|
|
38
|
+
function stripAnsi(text) {
|
|
39
|
+
return text.replace(ANSI_RE, "");
|
|
40
|
+
}
|
|
41
|
+
/** Тулы без busy-спиннера: висят на промпте пользователя. */
|
|
35
42
|
const SPINNERLESS_TOOLS = new Set(["question", "approve"]);
|
|
36
|
-
/**
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
43
|
+
/**
|
|
44
|
+
* Read-only тулы разведки. В quiet прогон таких сворачивается в одну строку
|
|
45
|
+
* `│ N actions ✓`; мутирующие/исполняющие всегда видимы.
|
|
46
|
+
*/
|
|
47
|
+
const RECON_TOOLS = new Set([
|
|
48
|
+
"read_file",
|
|
49
|
+
"list_dir",
|
|
50
|
+
"glob",
|
|
51
|
+
"grep",
|
|
52
|
+
"file_info",
|
|
53
|
+
"project_map",
|
|
54
|
+
"chunk_query",
|
|
55
|
+
"web_search",
|
|
56
|
+
"web_fetch",
|
|
57
|
+
"web_browse",
|
|
58
|
+
"search_history",
|
|
59
|
+
"recall",
|
|
60
|
+
"session_info",
|
|
61
|
+
"process_list",
|
|
62
|
+
"process_log",
|
|
63
|
+
]);
|
|
64
|
+
/**
|
|
65
|
+
* Ведущий маркер каждого действия. В стиле один маркер (`◇`) на все тулы:
|
|
66
|
+
* категории передаются локализованным ярлыком, а не глифом.
|
|
67
|
+
* Функция ради вызывающих с явным `icon`.
|
|
68
|
+
*/
|
|
69
|
+
export function toolMarker(_tool) {
|
|
70
|
+
return glyph.action;
|
|
57
71
|
}
|
|
72
|
+
/** Rich-терминал: TTY и не CI. */
|
|
58
73
|
export function isRichTerminal() {
|
|
59
74
|
return Boolean(process.stdout.isTTY) && !process.env.CI;
|
|
60
75
|
}
|
|
61
|
-
/**
|
|
76
|
+
/** Короткая человекочитаемая сводка аргументов тула. */
|
|
62
77
|
export function summarizeArgs(args) {
|
|
63
78
|
const preferred = ["path", "file", "query", "url", "command", "name"];
|
|
64
79
|
for (const key of preferred) {
|
|
@@ -72,15 +87,134 @@ export function summarizeArgs(args) {
|
|
|
72
87
|
return "";
|
|
73
88
|
return serialized.length > 60 ? `${serialized.slice(0, 57)}…` : serialized;
|
|
74
89
|
}
|
|
90
|
+
/** Скалярные ключи, показываемые как есть, в порядке приоритета, для обычных тулов. */
|
|
91
|
+
const GENERIC_ARG_KEYS = [
|
|
92
|
+
"path",
|
|
93
|
+
"file",
|
|
94
|
+
"pattern",
|
|
95
|
+
"query",
|
|
96
|
+
"url",
|
|
97
|
+
"command",
|
|
98
|
+
"name",
|
|
99
|
+
"task",
|
|
100
|
+
"level",
|
|
101
|
+
"id",
|
|
102
|
+
"source",
|
|
103
|
+
"step",
|
|
104
|
+
"key",
|
|
105
|
+
"value",
|
|
106
|
+
"text",
|
|
107
|
+
];
|
|
108
|
+
function str(value) {
|
|
109
|
+
if (typeof value === "string")
|
|
110
|
+
return value;
|
|
111
|
+
if (typeof value === "number")
|
|
112
|
+
return String(value);
|
|
113
|
+
return "";
|
|
114
|
+
}
|
|
115
|
+
function truncateArg(text, max = 60) {
|
|
116
|
+
return text.length > max ? `${text.slice(0, max - 3)}…` : text;
|
|
117
|
+
}
|
|
118
|
+
/**
|
|
119
|
+
* Человекочитаемая сводка аргументов. Структурные/экшен-тулы несут сырой JSON,
|
|
120
|
+
* который потёк бы в чат, — им короткая локализованная фраза вместо него.
|
|
121
|
+
*/
|
|
122
|
+
export function humanArgs(tool, args) {
|
|
123
|
+
if (tool === "plan") {
|
|
124
|
+
const action = typeof args.action === "string" ? args.action : "";
|
|
125
|
+
if (action === "update") {
|
|
126
|
+
const step = args.step ?? args.stepId;
|
|
127
|
+
const status = args.status;
|
|
128
|
+
if (step !== undefined || status !== undefined) {
|
|
129
|
+
return t("ui.plan_update", {
|
|
130
|
+
step: String(step ?? "?"),
|
|
131
|
+
status: String(status ?? "?"),
|
|
132
|
+
});
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
if (action === "create" && typeof args.title === "string")
|
|
136
|
+
return args.title;
|
|
137
|
+
if (action)
|
|
138
|
+
return action;
|
|
139
|
+
}
|
|
140
|
+
if (tool === "plan_step") {
|
|
141
|
+
const step = args.step;
|
|
142
|
+
const status = args.status;
|
|
143
|
+
if (step !== undefined || status !== undefined) {
|
|
144
|
+
return t("ui.plan_update", {
|
|
145
|
+
step: String(step ?? "?"),
|
|
146
|
+
status: String(status ?? "?"),
|
|
147
|
+
});
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
if (tool === "todo") {
|
|
151
|
+
const action = typeof args.action === "string" ? args.action : "";
|
|
152
|
+
const items = Array.isArray(args.items) ? args.items.length : undefined;
|
|
153
|
+
if (action && items !== undefined)
|
|
154
|
+
return t("ui.todo_action", { action, count: String(items) });
|
|
155
|
+
if (action)
|
|
156
|
+
return action;
|
|
157
|
+
}
|
|
158
|
+
// Обычные экшен-тулы (browser, project_map, lsp_check, …) несут `action` плюс
|
|
159
|
+
// пару коротких скаляров — рендерим фразу, а не сырой JSON.
|
|
160
|
+
if (typeof args.action === "string" && args.action) {
|
|
161
|
+
const extras = ["direction", "selector", "key", "name", "path", "url", "query", "text", "id"]
|
|
162
|
+
.map((k) => (typeof args[k] === "string" && args[k] ? args[k] : undefined))
|
|
163
|
+
.filter((v) => Boolean(v));
|
|
164
|
+
return truncateArg([args.action, ...extras].join(" "));
|
|
165
|
+
}
|
|
166
|
+
// Композиты, где один ключ уронил бы половину смысла.
|
|
167
|
+
if (tool === "move_file") {
|
|
168
|
+
const from = str(args.from);
|
|
169
|
+
const to = str(args.to);
|
|
170
|
+
if (from && to)
|
|
171
|
+
return truncateArg(`${from} → ${to}`);
|
|
172
|
+
}
|
|
173
|
+
if (tool === "mcp_call") {
|
|
174
|
+
const server = str(args.server);
|
|
175
|
+
const name = str(args.tool);
|
|
176
|
+
if (server && name)
|
|
177
|
+
return `${server}/${name}`;
|
|
178
|
+
}
|
|
179
|
+
if (tool === "remember") {
|
|
180
|
+
const category = str(args.category);
|
|
181
|
+
const key = str(args.key);
|
|
182
|
+
const entry = str(args.entry);
|
|
183
|
+
const body = key && args.value !== undefined ? `${key} = ${str(args.value)}` : key || entry;
|
|
184
|
+
const phrase = [category, body].filter(Boolean).join(" · ");
|
|
185
|
+
if (phrase)
|
|
186
|
+
return truncateArg(phrase);
|
|
187
|
+
}
|
|
188
|
+
if (tool === "enable_tools") {
|
|
189
|
+
const tags = Array.isArray(args.tags) ? args.tags.map(String).filter(Boolean) : [];
|
|
190
|
+
if (tags.length)
|
|
191
|
+
return tags.join(", ");
|
|
192
|
+
}
|
|
193
|
+
for (const key of GENERIC_ARG_KEYS) {
|
|
194
|
+
const value = str(args[key]);
|
|
195
|
+
if (value)
|
|
196
|
+
return truncateArg(value);
|
|
197
|
+
}
|
|
198
|
+
return summarizeArgs(args);
|
|
199
|
+
}
|
|
200
|
+
/**
|
|
201
|
+
* Локализованный человеческий ярлык тула. Системные имена (`read_file`, `bash`, …)
|
|
202
|
+
* НЕ показываются юзеру ни в одной локали — см. `docs/design/ui/STYLE.md`.
|
|
203
|
+
* Сырой идентификатор — лишь ключ поиска; без friendly-перевода откатываемся на
|
|
204
|
+
* общий локализованный ярлык, но не на сам идентификатор.
|
|
205
|
+
*/
|
|
75
206
|
function friendlyTool(tool) {
|
|
76
207
|
const key = `tool.friendly.${tool}`;
|
|
77
208
|
const value = t(key);
|
|
78
|
-
|
|
209
|
+
if (value !== key)
|
|
210
|
+
return value;
|
|
211
|
+
const fallback = t("ui.action_fallback");
|
|
212
|
+
return fallback !== "ui.action_fallback" ? fallback : "Action";
|
|
79
213
|
}
|
|
80
214
|
/**
|
|
81
|
-
*
|
|
82
|
-
* plain
|
|
83
|
-
*
|
|
215
|
+
* Стримит события агента в терминал. Rich-режим (TTY) добавляет спиннер;
|
|
216
|
+
* plain — простые строки с префиксом.
|
|
217
|
+
* Цвета из `colors.ts`, вне TTY / в CI / при NO_COLOR выключены.
|
|
84
218
|
*/
|
|
85
219
|
export class Renderer {
|
|
86
220
|
rich;
|
|
@@ -89,17 +223,30 @@ export class Renderer {
|
|
|
89
223
|
channel;
|
|
90
224
|
width;
|
|
91
225
|
baseDir;
|
|
226
|
+
verbosity;
|
|
92
227
|
card = null;
|
|
93
228
|
thoughtStarted = false;
|
|
94
229
|
thoughtStartMs = 0;
|
|
95
230
|
thoughtHeaderPrinted = false;
|
|
231
|
+
/** Чередует короткие человеческие ярлыки, чтобы повторы thinking не звучали роботно. */
|
|
232
|
+
thinkingCount = 0;
|
|
233
|
+
thinkingLabel = "";
|
|
96
234
|
textStarted = false;
|
|
235
|
+
reconBuffer = [];
|
|
236
|
+
/**
|
|
237
|
+
* Отложенная на шаг строка действия (quiet): даёт идентичному повтору
|
|
238
|
+
* свернуться в строку `×N`. Всегда сбрасывается до печати чего-то новее.
|
|
239
|
+
*/
|
|
240
|
+
pendingFooter = null;
|
|
241
|
+
repeatCount = 0;
|
|
242
|
+
repeatMs = 0;
|
|
97
243
|
outputLineCount = 0;
|
|
98
244
|
outputSuppressed = false;
|
|
99
245
|
constructor(opts = {}) {
|
|
100
246
|
this.rich = opts.rich ?? isRichTerminal();
|
|
101
247
|
this.width = opts.width ?? getTerminalWidth();
|
|
102
248
|
this.baseDir = opts.baseDir;
|
|
249
|
+
this.verbosity = opts.verbosity ?? "normal";
|
|
103
250
|
this.channel = opts.channel ?? getDefaultChannel();
|
|
104
251
|
this.spinner = new Spinner({
|
|
105
252
|
enabled: this.rich && (opts.spinner ?? true),
|
|
@@ -108,42 +255,56 @@ export class Renderer {
|
|
|
108
255
|
});
|
|
109
256
|
this.fmt = new FormattingStream((line) => this.channel.writeRaw(`${line}\n`), this.width, (text) => this.channel.writeRaw(text), { reservedCols: 2, streamPartials: this.rich });
|
|
110
257
|
}
|
|
111
|
-
/**
|
|
258
|
+
/** Спиннер обдумывания на время ожидания ответа LLM. */
|
|
112
259
|
showLoader() {
|
|
113
260
|
this.spinner.start(t("ui.thinking"));
|
|
114
261
|
}
|
|
115
|
-
/**
|
|
262
|
+
/** Финальный ответ модели стримом (markdown-формат). */
|
|
116
263
|
text(chunk) {
|
|
117
264
|
this.endCard();
|
|
265
|
+
this.flushRecon();
|
|
266
|
+
this.closeThought();
|
|
118
267
|
this.spinner.stop();
|
|
119
268
|
if (!this.textStarted) {
|
|
120
269
|
this.textStarted = true;
|
|
121
|
-
|
|
270
|
+
// Ответ уже введён разделителем/ярлыком REPL; ведущий маркер конфликтовал
|
|
271
|
+
// бы с кодовым блоком, открывающим ответ.
|
|
272
|
+
this.channel.writeRaw("\n");
|
|
122
273
|
}
|
|
123
274
|
this.fmt.write(chunk);
|
|
124
275
|
}
|
|
125
|
-
/**
|
|
276
|
+
/** Произвольный статус/мета-текст (вывод тула, reasoning, статус MoE). */
|
|
126
277
|
meta(chunk) {
|
|
127
278
|
this.spinner.stop();
|
|
128
279
|
if (this.thoughtStarted) {
|
|
129
|
-
|
|
130
|
-
this.channel.writeRaw(`\n${pc.dim("→")} Thought: `);
|
|
131
|
-
this.thoughtHeaderPrinted = true;
|
|
132
|
-
}
|
|
280
|
+
this.writeThoughtHeader();
|
|
133
281
|
this.channel.writeRaw(pc.dim(chunk));
|
|
134
282
|
}
|
|
135
283
|
else if (this.card) {
|
|
136
284
|
this.writeInlineBody(chunk);
|
|
137
285
|
}
|
|
138
286
|
else {
|
|
287
|
+
this.flushRecon();
|
|
139
288
|
this.channel.writeRaw(chunk);
|
|
140
289
|
}
|
|
141
290
|
}
|
|
142
|
-
/**
|
|
291
|
+
/** Стримит строки тела тула с гуттером, пустые скипает. */
|
|
143
292
|
writeInlineBody(chunk) {
|
|
144
293
|
for (const line of chunk.split("\n")) {
|
|
145
294
|
if (line.trim() === "")
|
|
146
295
|
continue;
|
|
296
|
+
const plain = stripAnsi(line).trim();
|
|
297
|
+
if (this.card) {
|
|
298
|
+
if (this.card.body.length < MAX_OUTPUT_LINES)
|
|
299
|
+
this.card.body.push(plain);
|
|
300
|
+
if (!this.card.firstBody)
|
|
301
|
+
this.card.firstBody = plain;
|
|
302
|
+
}
|
|
303
|
+
if (this.verbosity === "quiet") {
|
|
304
|
+
// Первую строку держим, чтобы у провала осталось короткое объяснение, но
|
|
305
|
+
// чат не заливаем: детали — через /verbose и Ctrl+O.
|
|
306
|
+
continue;
|
|
307
|
+
}
|
|
147
308
|
this.outputLineCount++;
|
|
148
309
|
if (this.outputLineCount > MAX_OUTPUT_LINES) {
|
|
149
310
|
this.outputSuppressed = true;
|
|
@@ -152,107 +313,272 @@ export class Renderer {
|
|
|
152
313
|
this.channel.writeRaw(`${GUTTER}${line}\n`);
|
|
153
314
|
}
|
|
154
315
|
}
|
|
155
|
-
/**
|
|
316
|
+
/** Dim-стрим рассуждений (красится здесь, а не агентом). */
|
|
156
317
|
reasoning(chunk) {
|
|
157
318
|
this.spinner.stop();
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
this.thoughtHeaderPrinted = true;
|
|
161
|
-
}
|
|
319
|
+
this.flushRecon();
|
|
320
|
+
this.writeThoughtHeader();
|
|
162
321
|
this.channel.writeRaw(pc.dim(chunk));
|
|
163
322
|
}
|
|
164
|
-
/**
|
|
323
|
+
/**
|
|
324
|
+
* Открывает блок мысли: `✦ <акцентный ярлык> · ` — ярлык держит акцент
|
|
325
|
+
* рассуждений, разделитель и тело dim, чтобы глагол статуса не сливался
|
|
326
|
+
* с собственными словами модели.
|
|
327
|
+
*/
|
|
328
|
+
writeThoughtHeader() {
|
|
329
|
+
if (!this.thoughtStarted || this.thoughtHeaderPrinted)
|
|
330
|
+
return;
|
|
331
|
+
this.channel.writeRaw(`\n${pc.magenta(glyph.thinking)} ${pc.magenta(this.thinkingLabel)} ${pc.dim("·")} `);
|
|
332
|
+
this.thoughtHeaderPrinted = true;
|
|
333
|
+
}
|
|
334
|
+
/** Модель грузится/генерирует — фиксируем старт. */
|
|
165
335
|
thinkingStart() {
|
|
336
|
+
this.flushRecon();
|
|
166
337
|
this.thoughtStarted = true;
|
|
167
338
|
this.thoughtStartMs = Date.now();
|
|
168
339
|
this.thoughtHeaderPrinted = false;
|
|
340
|
+
this.thinkingLabel = this.nextThinkingLabel();
|
|
169
341
|
this.spinner.start(t("ui.thinking"));
|
|
170
342
|
}
|
|
171
|
-
/**
|
|
343
|
+
/**
|
|
344
|
+
* Чередует несколько коротких человеческих ярлыков по фазам thinking. Первая
|
|
345
|
+
* фаза всегда канонична `ui.thinking_label` (стабильно в тестах/скринах).
|
|
346
|
+
*/
|
|
347
|
+
nextThinkingLabel() {
|
|
348
|
+
const index = this.thinkingCount++;
|
|
349
|
+
const key = index === 0 ? "ui.thinking_label" : `ui.thinking_label_${(index % 3) + 1}`;
|
|
350
|
+
const value = t(key);
|
|
351
|
+
return value !== key ? value : t("ui.thinking_label");
|
|
352
|
+
}
|
|
353
|
+
/** Вызов LLM завершён; печатаем длительность и закрываем блок мысли. */
|
|
172
354
|
thinkingEnd() {
|
|
173
355
|
this.spinner.stop();
|
|
356
|
+
this.closeThought();
|
|
357
|
+
}
|
|
358
|
+
/**
|
|
359
|
+
* Закрывает открытый блок мысли с печатью длительности. Безопасно звать
|
|
360
|
+
* многократно: и финальный ответ, и следующий тул требуют закрытого блока,
|
|
361
|
+
* чтобы длительность не приземлилась внутрь текста ответа.
|
|
362
|
+
*/
|
|
363
|
+
closeThought() {
|
|
174
364
|
if (this.thoughtStarted && this.thoughtHeaderPrinted) {
|
|
175
365
|
const duration = Date.now() - this.thoughtStartMs;
|
|
176
|
-
this.channel.writeRaw(pc.dim(` ${duration}
|
|
366
|
+
this.channel.writeRaw(pc.dim(` ${formatDuration(duration)}\n`));
|
|
177
367
|
}
|
|
178
368
|
this.thoughtStarted = false;
|
|
179
369
|
this.thoughtHeaderPrinted = false;
|
|
180
370
|
}
|
|
181
|
-
|
|
371
|
+
/** Старт тула: шапка действия + busy-спиннер (кроме интерактивных). */
|
|
372
|
+
toolStart(tool, args, stepContext, _icon) {
|
|
182
373
|
this.spinner.stop();
|
|
183
374
|
this.fmt.flushPartialNow();
|
|
184
375
|
this.endCard();
|
|
376
|
+
this.closeThought();
|
|
185
377
|
this.outputLineCount = 0;
|
|
186
378
|
this.outputSuppressed = false;
|
|
187
379
|
const displayArgs = PATH_TOOLS.has(tool) && typeof args.path === "string"
|
|
188
380
|
? { ...args, path: toDisplayPath(this.baseDir, args.path) }
|
|
189
381
|
: args;
|
|
190
|
-
const summary =
|
|
191
|
-
const marker = icon || toolMarker(tool);
|
|
382
|
+
const summary = humanArgs(tool, displayArgs);
|
|
192
383
|
const label = friendlyTool(tool);
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
384
|
+
// Один глиф в цвете категории — пер-тул emoji-иконки не используются.
|
|
385
|
+
const mark = actionMarkFor(tool);
|
|
386
|
+
const accent = toolAccent(tool);
|
|
387
|
+
const deferred = this.verbosity === "quiet";
|
|
388
|
+
this.card = {
|
|
389
|
+
tool,
|
|
390
|
+
args,
|
|
391
|
+
start: Date.now(),
|
|
392
|
+
label,
|
|
393
|
+
summary,
|
|
394
|
+
mark,
|
|
395
|
+
deferred,
|
|
396
|
+
firstBody: "",
|
|
397
|
+
body: [],
|
|
398
|
+
};
|
|
399
|
+
if (stepContext && !deferred) {
|
|
400
|
+
this.channel.writeRaw(`\n${pc.dim(glyph.detail)} ${pc.cyan(stepContext)}\n`);
|
|
196
401
|
}
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
402
|
+
if (!deferred) {
|
|
403
|
+
this.channel.writeRaw(`${mark} ${accent(label)}${summary ? ` ${pc.dim("·")} ${pc.dim(summary)}` : ""}\n`);
|
|
404
|
+
}
|
|
405
|
+
// Busy-индикатор на время реального исполнения: read/write/edit/bash могут
|
|
406
|
+
// идти секунды; без него чат выглядит зависшим до футера.
|
|
200
407
|
if (!SPINNERLESS_TOOLS.has(tool)) {
|
|
201
408
|
this.spinner.start(`${label}${summary ? ` ${summary}` : ""}`);
|
|
202
409
|
}
|
|
203
410
|
}
|
|
204
|
-
/**
|
|
411
|
+
/** Смена детализации рендера (использует `/verbose`). */
|
|
412
|
+
setVerbosity(verbosity) {
|
|
413
|
+
this.verbosity = verbosity;
|
|
414
|
+
}
|
|
415
|
+
/** Выпуск буферного прогона read-only действий (quiet). */
|
|
416
|
+
flushRecon() {
|
|
417
|
+
// Отложенная строка действия всегда старше любого буферного recon-прогона:
|
|
418
|
+
// печатаем её первой, чтобы чат остался хронологичным.
|
|
419
|
+
this.flushPendingFooter();
|
|
420
|
+
if (this.reconBuffer.length === 0)
|
|
421
|
+
return;
|
|
422
|
+
const items = this.reconBuffer;
|
|
423
|
+
this.reconBuffer = [];
|
|
424
|
+
if (items.length === 1) {
|
|
425
|
+
const it = items[0];
|
|
426
|
+
const accent = toolAccent(it.tool);
|
|
427
|
+
const head = `${it.mark} ${accent(it.label)}${it.summary ? ` ${pc.dim("·")} ${pc.dim(it.summary)}` : ""}`;
|
|
428
|
+
this.channel.writeRaw(`${head} ${successMark()} ${pc.dim(formatDuration(it.duration))}\n`);
|
|
429
|
+
return;
|
|
430
|
+
}
|
|
431
|
+
const total = items.reduce((a, b) => a + b.duration, 0);
|
|
432
|
+
const label = t("ui.actions_summary", { count: String(items.length) });
|
|
433
|
+
this.channel.writeRaw(`${pc.dim(glyph.group)} ${label} ${successMark()} ${pc.dim(`· ${formatDuration(total)}`)} ${pc.dim("· /verbose")}\n`);
|
|
434
|
+
}
|
|
435
|
+
/** Печать отложенной строки, повторы сворачивает в одну строку `×N`. */
|
|
436
|
+
flushPendingFooter() {
|
|
437
|
+
const p = this.pendingFooter;
|
|
438
|
+
if (!p)
|
|
439
|
+
return;
|
|
440
|
+
this.pendingFooter = null;
|
|
441
|
+
const times = this.repeatCount + 1;
|
|
442
|
+
const total = p.duration + this.repeatMs;
|
|
443
|
+
this.repeatCount = 0;
|
|
444
|
+
this.repeatMs = 0;
|
|
445
|
+
const head = `${p.leadMark} ${toolAccent(p.tool)(p.label)}${p.summary ? ` ${pc.dim("·")} ${pc.dim(p.summary)}` : ""}`;
|
|
446
|
+
const timesPart = times > 1 ? ` ${pc.dim(`×${times}`)}` : "";
|
|
447
|
+
this.channel.writeRaw(`${head} ${successMark()} ${pc.dim(formatDuration(total))}${timesPart}\n`);
|
|
448
|
+
}
|
|
449
|
+
/** Живой чеклист плана: печатает блок как есть (уже раскрашен). */
|
|
205
450
|
planBlock(lines) {
|
|
206
451
|
this.spinner.stop();
|
|
207
452
|
this.fmt.flushPartialNow();
|
|
208
453
|
this.endCard();
|
|
454
|
+
this.flushRecon();
|
|
209
455
|
for (const line of lines) {
|
|
210
456
|
this.channel.writeRaw(`${line}\n`);
|
|
211
457
|
}
|
|
212
458
|
}
|
|
459
|
+
/** Конец тула: футер с длительностью (ошибка → красный маркер + первая строка тела). */
|
|
213
460
|
toolEnd(_tool, duration, error, ctxDelta, costUsd) {
|
|
214
461
|
this.spinner.stop();
|
|
215
462
|
this.fmt.flushPartialNow();
|
|
216
463
|
if (!this.card)
|
|
217
464
|
return;
|
|
218
|
-
const
|
|
219
|
-
|
|
465
|
+
const { label, summary, deferred } = this.card;
|
|
466
|
+
const mark = error ? failureMark() : successMark();
|
|
467
|
+
let tail = `${mark} ${pc.dim(formatDuration(duration))}`;
|
|
220
468
|
if (ctxDelta !== undefined && ctxDelta !== 0) {
|
|
221
469
|
const deltaStr = ctxDelta > 0 ? pc.green(`+${ctxDelta}`) : pc.yellow(`${ctxDelta} ↓`);
|
|
222
|
-
|
|
470
|
+
tail += ` ${pc.dim("ctx")} ${deltaStr}`;
|
|
223
471
|
}
|
|
224
472
|
if (costUsd !== undefined && costUsd > 0) {
|
|
225
|
-
|
|
473
|
+
tail += ` ${pc.dim("cost")} ${pc.yellow(formatUsd(costUsd))}`;
|
|
474
|
+
}
|
|
475
|
+
if (deferred) {
|
|
476
|
+
this.toolEndDeferred(tail, duration, error);
|
|
226
477
|
}
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
this.channel.writeRaw(`${
|
|
478
|
+
else {
|
|
479
|
+
const footer = `${GUTTER}${tail}`;
|
|
480
|
+
this.channel.writeRaw(`${footer}\n`);
|
|
481
|
+
if (this.outputSuppressed) {
|
|
482
|
+
this.channel.writeRaw(`${GUTTER}${pc.dim(`... (${this.outputLineCount - MAX_OUTPUT_LINES} more lines)`)}\n`);
|
|
483
|
+
}
|
|
230
484
|
}
|
|
485
|
+
this.recordLast(label, summary, error, duration);
|
|
231
486
|
this.card = null;
|
|
232
487
|
}
|
|
233
|
-
/**
|
|
488
|
+
/**
|
|
489
|
+
* Quiet-футер: сворачивает отложенную шапку в одну строку действия.
|
|
490
|
+
* Успешные read-only тулы буферятся в recon-сводку; подряд идущие одинаковые
|
|
491
|
+
* успешные сворачиваются в строку `×N`; всё прочее буферится на шаг, чтобы
|
|
492
|
+
* повтор успел свернуться. Ошибки печатаются сразу.
|
|
493
|
+
*/
|
|
494
|
+
toolEndDeferred(tail, duration, error) {
|
|
495
|
+
const card = this.card;
|
|
496
|
+
if (!card)
|
|
497
|
+
return;
|
|
498
|
+
const { label, summary, mark: leadMark, firstBody } = card;
|
|
499
|
+
// Прогон успешных read-only тулов буферится и суммируется.
|
|
500
|
+
if (!error && RECON_TOOLS.has(card.tool)) {
|
|
501
|
+
this.flushPendingFooter();
|
|
502
|
+
this.reconBuffer.push({ tool: card.tool, mark: leadMark, label, summary, duration });
|
|
503
|
+
return;
|
|
504
|
+
}
|
|
505
|
+
// Подряд идущие одинаковые успешные действия (poll-циклы, повторные
|
|
506
|
+
// статус-чеки) — в одну строку `×N` вместо N строк.
|
|
507
|
+
const repeatKey = `${card.tool}::${label}::${summary}`;
|
|
508
|
+
if (!error && this.pendingFooter?.key === repeatKey) {
|
|
509
|
+
this.repeatCount += 1;
|
|
510
|
+
this.repeatMs += duration;
|
|
511
|
+
return;
|
|
512
|
+
}
|
|
513
|
+
this.flushPendingFooter();
|
|
514
|
+
this.flushRecon();
|
|
515
|
+
if (!error) {
|
|
516
|
+
// Буфер на шаг: строка печатается на следующем действии (или любом сбросе),
|
|
517
|
+
// чтобы идентичный повтор успел свернуться.
|
|
518
|
+
this.pendingFooter = {
|
|
519
|
+
key: repeatKey,
|
|
520
|
+
leadMark,
|
|
521
|
+
tool: card.tool,
|
|
522
|
+
label,
|
|
523
|
+
summary,
|
|
524
|
+
duration,
|
|
525
|
+
};
|
|
526
|
+
return;
|
|
527
|
+
}
|
|
528
|
+
const head = `${leadMark} ${toolAccent(card.tool)(label)}${summary ? ` ${pc.dim("·")} ${pc.dim(summary)}` : ""}`;
|
|
529
|
+
this.channel.writeRaw(`${head} ${tail}\n`);
|
|
530
|
+
if (error && firstBody) {
|
|
531
|
+
const soft = firstBody.startsWith("⚠");
|
|
532
|
+
const color = soft ? pc.yellow : pc.red;
|
|
533
|
+
this.channel.writeRaw(`${GUTTER}${pc.dim(glyph.detail)} ${color(firstBody)}\n`);
|
|
534
|
+
}
|
|
535
|
+
}
|
|
536
|
+
/** Запоминает действие для допечатки по `Ctrl+O` (живёт дольше прогона). */
|
|
537
|
+
recordLast(label, summary, error, duration) {
|
|
538
|
+
const firstBody = this.card?.firstBody ?? "";
|
|
539
|
+
const status = !error
|
|
540
|
+
? "ok"
|
|
541
|
+
: firstBody.startsWith("⚠")
|
|
542
|
+
? "warn"
|
|
543
|
+
: "error";
|
|
544
|
+
recordLastAction({
|
|
545
|
+
tool: this.card?.tool ?? "",
|
|
546
|
+
label,
|
|
547
|
+
args: summary,
|
|
548
|
+
status,
|
|
549
|
+
durationMs: duration,
|
|
550
|
+
body: this.card?.body ?? [],
|
|
551
|
+
});
|
|
552
|
+
}
|
|
553
|
+
/** Сырой предформатированный текст (диффы, предупреждения). */
|
|
234
554
|
raw(text) {
|
|
235
555
|
this.spinner.stop();
|
|
236
556
|
this.fmt.flushPartialNow();
|
|
237
557
|
this.endCard();
|
|
558
|
+
this.flushRecon();
|
|
238
559
|
this.channel.writeRaw(text);
|
|
239
560
|
}
|
|
561
|
+
/** Ошибка в stderr с красным маркером. */
|
|
240
562
|
error(text) {
|
|
241
563
|
this.spinner.stop();
|
|
242
564
|
this.fmt.flushPartialNow();
|
|
243
565
|
this.endCard();
|
|
244
|
-
this.
|
|
566
|
+
this.flushRecon();
|
|
567
|
+
this.channel.writeRaw(`${failureMark()} ${pc.red(text)}\n`, "stderr");
|
|
245
568
|
}
|
|
569
|
+
/** Сброс всех буферов в конце хода. */
|
|
246
570
|
flush() {
|
|
247
571
|
this.endCard();
|
|
572
|
+
this.flushRecon();
|
|
248
573
|
this.spinner.stop();
|
|
249
574
|
this.fmt.flushPartialNow();
|
|
250
575
|
this.fmt.flush();
|
|
251
576
|
this.textStarted = false;
|
|
252
577
|
}
|
|
253
|
-
/**
|
|
578
|
+
/** Футер с моделью, провайдером и общей длительностью. */
|
|
254
579
|
footer(model, provider, durationMs) {
|
|
255
|
-
this.
|
|
580
|
+
this.flushRecon();
|
|
581
|
+
this.channel.writeRaw(`\n${pc.dim(glyph.metric)} ${model} · ${provider} · ${pc.dim(formatDuration(durationMs))}\n`);
|
|
256
582
|
}
|
|
257
583
|
endCard() {
|
|
258
584
|
if (!this.card)
|