pi-crew 0.2.3 → 0.2.5
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/AGENTS.md +57 -32
- package/CHANGELOG.md +466 -448
- package/LICENSE +21 -21
- package/NOTICE.md +16 -16
- package/README.md +323 -323
- package/docs/FEATURE_INTAKE.md +126 -0
- package/docs/HARNESS.md +86 -0
- package/docs/HARNESS_BACKLOG.md +41 -0
- package/docs/TEST_MATRIX.md +49 -0
- package/docs/actions-reference.md +595 -595
- package/docs/architecture.md +180 -180
- package/docs/code-review-2026-05-11.md +592 -592
- package/docs/commands-reference.md +347 -347
- package/docs/comparison-pi-subagents-vs-pi-crew.md +303 -0
- package/docs/decisions/0001-durable-state.md +41 -0
- package/docs/decisions/0002-child-process-for-async.md +42 -0
- package/docs/decisions/0003-depth-guard.md +36 -0
- package/docs/decisions/0004-execfile-over-exec.md +34 -0
- package/docs/decisions/0005-no-parameter-properties.md +49 -0
- package/docs/decisions/0006-publish-bundled-esm.md +63 -0
- package/docs/decisions/0007-active-run-binary-index.md +54 -0
- package/docs/decisions/0008-child-pi-warm-pool.md +61 -0
- package/docs/decisions/README.md +23 -0
- package/docs/followup-review-round4-2026-05-13.md +107 -0
- package/docs/implementation-plan-top3.md +333 -0
- package/docs/live-mailbox-runtime.md +36 -36
- package/docs/next-upgrade-roadmap.md +808 -808
- package/docs/oh-my-pi-research.md +509 -0
- package/docs/perf/baseline-2026-05.md +113 -0
- package/docs/perf/final-report-2026-05.md +206 -0
- package/docs/perf/sprint-1-report.md +71 -0
- package/docs/perf/sprint-2-report.md +81 -0
- package/docs/perf/sprint-2.5-report.md +53 -0
- package/docs/perf/sprint-3-report.md +36 -0
- package/docs/perf/sprint-4-report.md +47 -0
- package/docs/perf/sprint-5-report.md +51 -0
- package/docs/perf/sprint-6-report.md +94 -0
- package/docs/perf/sprint-7-report.md +74 -0
- package/docs/perf/upgrade-plan-2026-05.md +147 -0
- package/docs/pi-subagents3-deep-analysis.md +508 -0
- package/docs/product/README.md +31 -0
- package/docs/product/platform.md +27 -0
- package/docs/product/runtime-safety.md +37 -0
- package/docs/product/team-run.md +39 -0
- package/docs/product/team-tool.md +37 -0
- package/docs/publishing.md +65 -65
- package/docs/resource-formats.md +134 -134
- package/docs/runtime-analysis-child-vs-live.md +171 -0
- package/docs/runtime-flow.md +148 -148
- package/docs/runtime-migration-in-process-analysis.md +250 -0
- package/docs/stories/README.md +30 -0
- package/docs/stories/backlog.md +36 -0
- package/docs/templates/decision.md +27 -0
- package/docs/templates/story.md +44 -0
- package/docs/templates/validation-report.md +32 -0
- package/docs/usage.md +238 -238
- package/index.ts +7 -6
- package/install.mjs +65 -65
- package/package.json +107 -100
- package/schema.json +222 -222
- package/skills/child-pi-spawning/SKILL.md +213 -0
- package/skills/context-artifact-hygiene/SKILL.md +32 -0
- package/skills/event-log-tracing/SKILL.md +299 -0
- package/skills/git-master/SKILL.md +225 -24
- package/skills/live-agent-lifecycle/SKILL.md +192 -0
- package/skills/mailbox-interactive/SKILL.md +300 -19
- package/skills/model-routing-context/SKILL.md +94 -0
- package/skills/multi-perspective-review/SKILL.md +88 -0
- package/skills/read-only-explorer/SKILL.md +250 -26
- package/skills/safe-bash/SKILL.md +307 -21
- package/skills/verification-before-done/SKILL.md +11 -2
- package/skills/widget-rendering/SKILL.md +258 -0
- package/skills/workspace-isolation/SKILL.md +202 -0
- package/skills/worktree-isolation/SKILL.md +202 -18
- package/src/adapters/claude-adapter.ts +25 -25
- package/src/adapters/codex-adapter.ts +21 -21
- package/src/adapters/cursor-adapter.ts +17 -17
- package/src/adapters/export-util.ts +137 -137
- package/src/adapters/index.ts +15 -15
- package/src/adapters/registry.ts +18 -18
- package/src/adapters/types.ts +23 -23
- package/src/agents/agent-config.ts +38 -38
- package/src/agents/agent-serializer.ts +38 -38
- package/src/agents/discover-agents.ts +121 -118
- package/src/config/config.ts +740 -858
- package/src/config/defaults.ts +96 -96
- package/src/config/drift-detector.ts +211 -211
- package/src/config/markers.ts +327 -327
- package/src/config/resilient-parser.ts +109 -108
- package/src/config/suggestions.ts +74 -74
- package/src/config/types.ts +199 -0
- package/src/extension/async-notifier.ts +123 -89
- package/src/extension/autonomous-policy.ts +169 -169
- package/src/extension/cross-extension-rpc.ts +104 -104
- package/src/extension/help.ts +47 -47
- package/src/extension/import-index.ts +69 -69
- package/src/extension/management.ts +395 -382
- package/src/extension/notification-router.ts +116 -116
- package/src/extension/notification-sink.ts +51 -51
- package/src/extension/project-init.ts +168 -168
- package/src/extension/register.ts +859 -668
- package/src/extension/registration/artifact-cleanup.ts +15 -15
- package/src/extension/registration/command-utils.ts +54 -54
- package/src/extension/registration/commands.ts +559 -452
- package/src/extension/registration/compaction-guard.ts +125 -125
- package/src/extension/registration/subagent-helpers.ts +102 -102
- package/src/extension/registration/subagent-tools.ts +220 -159
- package/src/extension/registration/team-tool.ts +159 -99
- package/src/extension/registration/viewers.ts +29 -0
- package/src/extension/result-watcher.ts +128 -128
- package/src/extension/run-bundle-schema.ts +89 -89
- package/src/extension/run-export.ts +73 -73
- package/src/extension/run-import.ts +84 -84
- package/src/extension/run-index.ts +94 -94
- package/src/extension/run-maintenance.ts +142 -142
- package/src/extension/session-summary.ts +8 -8
- package/src/extension/team-manager-command.ts +96 -96
- package/src/extension/team-recommendation.ts +188 -188
- package/src/extension/team-tool/api.ts +5 -2
- package/src/extension/team-tool/cancel.ts +224 -209
- package/src/extension/team-tool/config-patch.ts +36 -36
- package/src/extension/team-tool/context.ts +60 -60
- package/src/extension/team-tool/doctor.ts +242 -242
- package/src/extension/team-tool/handle-settings.ts +421 -195
- package/src/extension/team-tool/inspect.ts +41 -41
- package/src/extension/team-tool/lifecycle-actions.ts +139 -139
- package/src/extension/team-tool/parallel-dispatch.ts +156 -156
- package/src/extension/team-tool/plan.ts +19 -19
- package/src/extension/team-tool/respond.ts +112 -111
- package/src/extension/team-tool/run.ts +246 -229
- package/src/extension/team-tool/status.ts +110 -110
- package/src/extension/team-tool-types.ts +13 -13
- package/src/extension/team-tool.ts +344 -344
- package/src/extension/tool-result.ts +16 -16
- package/src/extension/validate-resources.ts +77 -77
- package/src/hooks/registry.ts +61 -61
- package/src/hooks/types.ts +40 -40
- package/src/i18n.ts +184 -184
- package/src/observability/correlation.ts +35 -35
- package/src/observability/event-to-metric.ts +68 -68
- package/src/observability/exporters/adapter.ts +30 -30
- package/src/observability/exporters/otlp-exporter.ts +106 -92
- package/src/observability/exporters/prometheus-exporter.ts +54 -54
- package/src/observability/metric-registry.ts +87 -87
- package/src/observability/metric-retention.ts +54 -54
- package/src/observability/metric-sink.ts +81 -56
- package/src/observability/metrics-primitives.ts +167 -167
- package/src/prompt/prompt-runtime.ts +72 -72
- package/src/runtime/adaptive-plan.ts +338 -0
- package/src/runtime/agent-control.ts +169 -169
- package/src/runtime/agent-memory.ts +72 -72
- package/src/runtime/agent-observability.ts +114 -114
- package/src/runtime/async-marker.ts +26 -26
- package/src/runtime/async-runner.ts +153 -153
- package/src/runtime/attention-events.ts +28 -28
- package/src/runtime/auto-resume.ts +100 -100
- package/src/runtime/background-runner.ts +122 -89
- package/src/runtime/cancellation.ts +61 -61
- package/src/runtime/capability-inventory.ts +116 -116
- package/src/runtime/child-pi-pool.ts +68 -0
- package/src/runtime/child-pi.ts +541 -461
- package/src/runtime/code-summary.ts +247 -247
- package/src/runtime/compaction-summary.ts +271 -271
- package/src/runtime/concurrency.ts +58 -58
- package/src/runtime/crash-recovery.ts +317 -301
- package/src/runtime/crew-agent-records.ts +379 -281
- package/src/runtime/crew-agent-runtime.ts +60 -60
- package/src/runtime/cross-extension-rpc.ts +72 -0
- package/src/runtime/custom-tools/irc-tool.ts +201 -201
- package/src/runtime/custom-tools/submit-result-tool.ts +90 -90
- package/src/runtime/deadletter.ts +47 -47
- package/src/runtime/delivery-coordinator.ts +176 -176
- package/src/runtime/delta-conflict.ts +360 -360
- package/src/runtime/diagnostic-export.ts +102 -102
- package/src/runtime/direct-run.ts +35 -35
- package/src/runtime/effectiveness.ts +82 -81
- package/src/runtime/errors/crew-errors.ts +166 -0
- package/src/runtime/event-stream-bridge.ts +92 -92
- package/src/runtime/foreground-control.ts +82 -82
- package/src/runtime/green-contract.ts +46 -46
- package/src/runtime/group-join.ts +234 -106
- package/src/runtime/heartbeat-watcher.ts +145 -124
- package/src/runtime/iteration-hooks.ts +267 -267
- package/src/runtime/live-agent-control.ts +88 -88
- package/src/runtime/live-agent-manager.ts +377 -179
- package/src/runtime/live-control-realtime.ts +36 -36
- package/src/runtime/live-session-runtime.ts +676 -600
- package/src/runtime/loop-gates.ts +129 -129
- package/src/runtime/manifest-cache.ts +263 -263
- package/src/runtime/mcp-proxy.ts +113 -113
- package/src/runtime/metric-parser.ts +40 -40
- package/src/runtime/model-fallback.ts +282 -274
- package/src/runtime/model-resolver.ts +118 -0
- package/src/runtime/output-validator.ts +187 -187
- package/src/runtime/overflow-recovery.ts +175 -175
- package/src/runtime/parallel-research.ts +44 -44
- package/src/runtime/parallel-utils.ts +156 -156
- package/src/runtime/parent-guard.ts +80 -80
- package/src/runtime/phase-progress.ts +217 -217
- package/src/runtime/pi-args.ts +165 -165
- package/src/runtime/pi-json-output.ts +111 -111
- package/src/runtime/pi-spawn.ts +167 -167
- package/src/runtime/policy-engine.ts +79 -79
- package/src/runtime/post-checks.ts +125 -125
- package/src/runtime/post-exit-stdio-guard.ts +86 -86
- package/src/runtime/process-status.ts +97 -73
- package/src/runtime/progress-event-coalescer.ts +43 -43
- package/src/runtime/recovery-recipes.ts +74 -74
- package/src/runtime/retry-executor.ts +81 -81
- package/src/runtime/role-permission.ts +39 -39
- package/src/runtime/run-tracker.ts +99 -0
- package/src/runtime/runtime-policy.ts +21 -0
- package/src/runtime/runtime-resolver.ts +94 -91
- package/src/runtime/scheduler.ts +294 -0
- package/src/runtime/semaphore.ts +131 -131
- package/src/runtime/sensitive-paths.ts +92 -92
- package/src/runtime/session-usage.ts +79 -79
- package/src/runtime/settings-store.ts +103 -0
- package/src/runtime/sidechain-output.ts +29 -29
- package/src/runtime/skill-instructions.ts +222 -222
- package/src/runtime/stale-reconciler.ts +198 -189
- package/src/runtime/streaming-output.ts +47 -0
- package/src/runtime/subagent-manager.ts +404 -400
- package/src/runtime/subprocess-tool-registry.ts +67 -67
- package/src/runtime/task-display.ts +38 -38
- package/src/runtime/task-graph-scheduler.ts +122 -122
- package/src/runtime/task-graph.ts +207 -207
- package/src/runtime/task-output-context.ts +177 -177
- package/src/runtime/task-packet.ts +93 -93
- package/src/runtime/task-quality.ts +207 -207
- package/src/runtime/task-runner/capabilities.ts +78 -78
- package/src/runtime/task-runner/live-executor.ts +131 -113
- package/src/runtime/task-runner/progress.ts +119 -119
- package/src/runtime/task-runner/prompt-builder.ts +139 -139
- package/src/runtime/task-runner/prompt-pipeline.ts +64 -64
- package/src/runtime/task-runner/result-utils.ts +14 -14
- package/src/runtime/task-runner/run-projection.ts +103 -103
- package/src/runtime/task-runner/state-helpers.ts +22 -22
- package/src/runtime/task-runner.ts +469 -459
- package/src/runtime/team-runner.ts +693 -945
- package/src/runtime/usage-tracker.ts +71 -0
- package/src/runtime/worker-heartbeat.ts +21 -21
- package/src/runtime/worker-startup.ts +57 -57
- package/src/runtime/workflow-state.ts +187 -187
- package/src/runtime/yield-handler.ts +190 -190
- package/src/schema/config-schema.ts +172 -168
- package/src/schema/team-tool-schema.ts +126 -126
- package/src/schema/validation-types.ts +151 -148
- package/src/skills/discover-skills.ts +67 -67
- package/src/skills/skill-templates.ts +374 -374
- package/src/state/active-run-registry.ts +227 -191
- package/src/state/artifact-store.ts +130 -129
- package/src/state/atomic-write.ts +262 -195
- package/src/state/blob-store.ts +116 -116
- package/src/state/contracts.ts +111 -111
- package/src/state/event-log-rotation.ts +161 -158
- package/src/state/event-log.ts +383 -303
- package/src/state/event-reconstructor.ts +217 -217
- package/src/state/jsonl-writer.ts +82 -82
- package/src/state/locks.ts +146 -146
- package/src/state/mailbox.ts +446 -405
- package/src/state/state-store.ts +364 -351
- package/src/state/task-claims.ts +44 -44
- package/src/state/types.ts +285 -285
- package/src/state/usage.ts +29 -29
- package/src/subagents/async-entry.ts +1 -1
- package/src/subagents/index.ts +3 -3
- package/src/subagents/live/control.ts +1 -1
- package/src/subagents/live/manager.ts +1 -1
- package/src/subagents/live/realtime.ts +1 -1
- package/src/subagents/live/session-runtime.ts +1 -1
- package/src/subagents/manager.ts +1 -1
- package/src/subagents/spawn.ts +1 -1
- package/src/teams/discover-teams.ts +116 -116
- package/src/teams/team-config.ts +27 -27
- package/src/teams/team-serializer.ts +38 -38
- package/src/types/diff.d.ts +18 -18
- package/src/ui/agent-management-overlay.ts +144 -144
- package/src/ui/crew-widget.ts +487 -370
- package/src/ui/dashboard-panes/agents-pane.ts +109 -28
- package/src/ui/dashboard-panes/cancellation-pane.ts +42 -42
- package/src/ui/dashboard-panes/capability-pane.ts +59 -59
- package/src/ui/dashboard-panes/health-pane.ts +30 -30
- package/src/ui/dashboard-panes/mailbox-pane.ts +35 -35
- package/src/ui/dashboard-panes/progress-pane.ts +30 -30
- package/src/ui/dashboard-panes/transcript-pane.ts +10 -10
- package/src/ui/heartbeat-aggregator.ts +63 -63
- package/src/ui/keybinding-map.ts +97 -94
- package/src/ui/live-conversation-overlay.ts +152 -0
- package/src/ui/live-run-sidebar.ts +180 -180
- package/src/ui/mascot.ts +442 -442
- package/src/ui/overlays/agent-picker-overlay.ts +57 -57
- package/src/ui/overlays/confirm-overlay.ts +58 -58
- package/src/ui/overlays/mailbox-compose-overlay.ts +144 -144
- package/src/ui/overlays/mailbox-compose-preview.ts +63 -63
- package/src/ui/overlays/mailbox-detail-overlay.ts +122 -122
- package/src/ui/pi-ui-compat.ts +57 -57
- package/src/ui/powerbar-publisher.ts +221 -197
- package/src/ui/render-scheduler.ts +216 -143
- package/src/ui/run-action-dispatcher.ts +118 -118
- package/src/ui/run-dashboard.ts +526 -464
- package/src/ui/run-event-bus.ts +208 -208
- package/src/ui/run-snapshot-cache.ts +826 -777
- package/src/ui/settings-overlay.ts +721 -0
- package/src/ui/snapshot-types.ts +86 -70
- package/src/ui/theme-adapter.ts +190 -190
- package/src/ui/tool-progress-formatter.ts +89 -0
- package/src/ui/transcript-cache.ts +94 -94
- package/src/ui/transcript-viewer.ts +335 -335
- package/src/utils/conflict-detect.ts +662 -0
- package/src/utils/file-coalescer.ts +86 -86
- package/src/utils/frontmatter.ts +68 -68
- package/src/utils/fs-watch.ts +88 -31
- package/src/utils/gh-protocol.ts +479 -0
- package/src/utils/ids.ts +17 -17
- package/src/utils/incremental-reader.ts +104 -104
- package/src/utils/internal-error.ts +6 -6
- package/src/utils/names.ts +27 -27
- package/src/utils/paths.ts +102 -63
- package/src/utils/redaction.ts +44 -44
- package/src/utils/safe-paths.ts +47 -47
- package/src/utils/scan-cache.ts +136 -136
- package/src/utils/sse-parser.ts +134 -134
- package/src/utils/task-name-generator.ts +337 -337
- package/src/utils/timings.ts +33 -33
- package/src/utils/visual.ts +243 -198
- package/src/workflows/discover-workflows.ts +139 -139
- package/src/workflows/validate-workflow.ts +40 -40
- package/src/workflows/workflow-config.ts +26 -26
- package/src/workflows/workflow-serializer.ts +32 -32
- package/src/worktree/branch-freshness.ts +45 -45
- package/src/worktree/cleanup.ts +75 -75
- package/src/worktree/worktree-manager.ts +188 -188
- package/teams/default.team.md +12 -12
- package/teams/fast-fix.team.md +11 -11
- package/teams/implementation.team.md +18 -18
- package/teams/parallel-research.team.md +14 -14
- package/teams/research.team.md +11 -11
- package/teams/review.team.md +12 -12
- package/tsconfig.json +19 -19
- package/workflows/default.workflow.md +30 -30
- package/workflows/fast-fix.workflow.md +23 -23
- package/workflows/implementation.workflow.md +43 -43
- package/workflows/parallel-research.workflow.md +46 -46
- package/workflows/research.workflow.md +22 -22
- package/workflows/review.workflow.md +30 -30
- package/skills/task-packet/SKILL.md +0 -28
- package/skills/verify-evidence/SKILL.md +0 -27
package/src/ui/mascot.ts
CHANGED
|
@@ -1,442 +1,442 @@
|
|
|
1
|
-
import type { CrewTheme } from "./theme-adapter.ts";
|
|
2
|
-
import { asCrewTheme } from "./theme-adapter.ts";
|
|
3
|
-
import { pad } from "../utils/visual.ts";
|
|
4
|
-
import { DynamicCrewBorder } from "./dynamic-border.ts";
|
|
5
|
-
|
|
6
|
-
export type MascotStyle = "cat" | "armin";
|
|
7
|
-
export type MascotEffect =
|
|
8
|
-
| "random"
|
|
9
|
-
| "none"
|
|
10
|
-
| "typewriter"
|
|
11
|
-
| "scanline"
|
|
12
|
-
| "rain"
|
|
13
|
-
| "fade"
|
|
14
|
-
| "crt"
|
|
15
|
-
| "glitch"
|
|
16
|
-
| "dissolve";
|
|
17
|
-
|
|
18
|
-
interface AnimatedMascotOptions {
|
|
19
|
-
frameIntervalMs?: number;
|
|
20
|
-
autoCloseMs?: number;
|
|
21
|
-
requestRender?: () => void;
|
|
22
|
-
style?: MascotStyle;
|
|
23
|
-
effect?: MascotEffect;
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
const BS = String.fromCharCode(92);
|
|
27
|
-
|
|
28
|
-
const CAT_FRAMES: readonly (readonly string[])[] = [
|
|
29
|
-
[` /${BS}_/${BS} `, "(='.'=)", "( _ )", ` ${BS}_/ `],
|
|
30
|
-
[` /${BS}_/${BS} `, "(='o'=)", "( w )", ` ${BS}_/ `],
|
|
31
|
-
[` /${BS}_/${BS} `, "(=^.^=)", "( _ )", ` ${BS}_/ `],
|
|
32
|
-
[` /${BS}_/${BS} `, "(=*.*=)", "( v )", ` ${BS}_/ `],
|
|
33
|
-
] as const;
|
|
34
|
-
|
|
35
|
-
// Armin XBM: 31x36 px, LSB first, 1=background, 0=foreground (ported from pi-mono coding-agent)
|
|
36
|
-
const ARMIN_WIDTH = 31;
|
|
37
|
-
const ARMIN_HEIGHT = 36;
|
|
38
|
-
const ARMIN_BITS: readonly number[] = [
|
|
39
|
-
0xff, 0xff, 0xff, 0x7f, 0xff, 0xf0, 0xff, 0x7f, 0xff, 0xed, 0xff, 0x7f, 0xff, 0xdb, 0xff, 0x7f, 0xff, 0xb7, 0xff,
|
|
40
|
-
0x7f, 0xff, 0x77, 0xfe, 0x7f, 0x3f, 0xf8, 0xfe, 0x7f, 0xdf, 0xff, 0xfe, 0x7f, 0xdf, 0x3f, 0xfc, 0x7f, 0x9f, 0xc3,
|
|
41
|
-
0xfb, 0x7f, 0x6f, 0xfc, 0xf4, 0x7f, 0xf7, 0x0f, 0xf7, 0x7f, 0xf7, 0xff, 0xf7, 0x7f, 0xf7, 0xff, 0xe3, 0x7f, 0xf7,
|
|
42
|
-
0x07, 0xe8, 0x7f, 0xef, 0xf8, 0x67, 0x70, 0x0f, 0xff, 0xbb, 0x6f, 0xf1, 0x00, 0xd0, 0x5b, 0xfd, 0x3f, 0xec, 0x53,
|
|
43
|
-
0xc1, 0xff, 0xef, 0x57, 0x9f, 0xfd, 0xee, 0x5f, 0x9f, 0xfc, 0xae, 0x5f, 0x1f, 0x78, 0xac, 0x5f, 0x3f, 0x00, 0x50,
|
|
44
|
-
0x6c, 0x7f, 0x00, 0xdc, 0x77, 0xff, 0xc0, 0x3f, 0x78, 0xff, 0x01, 0xf8, 0x7f, 0xff, 0x03, 0x9c, 0x78, 0xff, 0x07,
|
|
45
|
-
0x8c, 0x7c, 0xff, 0x0f, 0xce, 0x78, 0xff, 0xff, 0xcf, 0x7f, 0xff, 0xff, 0xcf, 0x78, 0xff, 0xff, 0xdf, 0x78, 0xff,
|
|
46
|
-
0xff, 0xdf, 0x7d, 0xff, 0xff, 0x3f, 0x7e, 0xff, 0xff, 0xff, 0x7f,
|
|
47
|
-
];
|
|
48
|
-
|
|
49
|
-
const ARMIN_BYTES_PER_ROW = Math.ceil(ARMIN_WIDTH / 8);
|
|
50
|
-
const ARMIN_DISPLAY_HEIGHT = Math.ceil(ARMIN_HEIGHT / 2);
|
|
51
|
-
|
|
52
|
-
const NON_NONE_EFFECTS: MascotEffect[] = [
|
|
53
|
-
"typewriter",
|
|
54
|
-
"scanline",
|
|
55
|
-
"rain",
|
|
56
|
-
"fade",
|
|
57
|
-
"crt",
|
|
58
|
-
"glitch",
|
|
59
|
-
"dissolve",
|
|
60
|
-
];
|
|
61
|
-
const CAT_FRIENDLY_EFFECTS: MascotEffect[] = ["scanline", "glitch", "crt"];
|
|
62
|
-
|
|
63
|
-
function getArminPixel(x: number, y: number): boolean {
|
|
64
|
-
if (y >= ARMIN_HEIGHT) return false;
|
|
65
|
-
const byteIndex = y * ARMIN_BYTES_PER_ROW + Math.floor(x / 8);
|
|
66
|
-
const bitIndex = x % 8;
|
|
67
|
-
return ((ARMIN_BITS[byteIndex] >> bitIndex) & 1) === 0;
|
|
68
|
-
}
|
|
69
|
-
|
|
70
|
-
function getArminChar(x: number, row: number): string {
|
|
71
|
-
const upper = getArminPixel(x, row * 2);
|
|
72
|
-
const lower = getArminPixel(x, row * 2 + 1);
|
|
73
|
-
if (upper && lower) return "█";
|
|
74
|
-
if (upper) return "▀";
|
|
75
|
-
if (lower) return "▄";
|
|
76
|
-
return " ";
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
function buildArminGrid(): string[][] {
|
|
80
|
-
const grid: string[][] = [];
|
|
81
|
-
for (let row = 0; row < ARMIN_DISPLAY_HEIGHT; row++) {
|
|
82
|
-
const line: string[] = [];
|
|
83
|
-
for (let x = 0; x < ARMIN_WIDTH; x++) line.push(getArminChar(x, row));
|
|
84
|
-
grid.push(line);
|
|
85
|
-
}
|
|
86
|
-
return grid;
|
|
87
|
-
}
|
|
88
|
-
|
|
89
|
-
function emptyArminGrid(): string[][] {
|
|
90
|
-
return Array.from({ length: ARMIN_DISPLAY_HEIGHT }, () => Array(ARMIN_WIDTH).fill(" "));
|
|
91
|
-
}
|
|
92
|
-
|
|
93
|
-
interface EffectState {
|
|
94
|
-
pos?: number;
|
|
95
|
-
row?: number;
|
|
96
|
-
expansion?: number;
|
|
97
|
-
phase?: number;
|
|
98
|
-
glitchFrames?: number;
|
|
99
|
-
positions?: [number, number][];
|
|
100
|
-
idx?: number;
|
|
101
|
-
drops?: { y: number; settled: number }[];
|
|
102
|
-
done?: boolean;
|
|
103
|
-
}
|
|
104
|
-
|
|
105
|
-
export class AnimatedMascot {
|
|
106
|
-
private readonly theme: CrewTheme;
|
|
107
|
-
private readonly frameIntervalMs: number;
|
|
108
|
-
private readonly autoCloseMs: number;
|
|
109
|
-
private readonly onDone: () => void;
|
|
110
|
-
private readonly requestRender: (() => void) | undefined;
|
|
111
|
-
private readonly doneGuard: { called: boolean } = { called: false };
|
|
112
|
-
private readonly interval: ReturnType<typeof setInterval> | undefined;
|
|
113
|
-
private readonly timeout: ReturnType<typeof setTimeout> | undefined;
|
|
114
|
-
private readonly style: MascotStyle;
|
|
115
|
-
private readonly effect: MascotEffect;
|
|
116
|
-
private readonly finalArminGrid: string[][];
|
|
117
|
-
private currentArminGrid: string[][];
|
|
118
|
-
private effectState: EffectState = {};
|
|
119
|
-
private effectDone = false;
|
|
120
|
-
private frame = 0;
|
|
121
|
-
private effectPhase = 0;
|
|
122
|
-
private gridVersion = 0;
|
|
123
|
-
private cachedWidth = 0;
|
|
124
|
-
private cachedVersion = -1;
|
|
125
|
-
private cachedLines: string[] = [];
|
|
126
|
-
|
|
127
|
-
constructor(themeLike: unknown, onDone: () => void, options: AnimatedMascotOptions = {}) {
|
|
128
|
-
this.theme = asCrewTheme(themeLike);
|
|
129
|
-
this.onDone = onDone;
|
|
130
|
-
this.frameIntervalMs = Math.max(16, Math.floor(options.frameIntervalMs ?? 180));
|
|
131
|
-
this.autoCloseMs = Math.max(0, Math.floor(options.autoCloseMs ?? 7_000));
|
|
132
|
-
this.requestRender = options.requestRender;
|
|
133
|
-
this.style = options.style === "armin" ? "armin" : "cat";
|
|
134
|
-
this.effect = this.resolveEffect(options.effect);
|
|
135
|
-
this.finalArminGrid = buildArminGrid();
|
|
136
|
-
this.currentArminGrid = this.style === "armin" ? this.initialArminGrid() : emptyArminGrid();
|
|
137
|
-
this.initEffect();
|
|
138
|
-
this.interval = setInterval(() => this.tick(), this.frameIntervalMs);
|
|
139
|
-
this.interval.unref();
|
|
140
|
-
this.timeout = this.autoCloseMs > 0 ? setTimeout(() => this.close(), this.autoCloseMs) : undefined;
|
|
141
|
-
this.timeout?.unref();
|
|
142
|
-
}
|
|
143
|
-
|
|
144
|
-
private resolveEffect(requested: MascotEffect | undefined): MascotEffect {
|
|
145
|
-
if (!requested || requested === "random") {
|
|
146
|
-
const pool = this.style === "armin" ? NON_NONE_EFFECTS : CAT_FRIENDLY_EFFECTS;
|
|
147
|
-
return pool[Math.floor(Math.random() * pool.length)];
|
|
148
|
-
}
|
|
149
|
-
return requested;
|
|
150
|
-
}
|
|
151
|
-
|
|
152
|
-
private initialArminGrid(): string[][] {
|
|
153
|
-
if (this.effect === "dissolve") {
|
|
154
|
-
const chars = [" ", "░", "▒", "▓", "█", "▀", "▄"];
|
|
155
|
-
return Array.from({ length: ARMIN_DISPLAY_HEIGHT }, () =>
|
|
156
|
-
Array.from({ length: ARMIN_WIDTH }, () => chars[Math.floor(Math.random() * chars.length)]),
|
|
157
|
-
);
|
|
158
|
-
}
|
|
159
|
-
return emptyArminGrid();
|
|
160
|
-
}
|
|
161
|
-
|
|
162
|
-
private initEffect(): void {
|
|
163
|
-
this.effectState = {};
|
|
164
|
-
this.effectDone = false;
|
|
165
|
-
switch (this.effect) {
|
|
166
|
-
case "typewriter":
|
|
167
|
-
this.effectState = { pos: 0 };
|
|
168
|
-
break;
|
|
169
|
-
case "scanline":
|
|
170
|
-
this.effectState = { row: 0 };
|
|
171
|
-
break;
|
|
172
|
-
case "rain":
|
|
173
|
-
this.effectState = {
|
|
174
|
-
drops: Array.from({ length: ARMIN_WIDTH }, () => ({
|
|
175
|
-
y: -Math.floor(Math.random() * ARMIN_DISPLAY_HEIGHT * 2),
|
|
176
|
-
settled: 0,
|
|
177
|
-
})),
|
|
178
|
-
};
|
|
179
|
-
break;
|
|
180
|
-
case "fade":
|
|
181
|
-
case "dissolve": {
|
|
182
|
-
const positions: [number, number][] = [];
|
|
183
|
-
for (let row = 0; row < ARMIN_DISPLAY_HEIGHT; row++) {
|
|
184
|
-
for (let x = 0; x < ARMIN_WIDTH; x++) positions.push([row, x]);
|
|
185
|
-
}
|
|
186
|
-
for (let i = positions.length - 1; i > 0; i--) {
|
|
187
|
-
const j = Math.floor(Math.random() * (i + 1));
|
|
188
|
-
[positions[i], positions[j]] = [positions[j], positions[i]];
|
|
189
|
-
}
|
|
190
|
-
this.effectState = { positions, idx: 0 };
|
|
191
|
-
break;
|
|
192
|
-
}
|
|
193
|
-
case "crt":
|
|
194
|
-
this.effectState = { expansion: 0 };
|
|
195
|
-
break;
|
|
196
|
-
case "glitch":
|
|
197
|
-
this.effectState = { phase: 0, glitchFrames: 8 };
|
|
198
|
-
break;
|
|
199
|
-
case "none":
|
|
200
|
-
this.currentArminGrid = this.finalArminGrid.map((row) => [...row]);
|
|
201
|
-
this.effectDone = true;
|
|
202
|
-
break;
|
|
203
|
-
}
|
|
204
|
-
}
|
|
205
|
-
|
|
206
|
-
invalidate(): void {
|
|
207
|
-
this.cachedWidth = 0;
|
|
208
|
-
this.cachedLines = [];
|
|
209
|
-
}
|
|
210
|
-
|
|
211
|
-
private tick(): void {
|
|
212
|
-
this.effectPhase++;
|
|
213
|
-
this.frame = (this.frame + 1) % CAT_FRAMES.length;
|
|
214
|
-
if (!this.effectDone && this.style === "armin") {
|
|
215
|
-
this.effectDone = this.tickArminEffect();
|
|
216
|
-
this.gridVersion++;
|
|
217
|
-
}
|
|
218
|
-
this.invalidate();
|
|
219
|
-
this.requestRender?.();
|
|
220
|
-
}
|
|
221
|
-
|
|
222
|
-
private tickArminEffect(): boolean {
|
|
223
|
-
switch (this.effect) {
|
|
224
|
-
case "typewriter":
|
|
225
|
-
return this.tickTypewriter();
|
|
226
|
-
case "scanline":
|
|
227
|
-
return this.tickScanline();
|
|
228
|
-
case "rain":
|
|
229
|
-
return this.tickRain();
|
|
230
|
-
case "fade":
|
|
231
|
-
return this.tickFade();
|
|
232
|
-
case "crt":
|
|
233
|
-
return this.tickCrt();
|
|
234
|
-
case "glitch":
|
|
235
|
-
return this.tickGlitch();
|
|
236
|
-
case "dissolve":
|
|
237
|
-
return this.tickDissolve();
|
|
238
|
-
default:
|
|
239
|
-
return true;
|
|
240
|
-
}
|
|
241
|
-
}
|
|
242
|
-
|
|
243
|
-
private tickTypewriter(): boolean {
|
|
244
|
-
const state = this.effectState;
|
|
245
|
-
if (state.pos === undefined) return true;
|
|
246
|
-
for (let i = 0; i < 6; i++) {
|
|
247
|
-
const row = Math.floor(state.pos / ARMIN_WIDTH);
|
|
248
|
-
const x = state.pos % ARMIN_WIDTH;
|
|
249
|
-
if (row >= ARMIN_DISPLAY_HEIGHT) return true;
|
|
250
|
-
this.currentArminGrid[row][x] = this.finalArminGrid[row][x];
|
|
251
|
-
state.pos++;
|
|
252
|
-
}
|
|
253
|
-
return false;
|
|
254
|
-
}
|
|
255
|
-
|
|
256
|
-
private tickScanline(): boolean {
|
|
257
|
-
const state = this.effectState;
|
|
258
|
-
if (state.row === undefined) return true;
|
|
259
|
-
if (state.row >= ARMIN_DISPLAY_HEIGHT) return true;
|
|
260
|
-
for (let x = 0; x < ARMIN_WIDTH; x++) this.currentArminGrid[state.row][x] = this.finalArminGrid[state.row][x];
|
|
261
|
-
state.row++;
|
|
262
|
-
return false;
|
|
263
|
-
}
|
|
264
|
-
|
|
265
|
-
private tickRain(): boolean {
|
|
266
|
-
const drops = this.effectState.drops;
|
|
267
|
-
if (!drops) return true;
|
|
268
|
-
let allSettled = true;
|
|
269
|
-
this.currentArminGrid = emptyArminGrid();
|
|
270
|
-
for (let x = 0; x < ARMIN_WIDTH; x++) {
|
|
271
|
-
const drop = drops[x];
|
|
272
|
-
for (let row = ARMIN_DISPLAY_HEIGHT - 1; row >= ARMIN_DISPLAY_HEIGHT - drop.settled; row--) {
|
|
273
|
-
if (row >= 0) this.currentArminGrid[row][x] = this.finalArminGrid[row][x];
|
|
274
|
-
}
|
|
275
|
-
if (drop.settled >= ARMIN_DISPLAY_HEIGHT) continue;
|
|
276
|
-
allSettled = false;
|
|
277
|
-
let targetRow = -1;
|
|
278
|
-
for (let row = ARMIN_DISPLAY_HEIGHT - 1 - drop.settled; row >= 0; row--) {
|
|
279
|
-
if (this.finalArminGrid[row][x] !== " ") {
|
|
280
|
-
targetRow = row;
|
|
281
|
-
break;
|
|
282
|
-
}
|
|
283
|
-
}
|
|
284
|
-
drop.y++;
|
|
285
|
-
if (drop.y >= 0 && drop.y < ARMIN_DISPLAY_HEIGHT) {
|
|
286
|
-
if (targetRow >= 0 && drop.y >= targetRow) {
|
|
287
|
-
drop.settled = ARMIN_DISPLAY_HEIGHT - targetRow;
|
|
288
|
-
drop.y = -Math.floor(Math.random() * 5) - 1;
|
|
289
|
-
} else {
|
|
290
|
-
this.currentArminGrid[drop.y][x] = "▓";
|
|
291
|
-
}
|
|
292
|
-
}
|
|
293
|
-
}
|
|
294
|
-
return allSettled;
|
|
295
|
-
}
|
|
296
|
-
|
|
297
|
-
private tickFade(): boolean {
|
|
298
|
-
const state = this.effectState;
|
|
299
|
-
if (!state.positions || state.idx === undefined) return true;
|
|
300
|
-
for (let i = 0; i < 18; i++) {
|
|
301
|
-
if (state.idx >= state.positions.length) return true;
|
|
302
|
-
const [row, x] = state.positions[state.idx];
|
|
303
|
-
this.currentArminGrid[row][x] = this.finalArminGrid[row][x];
|
|
304
|
-
state.idx++;
|
|
305
|
-
}
|
|
306
|
-
return false;
|
|
307
|
-
}
|
|
308
|
-
|
|
309
|
-
private tickCrt(): boolean {
|
|
310
|
-
const state = this.effectState;
|
|
311
|
-
if (state.expansion === undefined) return true;
|
|
312
|
-
const midRow = Math.floor(ARMIN_DISPLAY_HEIGHT / 2);
|
|
313
|
-
this.currentArminGrid = emptyArminGrid();
|
|
314
|
-
const top = midRow - state.expansion;
|
|
315
|
-
const bottom = midRow + state.expansion;
|
|
316
|
-
for (let row = Math.max(0, top); row <= Math.min(ARMIN_DISPLAY_HEIGHT - 1, bottom); row++) {
|
|
317
|
-
for (let x = 0; x < ARMIN_WIDTH; x++) this.currentArminGrid[row][x] = this.finalArminGrid[row][x];
|
|
318
|
-
}
|
|
319
|
-
state.expansion++;
|
|
320
|
-
return state.expansion > ARMIN_DISPLAY_HEIGHT;
|
|
321
|
-
}
|
|
322
|
-
|
|
323
|
-
private tickGlitch(): boolean {
|
|
324
|
-
const state = this.effectState;
|
|
325
|
-
if (state.phase === undefined || state.glitchFrames === undefined) return true;
|
|
326
|
-
if (state.phase < state.glitchFrames) {
|
|
327
|
-
this.currentArminGrid = this.finalArminGrid.map((row) => {
|
|
328
|
-
const offset = Math.floor(Math.random() * 7) - 3;
|
|
329
|
-
const glitchRow = [...row];
|
|
330
|
-
if (Math.random() < 0.3) {
|
|
331
|
-
const shifted = glitchRow.slice(offset).concat(glitchRow.slice(0, offset));
|
|
332
|
-
return shifted.slice(0, ARMIN_WIDTH);
|
|
333
|
-
}
|
|
334
|
-
if (Math.random() < 0.2) {
|
|
335
|
-
const swapRow = Math.floor(Math.random() * ARMIN_DISPLAY_HEIGHT);
|
|
336
|
-
return [...this.finalArminGrid[swapRow]];
|
|
337
|
-
}
|
|
338
|
-
return glitchRow;
|
|
339
|
-
});
|
|
340
|
-
state.phase++;
|
|
341
|
-
return false;
|
|
342
|
-
}
|
|
343
|
-
this.currentArminGrid = this.finalArminGrid.map((row) => [...row]);
|
|
344
|
-
return true;
|
|
345
|
-
}
|
|
346
|
-
|
|
347
|
-
private tickDissolve(): boolean {
|
|
348
|
-
const state = this.effectState;
|
|
349
|
-
if (!state.positions || state.idx === undefined) return true;
|
|
350
|
-
for (let i = 0; i < 22; i++) {
|
|
351
|
-
if (state.idx >= state.positions.length) return true;
|
|
352
|
-
const [row, x] = state.positions[state.idx];
|
|
353
|
-
this.currentArminGrid[row][x] = this.finalArminGrid[row][x];
|
|
354
|
-
state.idx++;
|
|
355
|
-
}
|
|
356
|
-
return false;
|
|
357
|
-
}
|
|
358
|
-
|
|
359
|
-
private close(): void {
|
|
360
|
-
if (this.doneGuard.called) return;
|
|
361
|
-
this.doneGuard.called = true;
|
|
362
|
-
if (this.interval) clearInterval(this.interval);
|
|
363
|
-
if (this.timeout) clearTimeout(this.timeout);
|
|
364
|
-
this.onDone();
|
|
365
|
-
}
|
|
366
|
-
|
|
367
|
-
private formatLine(line: string, width: number, color: Parameters<CrewTheme["fg"]>[0] = "accent"): string {
|
|
368
|
-
const contentWidth = Math.max(0, width - 4);
|
|
369
|
-
const themed = this.theme.fg(color, line);
|
|
370
|
-
return `│ ${pad(themed, contentWidth)} │`;
|
|
371
|
-
}
|
|
372
|
-
|
|
373
|
-
private currentCatFrame(): readonly string[] {
|
|
374
|
-
return CAT_FRAMES[this.frame];
|
|
375
|
-
}
|
|
376
|
-
|
|
377
|
-
private applyCatEffect(lines: readonly string[]): string[] {
|
|
378
|
-
if (this.effect === "none") return [...lines];
|
|
379
|
-
if (this.effect === "scanline") {
|
|
380
|
-
const scanRow = this.effectPhase % (lines.length + 4);
|
|
381
|
-
return lines.map((ln, i) =>
|
|
382
|
-
i === scanRow ? this.theme.bold(this.theme.fg("accent", ln)) : ln,
|
|
383
|
-
);
|
|
384
|
-
}
|
|
385
|
-
if (this.effect === "glitch") {
|
|
386
|
-
if (this.effectPhase % 9 !== 0) return [...lines];
|
|
387
|
-
return lines.map((ln) => {
|
|
388
|
-
if (Math.random() > 0.4) return ln;
|
|
389
|
-
const offset = 1 + Math.floor(Math.random() * 2);
|
|
390
|
-
return ln.length > offset ? ln.slice(offset) + ln.slice(0, offset) : ln;
|
|
391
|
-
});
|
|
392
|
-
}
|
|
393
|
-
if (this.effect === "crt") {
|
|
394
|
-
const flickerOn = Math.floor(this.effectPhase / 4) % 2 === 0;
|
|
395
|
-
return lines.map((ln) => (flickerOn ? this.theme.bold(ln) : ln));
|
|
396
|
-
}
|
|
397
|
-
return [...lines];
|
|
398
|
-
}
|
|
399
|
-
|
|
400
|
-
render(width: number): string[] {
|
|
401
|
-
if (width === this.cachedWidth && this.cachedVersion === this.gridVersion && this.cachedLines.length) {
|
|
402
|
-
return this.cachedLines;
|
|
403
|
-
}
|
|
404
|
-
const safeWidth = Math.max(20, width);
|
|
405
|
-
const horizontal = new DynamicCrewBorder(this.theme).render(Math.max(0, safeWidth - 2))[0];
|
|
406
|
-
const result: string[] = [
|
|
407
|
-
`${this.theme.fg("border", "╭")}${horizontal}${this.theme.fg("border", "╮")}`,
|
|
408
|
-
this.formatLine(this.theme.bold(" ARMIN SAYS HI "), safeWidth),
|
|
409
|
-
this.formatLine("", safeWidth),
|
|
410
|
-
];
|
|
411
|
-
if (this.style === "armin") {
|
|
412
|
-
for (const row of this.currentArminGrid) {
|
|
413
|
-
const text = row.join("");
|
|
414
|
-
result.push(this.formatLine(text, safeWidth));
|
|
415
|
-
}
|
|
416
|
-
} else {
|
|
417
|
-
const frameLines = this.applyCatEffect(this.currentCatFrame());
|
|
418
|
-
for (const line of frameLines) result.push(this.formatLine(line, safeWidth));
|
|
419
|
-
}
|
|
420
|
-
const hint = this.style === "armin"
|
|
421
|
-
? `Press q or Esc to close · effect: ${this.effect}`
|
|
422
|
-
: "Press q or Esc to close · animated preview";
|
|
423
|
-
result.push(this.formatLine(hint, safeWidth, "muted"));
|
|
424
|
-
result.push(`${this.theme.fg("border", "╰")}${horizontal}${this.theme.fg("border", "╯")}`);
|
|
425
|
-
this.cachedWidth = safeWidth;
|
|
426
|
-
this.cachedVersion = this.gridVersion;
|
|
427
|
-
this.cachedLines = result;
|
|
428
|
-
return result;
|
|
429
|
-
}
|
|
430
|
-
|
|
431
|
-
handleInput(data: string): void {
|
|
432
|
-
if (data === "q" || data === "\u001b" || data === "\u0003") {
|
|
433
|
-
this.close();
|
|
434
|
-
}
|
|
435
|
-
}
|
|
436
|
-
|
|
437
|
-
dispose(): void {
|
|
438
|
-
this.doneGuard.called = true;
|
|
439
|
-
if (this.interval) clearInterval(this.interval);
|
|
440
|
-
if (this.timeout) clearTimeout(this.timeout);
|
|
441
|
-
}
|
|
442
|
-
}
|
|
1
|
+
import type { CrewTheme } from "./theme-adapter.ts";
|
|
2
|
+
import { asCrewTheme } from "./theme-adapter.ts";
|
|
3
|
+
import { pad } from "../utils/visual.ts";
|
|
4
|
+
import { DynamicCrewBorder } from "./dynamic-border.ts";
|
|
5
|
+
|
|
6
|
+
export type MascotStyle = "cat" | "armin";
|
|
7
|
+
export type MascotEffect =
|
|
8
|
+
| "random"
|
|
9
|
+
| "none"
|
|
10
|
+
| "typewriter"
|
|
11
|
+
| "scanline"
|
|
12
|
+
| "rain"
|
|
13
|
+
| "fade"
|
|
14
|
+
| "crt"
|
|
15
|
+
| "glitch"
|
|
16
|
+
| "dissolve";
|
|
17
|
+
|
|
18
|
+
interface AnimatedMascotOptions {
|
|
19
|
+
frameIntervalMs?: number;
|
|
20
|
+
autoCloseMs?: number;
|
|
21
|
+
requestRender?: () => void;
|
|
22
|
+
style?: MascotStyle;
|
|
23
|
+
effect?: MascotEffect;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
const BS = String.fromCharCode(92);
|
|
27
|
+
|
|
28
|
+
const CAT_FRAMES: readonly (readonly string[])[] = [
|
|
29
|
+
[` /${BS}_/${BS} `, "(='.'=)", "( _ )", ` ${BS}_/ `],
|
|
30
|
+
[` /${BS}_/${BS} `, "(='o'=)", "( w )", ` ${BS}_/ `],
|
|
31
|
+
[` /${BS}_/${BS} `, "(=^.^=)", "( _ )", ` ${BS}_/ `],
|
|
32
|
+
[` /${BS}_/${BS} `, "(=*.*=)", "( v )", ` ${BS}_/ `],
|
|
33
|
+
] as const;
|
|
34
|
+
|
|
35
|
+
// Armin XBM: 31x36 px, LSB first, 1=background, 0=foreground (ported from pi-mono coding-agent)
|
|
36
|
+
const ARMIN_WIDTH = 31;
|
|
37
|
+
const ARMIN_HEIGHT = 36;
|
|
38
|
+
const ARMIN_BITS: readonly number[] = [
|
|
39
|
+
0xff, 0xff, 0xff, 0x7f, 0xff, 0xf0, 0xff, 0x7f, 0xff, 0xed, 0xff, 0x7f, 0xff, 0xdb, 0xff, 0x7f, 0xff, 0xb7, 0xff,
|
|
40
|
+
0x7f, 0xff, 0x77, 0xfe, 0x7f, 0x3f, 0xf8, 0xfe, 0x7f, 0xdf, 0xff, 0xfe, 0x7f, 0xdf, 0x3f, 0xfc, 0x7f, 0x9f, 0xc3,
|
|
41
|
+
0xfb, 0x7f, 0x6f, 0xfc, 0xf4, 0x7f, 0xf7, 0x0f, 0xf7, 0x7f, 0xf7, 0xff, 0xf7, 0x7f, 0xf7, 0xff, 0xe3, 0x7f, 0xf7,
|
|
42
|
+
0x07, 0xe8, 0x7f, 0xef, 0xf8, 0x67, 0x70, 0x0f, 0xff, 0xbb, 0x6f, 0xf1, 0x00, 0xd0, 0x5b, 0xfd, 0x3f, 0xec, 0x53,
|
|
43
|
+
0xc1, 0xff, 0xef, 0x57, 0x9f, 0xfd, 0xee, 0x5f, 0x9f, 0xfc, 0xae, 0x5f, 0x1f, 0x78, 0xac, 0x5f, 0x3f, 0x00, 0x50,
|
|
44
|
+
0x6c, 0x7f, 0x00, 0xdc, 0x77, 0xff, 0xc0, 0x3f, 0x78, 0xff, 0x01, 0xf8, 0x7f, 0xff, 0x03, 0x9c, 0x78, 0xff, 0x07,
|
|
45
|
+
0x8c, 0x7c, 0xff, 0x0f, 0xce, 0x78, 0xff, 0xff, 0xcf, 0x7f, 0xff, 0xff, 0xcf, 0x78, 0xff, 0xff, 0xdf, 0x78, 0xff,
|
|
46
|
+
0xff, 0xdf, 0x7d, 0xff, 0xff, 0x3f, 0x7e, 0xff, 0xff, 0xff, 0x7f,
|
|
47
|
+
];
|
|
48
|
+
|
|
49
|
+
const ARMIN_BYTES_PER_ROW = Math.ceil(ARMIN_WIDTH / 8);
|
|
50
|
+
const ARMIN_DISPLAY_HEIGHT = Math.ceil(ARMIN_HEIGHT / 2);
|
|
51
|
+
|
|
52
|
+
const NON_NONE_EFFECTS: MascotEffect[] = [
|
|
53
|
+
"typewriter",
|
|
54
|
+
"scanline",
|
|
55
|
+
"rain",
|
|
56
|
+
"fade",
|
|
57
|
+
"crt",
|
|
58
|
+
"glitch",
|
|
59
|
+
"dissolve",
|
|
60
|
+
];
|
|
61
|
+
const CAT_FRIENDLY_EFFECTS: MascotEffect[] = ["scanline", "glitch", "crt"];
|
|
62
|
+
|
|
63
|
+
function getArminPixel(x: number, y: number): boolean {
|
|
64
|
+
if (y >= ARMIN_HEIGHT) return false;
|
|
65
|
+
const byteIndex = y * ARMIN_BYTES_PER_ROW + Math.floor(x / 8);
|
|
66
|
+
const bitIndex = x % 8;
|
|
67
|
+
return ((ARMIN_BITS[byteIndex] >> bitIndex) & 1) === 0;
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
function getArminChar(x: number, row: number): string {
|
|
71
|
+
const upper = getArminPixel(x, row * 2);
|
|
72
|
+
const lower = getArminPixel(x, row * 2 + 1);
|
|
73
|
+
if (upper && lower) return "█";
|
|
74
|
+
if (upper) return "▀";
|
|
75
|
+
if (lower) return "▄";
|
|
76
|
+
return " ";
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
function buildArminGrid(): string[][] {
|
|
80
|
+
const grid: string[][] = [];
|
|
81
|
+
for (let row = 0; row < ARMIN_DISPLAY_HEIGHT; row++) {
|
|
82
|
+
const line: string[] = [];
|
|
83
|
+
for (let x = 0; x < ARMIN_WIDTH; x++) line.push(getArminChar(x, row));
|
|
84
|
+
grid.push(line);
|
|
85
|
+
}
|
|
86
|
+
return grid;
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
function emptyArminGrid(): string[][] {
|
|
90
|
+
return Array.from({ length: ARMIN_DISPLAY_HEIGHT }, () => Array(ARMIN_WIDTH).fill(" "));
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
interface EffectState {
|
|
94
|
+
pos?: number;
|
|
95
|
+
row?: number;
|
|
96
|
+
expansion?: number;
|
|
97
|
+
phase?: number;
|
|
98
|
+
glitchFrames?: number;
|
|
99
|
+
positions?: [number, number][];
|
|
100
|
+
idx?: number;
|
|
101
|
+
drops?: { y: number; settled: number }[];
|
|
102
|
+
done?: boolean;
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
export class AnimatedMascot {
|
|
106
|
+
private readonly theme: CrewTheme;
|
|
107
|
+
private readonly frameIntervalMs: number;
|
|
108
|
+
private readonly autoCloseMs: number;
|
|
109
|
+
private readonly onDone: () => void;
|
|
110
|
+
private readonly requestRender: (() => void) | undefined;
|
|
111
|
+
private readonly doneGuard: { called: boolean } = { called: false };
|
|
112
|
+
private readonly interval: ReturnType<typeof setInterval> | undefined;
|
|
113
|
+
private readonly timeout: ReturnType<typeof setTimeout> | undefined;
|
|
114
|
+
private readonly style: MascotStyle;
|
|
115
|
+
private readonly effect: MascotEffect;
|
|
116
|
+
private readonly finalArminGrid: string[][];
|
|
117
|
+
private currentArminGrid: string[][];
|
|
118
|
+
private effectState: EffectState = {};
|
|
119
|
+
private effectDone = false;
|
|
120
|
+
private frame = 0;
|
|
121
|
+
private effectPhase = 0;
|
|
122
|
+
private gridVersion = 0;
|
|
123
|
+
private cachedWidth = 0;
|
|
124
|
+
private cachedVersion = -1;
|
|
125
|
+
private cachedLines: string[] = [];
|
|
126
|
+
|
|
127
|
+
constructor(themeLike: unknown, onDone: () => void, options: AnimatedMascotOptions = {}) {
|
|
128
|
+
this.theme = asCrewTheme(themeLike);
|
|
129
|
+
this.onDone = onDone;
|
|
130
|
+
this.frameIntervalMs = Math.max(16, Math.floor(options.frameIntervalMs ?? 180));
|
|
131
|
+
this.autoCloseMs = Math.max(0, Math.floor(options.autoCloseMs ?? 7_000));
|
|
132
|
+
this.requestRender = options.requestRender;
|
|
133
|
+
this.style = options.style === "armin" ? "armin" : "cat";
|
|
134
|
+
this.effect = this.resolveEffect(options.effect);
|
|
135
|
+
this.finalArminGrid = buildArminGrid();
|
|
136
|
+
this.currentArminGrid = this.style === "armin" ? this.initialArminGrid() : emptyArminGrid();
|
|
137
|
+
this.initEffect();
|
|
138
|
+
this.interval = setInterval(() => this.tick(), this.frameIntervalMs);
|
|
139
|
+
this.interval.unref();
|
|
140
|
+
this.timeout = this.autoCloseMs > 0 ? setTimeout(() => this.close(), this.autoCloseMs) : undefined;
|
|
141
|
+
this.timeout?.unref();
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
private resolveEffect(requested: MascotEffect | undefined): MascotEffect {
|
|
145
|
+
if (!requested || requested === "random") {
|
|
146
|
+
const pool = this.style === "armin" ? NON_NONE_EFFECTS : CAT_FRIENDLY_EFFECTS;
|
|
147
|
+
return pool[Math.floor(Math.random() * pool.length)];
|
|
148
|
+
}
|
|
149
|
+
return requested;
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
private initialArminGrid(): string[][] {
|
|
153
|
+
if (this.effect === "dissolve") {
|
|
154
|
+
const chars = [" ", "░", "▒", "▓", "█", "▀", "▄"];
|
|
155
|
+
return Array.from({ length: ARMIN_DISPLAY_HEIGHT }, () =>
|
|
156
|
+
Array.from({ length: ARMIN_WIDTH }, () => chars[Math.floor(Math.random() * chars.length)]),
|
|
157
|
+
);
|
|
158
|
+
}
|
|
159
|
+
return emptyArminGrid();
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
private initEffect(): void {
|
|
163
|
+
this.effectState = {};
|
|
164
|
+
this.effectDone = false;
|
|
165
|
+
switch (this.effect) {
|
|
166
|
+
case "typewriter":
|
|
167
|
+
this.effectState = { pos: 0 };
|
|
168
|
+
break;
|
|
169
|
+
case "scanline":
|
|
170
|
+
this.effectState = { row: 0 };
|
|
171
|
+
break;
|
|
172
|
+
case "rain":
|
|
173
|
+
this.effectState = {
|
|
174
|
+
drops: Array.from({ length: ARMIN_WIDTH }, () => ({
|
|
175
|
+
y: -Math.floor(Math.random() * ARMIN_DISPLAY_HEIGHT * 2),
|
|
176
|
+
settled: 0,
|
|
177
|
+
})),
|
|
178
|
+
};
|
|
179
|
+
break;
|
|
180
|
+
case "fade":
|
|
181
|
+
case "dissolve": {
|
|
182
|
+
const positions: [number, number][] = [];
|
|
183
|
+
for (let row = 0; row < ARMIN_DISPLAY_HEIGHT; row++) {
|
|
184
|
+
for (let x = 0; x < ARMIN_WIDTH; x++) positions.push([row, x]);
|
|
185
|
+
}
|
|
186
|
+
for (let i = positions.length - 1; i > 0; i--) {
|
|
187
|
+
const j = Math.floor(Math.random() * (i + 1));
|
|
188
|
+
[positions[i], positions[j]] = [positions[j], positions[i]];
|
|
189
|
+
}
|
|
190
|
+
this.effectState = { positions, idx: 0 };
|
|
191
|
+
break;
|
|
192
|
+
}
|
|
193
|
+
case "crt":
|
|
194
|
+
this.effectState = { expansion: 0 };
|
|
195
|
+
break;
|
|
196
|
+
case "glitch":
|
|
197
|
+
this.effectState = { phase: 0, glitchFrames: 8 };
|
|
198
|
+
break;
|
|
199
|
+
case "none":
|
|
200
|
+
this.currentArminGrid = this.finalArminGrid.map((row) => [...row]);
|
|
201
|
+
this.effectDone = true;
|
|
202
|
+
break;
|
|
203
|
+
}
|
|
204
|
+
}
|
|
205
|
+
|
|
206
|
+
invalidate(): void {
|
|
207
|
+
this.cachedWidth = 0;
|
|
208
|
+
this.cachedLines = [];
|
|
209
|
+
}
|
|
210
|
+
|
|
211
|
+
private tick(): void {
|
|
212
|
+
this.effectPhase++;
|
|
213
|
+
this.frame = (this.frame + 1) % CAT_FRAMES.length;
|
|
214
|
+
if (!this.effectDone && this.style === "armin") {
|
|
215
|
+
this.effectDone = this.tickArminEffect();
|
|
216
|
+
this.gridVersion++;
|
|
217
|
+
}
|
|
218
|
+
this.invalidate();
|
|
219
|
+
this.requestRender?.();
|
|
220
|
+
}
|
|
221
|
+
|
|
222
|
+
private tickArminEffect(): boolean {
|
|
223
|
+
switch (this.effect) {
|
|
224
|
+
case "typewriter":
|
|
225
|
+
return this.tickTypewriter();
|
|
226
|
+
case "scanline":
|
|
227
|
+
return this.tickScanline();
|
|
228
|
+
case "rain":
|
|
229
|
+
return this.tickRain();
|
|
230
|
+
case "fade":
|
|
231
|
+
return this.tickFade();
|
|
232
|
+
case "crt":
|
|
233
|
+
return this.tickCrt();
|
|
234
|
+
case "glitch":
|
|
235
|
+
return this.tickGlitch();
|
|
236
|
+
case "dissolve":
|
|
237
|
+
return this.tickDissolve();
|
|
238
|
+
default:
|
|
239
|
+
return true;
|
|
240
|
+
}
|
|
241
|
+
}
|
|
242
|
+
|
|
243
|
+
private tickTypewriter(): boolean {
|
|
244
|
+
const state = this.effectState;
|
|
245
|
+
if (state.pos === undefined) return true;
|
|
246
|
+
for (let i = 0; i < 6; i++) {
|
|
247
|
+
const row = Math.floor(state.pos / ARMIN_WIDTH);
|
|
248
|
+
const x = state.pos % ARMIN_WIDTH;
|
|
249
|
+
if (row >= ARMIN_DISPLAY_HEIGHT) return true;
|
|
250
|
+
this.currentArminGrid[row][x] = this.finalArminGrid[row][x];
|
|
251
|
+
state.pos++;
|
|
252
|
+
}
|
|
253
|
+
return false;
|
|
254
|
+
}
|
|
255
|
+
|
|
256
|
+
private tickScanline(): boolean {
|
|
257
|
+
const state = this.effectState;
|
|
258
|
+
if (state.row === undefined) return true;
|
|
259
|
+
if (state.row >= ARMIN_DISPLAY_HEIGHT) return true;
|
|
260
|
+
for (let x = 0; x < ARMIN_WIDTH; x++) this.currentArminGrid[state.row][x] = this.finalArminGrid[state.row][x];
|
|
261
|
+
state.row++;
|
|
262
|
+
return false;
|
|
263
|
+
}
|
|
264
|
+
|
|
265
|
+
private tickRain(): boolean {
|
|
266
|
+
const drops = this.effectState.drops;
|
|
267
|
+
if (!drops) return true;
|
|
268
|
+
let allSettled = true;
|
|
269
|
+
this.currentArminGrid = emptyArminGrid();
|
|
270
|
+
for (let x = 0; x < ARMIN_WIDTH; x++) {
|
|
271
|
+
const drop = drops[x];
|
|
272
|
+
for (let row = ARMIN_DISPLAY_HEIGHT - 1; row >= ARMIN_DISPLAY_HEIGHT - drop.settled; row--) {
|
|
273
|
+
if (row >= 0) this.currentArminGrid[row][x] = this.finalArminGrid[row][x];
|
|
274
|
+
}
|
|
275
|
+
if (drop.settled >= ARMIN_DISPLAY_HEIGHT) continue;
|
|
276
|
+
allSettled = false;
|
|
277
|
+
let targetRow = -1;
|
|
278
|
+
for (let row = ARMIN_DISPLAY_HEIGHT - 1 - drop.settled; row >= 0; row--) {
|
|
279
|
+
if (this.finalArminGrid[row][x] !== " ") {
|
|
280
|
+
targetRow = row;
|
|
281
|
+
break;
|
|
282
|
+
}
|
|
283
|
+
}
|
|
284
|
+
drop.y++;
|
|
285
|
+
if (drop.y >= 0 && drop.y < ARMIN_DISPLAY_HEIGHT) {
|
|
286
|
+
if (targetRow >= 0 && drop.y >= targetRow) {
|
|
287
|
+
drop.settled = ARMIN_DISPLAY_HEIGHT - targetRow;
|
|
288
|
+
drop.y = -Math.floor(Math.random() * 5) - 1;
|
|
289
|
+
} else {
|
|
290
|
+
this.currentArminGrid[drop.y][x] = "▓";
|
|
291
|
+
}
|
|
292
|
+
}
|
|
293
|
+
}
|
|
294
|
+
return allSettled;
|
|
295
|
+
}
|
|
296
|
+
|
|
297
|
+
private tickFade(): boolean {
|
|
298
|
+
const state = this.effectState;
|
|
299
|
+
if (!state.positions || state.idx === undefined) return true;
|
|
300
|
+
for (let i = 0; i < 18; i++) {
|
|
301
|
+
if (state.idx >= state.positions.length) return true;
|
|
302
|
+
const [row, x] = state.positions[state.idx];
|
|
303
|
+
this.currentArminGrid[row][x] = this.finalArminGrid[row][x];
|
|
304
|
+
state.idx++;
|
|
305
|
+
}
|
|
306
|
+
return false;
|
|
307
|
+
}
|
|
308
|
+
|
|
309
|
+
private tickCrt(): boolean {
|
|
310
|
+
const state = this.effectState;
|
|
311
|
+
if (state.expansion === undefined) return true;
|
|
312
|
+
const midRow = Math.floor(ARMIN_DISPLAY_HEIGHT / 2);
|
|
313
|
+
this.currentArminGrid = emptyArminGrid();
|
|
314
|
+
const top = midRow - state.expansion;
|
|
315
|
+
const bottom = midRow + state.expansion;
|
|
316
|
+
for (let row = Math.max(0, top); row <= Math.min(ARMIN_DISPLAY_HEIGHT - 1, bottom); row++) {
|
|
317
|
+
for (let x = 0; x < ARMIN_WIDTH; x++) this.currentArminGrid[row][x] = this.finalArminGrid[row][x];
|
|
318
|
+
}
|
|
319
|
+
state.expansion++;
|
|
320
|
+
return state.expansion > ARMIN_DISPLAY_HEIGHT;
|
|
321
|
+
}
|
|
322
|
+
|
|
323
|
+
private tickGlitch(): boolean {
|
|
324
|
+
const state = this.effectState;
|
|
325
|
+
if (state.phase === undefined || state.glitchFrames === undefined) return true;
|
|
326
|
+
if (state.phase < state.glitchFrames) {
|
|
327
|
+
this.currentArminGrid = this.finalArminGrid.map((row) => {
|
|
328
|
+
const offset = Math.floor(Math.random() * 7) - 3;
|
|
329
|
+
const glitchRow = [...row];
|
|
330
|
+
if (Math.random() < 0.3) {
|
|
331
|
+
const shifted = glitchRow.slice(offset).concat(glitchRow.slice(0, offset));
|
|
332
|
+
return shifted.slice(0, ARMIN_WIDTH);
|
|
333
|
+
}
|
|
334
|
+
if (Math.random() < 0.2) {
|
|
335
|
+
const swapRow = Math.floor(Math.random() * ARMIN_DISPLAY_HEIGHT);
|
|
336
|
+
return [...this.finalArminGrid[swapRow]];
|
|
337
|
+
}
|
|
338
|
+
return glitchRow;
|
|
339
|
+
});
|
|
340
|
+
state.phase++;
|
|
341
|
+
return false;
|
|
342
|
+
}
|
|
343
|
+
this.currentArminGrid = this.finalArminGrid.map((row) => [...row]);
|
|
344
|
+
return true;
|
|
345
|
+
}
|
|
346
|
+
|
|
347
|
+
private tickDissolve(): boolean {
|
|
348
|
+
const state = this.effectState;
|
|
349
|
+
if (!state.positions || state.idx === undefined) return true;
|
|
350
|
+
for (let i = 0; i < 22; i++) {
|
|
351
|
+
if (state.idx >= state.positions.length) return true;
|
|
352
|
+
const [row, x] = state.positions[state.idx];
|
|
353
|
+
this.currentArminGrid[row][x] = this.finalArminGrid[row][x];
|
|
354
|
+
state.idx++;
|
|
355
|
+
}
|
|
356
|
+
return false;
|
|
357
|
+
}
|
|
358
|
+
|
|
359
|
+
private close(): void {
|
|
360
|
+
if (this.doneGuard.called) return;
|
|
361
|
+
this.doneGuard.called = true;
|
|
362
|
+
if (this.interval) clearInterval(this.interval);
|
|
363
|
+
if (this.timeout) clearTimeout(this.timeout);
|
|
364
|
+
this.onDone();
|
|
365
|
+
}
|
|
366
|
+
|
|
367
|
+
private formatLine(line: string, width: number, color: Parameters<CrewTheme["fg"]>[0] = "accent"): string {
|
|
368
|
+
const contentWidth = Math.max(0, width - 4);
|
|
369
|
+
const themed = this.theme.fg(color, line);
|
|
370
|
+
return `│ ${pad(themed, contentWidth)} │`;
|
|
371
|
+
}
|
|
372
|
+
|
|
373
|
+
private currentCatFrame(): readonly string[] {
|
|
374
|
+
return CAT_FRAMES[this.frame];
|
|
375
|
+
}
|
|
376
|
+
|
|
377
|
+
private applyCatEffect(lines: readonly string[]): string[] {
|
|
378
|
+
if (this.effect === "none") return [...lines];
|
|
379
|
+
if (this.effect === "scanline") {
|
|
380
|
+
const scanRow = this.effectPhase % (lines.length + 4);
|
|
381
|
+
return lines.map((ln, i) =>
|
|
382
|
+
i === scanRow ? this.theme.bold(this.theme.fg("accent", ln)) : ln,
|
|
383
|
+
);
|
|
384
|
+
}
|
|
385
|
+
if (this.effect === "glitch") {
|
|
386
|
+
if (this.effectPhase % 9 !== 0) return [...lines];
|
|
387
|
+
return lines.map((ln) => {
|
|
388
|
+
if (Math.random() > 0.4) return ln;
|
|
389
|
+
const offset = 1 + Math.floor(Math.random() * 2);
|
|
390
|
+
return ln.length > offset ? ln.slice(offset) + ln.slice(0, offset) : ln;
|
|
391
|
+
});
|
|
392
|
+
}
|
|
393
|
+
if (this.effect === "crt") {
|
|
394
|
+
const flickerOn = Math.floor(this.effectPhase / 4) % 2 === 0;
|
|
395
|
+
return lines.map((ln) => (flickerOn ? this.theme.bold(ln) : ln));
|
|
396
|
+
}
|
|
397
|
+
return [...lines];
|
|
398
|
+
}
|
|
399
|
+
|
|
400
|
+
render(width: number): string[] {
|
|
401
|
+
if (width === this.cachedWidth && this.cachedVersion === this.gridVersion && this.cachedLines.length) {
|
|
402
|
+
return this.cachedLines;
|
|
403
|
+
}
|
|
404
|
+
const safeWidth = Math.max(20, width);
|
|
405
|
+
const horizontal = new DynamicCrewBorder(this.theme).render(Math.max(0, safeWidth - 2))[0];
|
|
406
|
+
const result: string[] = [
|
|
407
|
+
`${this.theme.fg("border", "╭")}${horizontal}${this.theme.fg("border", "╮")}`,
|
|
408
|
+
this.formatLine(this.theme.bold(" ARMIN SAYS HI "), safeWidth),
|
|
409
|
+
this.formatLine("", safeWidth),
|
|
410
|
+
];
|
|
411
|
+
if (this.style === "armin") {
|
|
412
|
+
for (const row of this.currentArminGrid) {
|
|
413
|
+
const text = row.join("");
|
|
414
|
+
result.push(this.formatLine(text, safeWidth));
|
|
415
|
+
}
|
|
416
|
+
} else {
|
|
417
|
+
const frameLines = this.applyCatEffect(this.currentCatFrame());
|
|
418
|
+
for (const line of frameLines) result.push(this.formatLine(line, safeWidth));
|
|
419
|
+
}
|
|
420
|
+
const hint = this.style === "armin"
|
|
421
|
+
? `Press q or Esc to close · effect: ${this.effect}`
|
|
422
|
+
: "Press q or Esc to close · animated preview";
|
|
423
|
+
result.push(this.formatLine(hint, safeWidth, "muted"));
|
|
424
|
+
result.push(`${this.theme.fg("border", "╰")}${horizontal}${this.theme.fg("border", "╯")}`);
|
|
425
|
+
this.cachedWidth = safeWidth;
|
|
426
|
+
this.cachedVersion = this.gridVersion;
|
|
427
|
+
this.cachedLines = result;
|
|
428
|
+
return result;
|
|
429
|
+
}
|
|
430
|
+
|
|
431
|
+
handleInput(data: string): void {
|
|
432
|
+
if (data === "q" || data === "\u001b" || data === "\u0003") {
|
|
433
|
+
this.close();
|
|
434
|
+
}
|
|
435
|
+
}
|
|
436
|
+
|
|
437
|
+
dispose(): void {
|
|
438
|
+
this.doneGuard.called = true;
|
|
439
|
+
if (this.interval) clearInterval(this.interval);
|
|
440
|
+
if (this.timeout) clearTimeout(this.timeout);
|
|
441
|
+
}
|
|
442
|
+
}
|