@steipete/summarize 0.10.0 → 0.11.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +80 -28
- package/README.md +115 -30
- package/dist/cli.js +1 -1
- package/dist/esm/cache.js +67 -65
- package/dist/esm/cache.js.map +1 -1
- package/dist/esm/cli-main.js +27 -27
- package/dist/esm/cli-main.js.map +1 -1
- package/dist/esm/cli.js +2 -2
- package/dist/esm/cli.js.map +1 -1
- package/dist/esm/config.js +310 -166
- package/dist/esm/config.js.map +1 -1
- package/dist/esm/content/asset.js +53 -50
- package/dist/esm/content/asset.js.map +1 -1
- package/dist/esm/content/index.js +1 -1
- package/dist/esm/content/index.js.map +1 -1
- package/dist/esm/costs.js +1 -1
- package/dist/esm/costs.js.map +1 -1
- package/dist/esm/daemon/agent.js +165 -164
- package/dist/esm/daemon/agent.js.map +1 -1
- package/dist/esm/daemon/auto-mode.js +3 -3
- package/dist/esm/daemon/auto-mode.js.map +1 -1
- package/dist/esm/daemon/chat.js +16 -14
- package/dist/esm/daemon/chat.js.map +1 -1
- package/dist/esm/daemon/cli-entrypoint.js +72 -0
- package/dist/esm/daemon/cli-entrypoint.js.map +1 -0
- package/dist/esm/daemon/cli.js +63 -87
- package/dist/esm/daemon/cli.js.map +1 -1
- package/dist/esm/daemon/config.js +15 -15
- package/dist/esm/daemon/config.js.map +1 -1
- package/dist/esm/daemon/constants.js +6 -6
- package/dist/esm/daemon/constants.js.map +1 -1
- package/dist/esm/daemon/env-merge.js.map +1 -1
- package/dist/esm/daemon/env-snapshot.js +36 -31
- package/dist/esm/daemon/env-snapshot.js.map +1 -1
- package/dist/esm/daemon/flow-context.js +59 -28
- package/dist/esm/daemon/flow-context.js.map +1 -1
- package/dist/esm/daemon/launchd.js +100 -55
- package/dist/esm/daemon/launchd.js.map +1 -1
- package/dist/esm/daemon/meta.js +5 -5
- package/dist/esm/daemon/meta.js.map +1 -1
- package/dist/esm/daemon/models.js +54 -31
- package/dist/esm/daemon/models.js.map +1 -1
- package/dist/esm/daemon/process-registry.js +15 -15
- package/dist/esm/daemon/process-registry.js.map +1 -1
- package/dist/esm/daemon/schtasks.js +42 -42
- package/dist/esm/daemon/schtasks.js.map +1 -1
- package/dist/esm/daemon/server.js +248 -244
- package/dist/esm/daemon/server.js.map +1 -1
- package/dist/esm/daemon/summarize-progress.js +11 -11
- package/dist/esm/daemon/summarize-progress.js.map +1 -1
- package/dist/esm/daemon/summarize.js +29 -29
- package/dist/esm/daemon/summarize.js.map +1 -1
- package/dist/esm/daemon/systemd.js +47 -47
- package/dist/esm/daemon/systemd.js.map +1 -1
- package/dist/esm/firecrawl.js +12 -12
- package/dist/esm/firecrawl.js.map +1 -1
- package/dist/esm/flags.js +32 -32
- package/dist/esm/flags.js.map +1 -1
- package/dist/esm/index.js +3 -3
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/language.js +1 -1
- package/dist/esm/language.js.map +1 -1
- package/dist/esm/llm/cli.js +128 -64
- package/dist/esm/llm/cli.js.map +1 -1
- package/dist/esm/llm/errors.js +1 -1
- package/dist/esm/llm/errors.js.map +1 -1
- package/dist/esm/llm/generate-text.js +107 -98
- package/dist/esm/llm/generate-text.js.map +1 -1
- package/dist/esm/llm/google-models.js +17 -17
- package/dist/esm/llm/google-models.js.map +1 -1
- package/dist/esm/llm/html-to-markdown.js +3 -3
- package/dist/esm/llm/html-to-markdown.js.map +1 -1
- package/dist/esm/llm/model-id.js +38 -16
- package/dist/esm/llm/model-id.js.map +1 -1
- package/dist/esm/llm/prompt.js +5 -5
- package/dist/esm/llm/prompt.js.map +1 -1
- package/dist/esm/llm/providers/anthropic.js +33 -33
- package/dist/esm/llm/providers/anthropic.js.map +1 -1
- package/dist/esm/llm/providers/google.js +19 -19
- package/dist/esm/llm/providers/google.js.map +1 -1
- package/dist/esm/llm/providers/models.js +30 -30
- package/dist/esm/llm/providers/models.js.map +1 -1
- package/dist/esm/llm/providers/openai.js +35 -34
- package/dist/esm/llm/providers/openai.js.map +1 -1
- package/dist/esm/llm/providers/shared.js +8 -8
- package/dist/esm/llm/providers/shared.js.map +1 -1
- package/dist/esm/llm/transcript-to-markdown.js +9 -5
- package/dist/esm/llm/transcript-to-markdown.js.map +1 -1
- package/dist/esm/llm/usage.js +18 -18
- package/dist/esm/llm/usage.js.map +1 -1
- package/dist/esm/logging/daemon.js +21 -21
- package/dist/esm/logging/daemon.js.map +1 -1
- package/dist/esm/logging/ring-file.js +5 -5
- package/dist/esm/logging/ring-file.js.map +1 -1
- package/dist/esm/markitdown.js +21 -19
- package/dist/esm/markitdown.js.map +1 -1
- package/dist/esm/media-cache.js +39 -39
- package/dist/esm/media-cache.js.map +1 -1
- package/dist/esm/model-auto.js +175 -106
- package/dist/esm/model-auto.js.map +1 -1
- package/dist/esm/model-spec.js +52 -42
- package/dist/esm/model-spec.js.map +1 -1
- package/dist/esm/pricing/litellm.js +4 -4
- package/dist/esm/pricing/litellm.js.map +1 -1
- package/dist/esm/processes.js +1 -1
- package/dist/esm/processes.js.map +1 -1
- package/dist/esm/prompts/index.js +1 -1
- package/dist/esm/prompts/index.js.map +1 -1
- package/dist/esm/refresh-free.js +81 -81
- package/dist/esm/refresh-free.js.map +1 -1
- package/dist/esm/run/attachments.js +47 -44
- package/dist/esm/run/attachments.js.map +1 -1
- package/dist/esm/run/bird.js +26 -26
- package/dist/esm/run/bird.js.map +1 -1
- package/dist/esm/run/cache-state.js +7 -7
- package/dist/esm/run/cache-state.js.map +1 -1
- package/dist/esm/run/cli-fallback-state.js +45 -0
- package/dist/esm/run/cli-fallback-state.js.map +1 -0
- package/dist/esm/run/cli-preflight.js +24 -24
- package/dist/esm/run/cli-preflight.js.map +1 -1
- package/dist/esm/run/constants.js +12 -12
- package/dist/esm/run/constants.js.map +1 -1
- package/dist/esm/run/cookies/twitter.js +47 -47
- package/dist/esm/run/cookies/twitter.js.map +1 -1
- package/dist/esm/run/env.js +21 -15
- package/dist/esm/run/env.js.map +1 -1
- package/dist/esm/run/fetch-with-timeout.js +4 -4
- package/dist/esm/run/fetch-with-timeout.js.map +1 -1
- package/dist/esm/run/finish-line.js +68 -68
- package/dist/esm/run/finish-line.js.map +1 -1
- package/dist/esm/run/flows/asset/extract.js +15 -15
- package/dist/esm/run/flows/asset/extract.js.map +1 -1
- package/dist/esm/run/flows/asset/input.js +47 -66
- package/dist/esm/run/flows/asset/input.js.map +1 -1
- package/dist/esm/run/flows/asset/media-policy.js +1 -1
- package/dist/esm/run/flows/asset/media-policy.js.map +1 -1
- package/dist/esm/run/flows/asset/media.js +49 -40
- package/dist/esm/run/flows/asset/media.js.map +1 -1
- package/dist/esm/run/flows/asset/output.js +12 -12
- package/dist/esm/run/flows/asset/output.js.map +1 -1
- package/dist/esm/run/flows/asset/preprocess.js +79 -44
- package/dist/esm/run/flows/asset/preprocess.js.map +1 -1
- package/dist/esm/run/flows/asset/summary.js +173 -106
- package/dist/esm/run/flows/asset/summary.js.map +1 -1
- package/dist/esm/run/flows/url/extract.js +26 -26
- package/dist/esm/run/flows/url/extract.js.map +1 -1
- package/dist/esm/run/flows/url/flow.js +104 -98
- package/dist/esm/run/flows/url/flow.js.map +1 -1
- package/dist/esm/run/flows/url/markdown.js +57 -57
- package/dist/esm/run/flows/url/markdown.js.map +1 -1
- package/dist/esm/run/flows/url/slides-output.js +61 -59
- package/dist/esm/run/flows/url/slides-output.js.map +1 -1
- package/dist/esm/run/flows/url/slides-text.js +85 -85
- package/dist/esm/run/flows/url/slides-text.js.map +1 -1
- package/dist/esm/run/flows/url/summary.js +174 -107
- package/dist/esm/run/flows/url/summary.js.map +1 -1
- package/dist/esm/run/format.js +10 -10
- package/dist/esm/run/format.js.map +1 -1
- package/dist/esm/run/help.js +141 -135
- package/dist/esm/run/help.js.map +1 -1
- package/dist/esm/run/logging.js +10 -10
- package/dist/esm/run/logging.js.map +1 -1
- package/dist/esm/run/markdown.js +12 -12
- package/dist/esm/run/markdown.js.map +1 -1
- package/dist/esm/run/media-cache-state.js +5 -5
- package/dist/esm/run/media-cache-state.js.map +1 -1
- package/dist/esm/run/model-attempts.js.map +1 -1
- package/dist/esm/run/openrouter.js +11 -11
- package/dist/esm/run/openrouter.js.map +1 -1
- package/dist/esm/run/progress.js +1 -1
- package/dist/esm/run/progress.js.map +1 -1
- package/dist/esm/run/run-config.js +16 -16
- package/dist/esm/run/run-config.js.map +1 -1
- package/dist/esm/run/run-context.js +2 -2
- package/dist/esm/run/run-context.js.map +1 -1
- package/dist/esm/run/run-env.js +55 -54
- package/dist/esm/run/run-env.js.map +1 -1
- package/dist/esm/run/run-input.js +3 -3
- package/dist/esm/run/run-input.js.map +1 -1
- package/dist/esm/run/run-metrics.js +16 -16
- package/dist/esm/run/run-metrics.js.map +1 -1
- package/dist/esm/run/run-models.js +28 -23
- package/dist/esm/run/run-models.js.map +1 -1
- package/dist/esm/run/run-output.js +3 -3
- package/dist/esm/run/run-output.js.map +1 -1
- package/dist/esm/run/run-settings.js +83 -34
- package/dist/esm/run/run-settings.js.map +1 -1
- package/dist/esm/run/run-stream.js +4 -4
- package/dist/esm/run/run-stream.js.map +1 -1
- package/dist/esm/run/runner.js +166 -127
- package/dist/esm/run/runner.js.map +1 -1
- package/dist/esm/run/slides-cli.js +43 -42
- package/dist/esm/run/slides-cli.js.map +1 -1
- package/dist/esm/run/slides-render.js +36 -36
- package/dist/esm/run/slides-render.js.map +1 -1
- package/dist/esm/run/stdin-temp-file.js +77 -0
- package/dist/esm/run/stdin-temp-file.js.map +1 -0
- package/dist/esm/run/stream-output.js +7 -7
- package/dist/esm/run/stream-output.js.map +1 -1
- package/dist/esm/run/streaming.js +16 -16
- package/dist/esm/run/streaming.js.map +1 -1
- package/dist/esm/run/summary-engine.js +57 -51
- package/dist/esm/run/summary-engine.js.map +1 -1
- package/dist/esm/run/summary-llm.js +3 -3
- package/dist/esm/run/summary-llm.js.map +1 -1
- package/dist/esm/run/terminal.js +4 -4
- package/dist/esm/run/terminal.js.map +1 -1
- package/dist/esm/run/tips.js +2 -2
- package/dist/esm/run/tips.js.map +1 -1
- package/dist/esm/run/transcriber-cli.js +49 -49
- package/dist/esm/run/transcriber-cli.js.map +1 -1
- package/dist/esm/run.js +1 -1
- package/dist/esm/run.js.map +1 -1
- package/dist/esm/shared/contracts.js +1 -1
- package/dist/esm/shared/contracts.js.map +1 -1
- package/dist/esm/shared/sse-events.js +16 -16
- package/dist/esm/shared/sse-events.js.map +1 -1
- package/dist/esm/shared/streaming-merge.js +3 -3
- package/dist/esm/shared/streaming-merge.js.map +1 -1
- package/dist/esm/slides/extract.js +258 -249
- package/dist/esm/slides/extract.js.map +1 -1
- package/dist/esm/slides/index.js +3 -3
- package/dist/esm/slides/index.js.map +1 -1
- package/dist/esm/slides/settings.js +14 -14
- package/dist/esm/slides/settings.js.map +1 -1
- package/dist/esm/slides/store.js +9 -9
- package/dist/esm/slides/store.js.map +1 -1
- package/dist/esm/tty/format.js +13 -13
- package/dist/esm/tty/format.js.map +1 -1
- package/dist/esm/tty/osc-progress.js +1 -1
- package/dist/esm/tty/osc-progress.js.map +1 -1
- package/dist/esm/tty/progress/fetch-html.js +14 -14
- package/dist/esm/tty/progress/fetch-html.js.map +1 -1
- package/dist/esm/tty/progress/transcript.js +70 -62
- package/dist/esm/tty/progress/transcript.js.map +1 -1
- package/dist/esm/tty/spinner.js +20 -9
- package/dist/esm/tty/spinner.js.map +1 -1
- package/dist/esm/tty/theme.js +92 -92
- package/dist/esm/tty/theme.js.map +1 -1
- package/dist/esm/tty/website-progress.js +32 -32
- package/dist/esm/tty/website-progress.js.map +1 -1
- package/dist/esm/version.js +29 -29
- package/dist/esm/version.js.map +1 -1
- package/dist/types/cache.d.ts +6 -6
- package/dist/types/config.d.ts +49 -7
- package/dist/types/content/asset.d.ts +8 -6
- package/dist/types/content/index.d.ts +1 -1
- package/dist/types/costs.d.ts +3 -3
- package/dist/types/daemon/agent.d.ts +1 -1
- package/dist/types/daemon/auto-mode.d.ts +3 -3
- package/dist/types/daemon/chat.d.ts +2 -2
- package/dist/types/daemon/cli-entrypoint.d.ts +2 -0
- package/dist/types/daemon/config.d.ts +2 -2
- package/dist/types/daemon/env-merge.d.ts +1 -1
- package/dist/types/daemon/env-snapshot.d.ts +1 -1
- package/dist/types/daemon/flow-context.d.ts +7 -7
- package/dist/types/daemon/launchd.d.ts +8 -0
- package/dist/types/daemon/models.d.ts +6 -2
- package/dist/types/daemon/process-registry.d.ts +5 -5
- package/dist/types/daemon/server.d.ts +2 -2
- package/dist/types/daemon/summarize-progress.d.ts +1 -1
- package/dist/types/daemon/summarize.d.ts +7 -7
- package/dist/types/firecrawl.d.ts +1 -1
- package/dist/types/flags.d.ts +11 -11
- package/dist/types/index.d.ts +4 -4
- package/dist/types/language.d.ts +1 -1
- package/dist/types/llm/attachments.d.ts +1 -1
- package/dist/types/llm/cli.d.ts +3 -3
- package/dist/types/llm/generate-text.d.ts +7 -7
- package/dist/types/llm/html-to-markdown.d.ts +3 -3
- package/dist/types/llm/model-id.d.ts +1 -1
- package/dist/types/llm/prompt.d.ts +2 -2
- package/dist/types/llm/providers/anthropic.d.ts +3 -3
- package/dist/types/llm/providers/google.d.ts +3 -3
- package/dist/types/llm/providers/models.d.ts +2 -2
- package/dist/types/llm/providers/openai.d.ts +4 -4
- package/dist/types/llm/providers/shared.d.ts +2 -2
- package/dist/types/llm/transcript-to-markdown.d.ts +4 -2
- package/dist/types/llm/usage.d.ts +1 -1
- package/dist/types/logging/daemon.d.ts +4 -4
- package/dist/types/markitdown.d.ts +1 -1
- package/dist/types/media-cache.d.ts +2 -2
- package/dist/types/model-auto.d.ts +14 -4
- package/dist/types/model-spec.d.ts +10 -10
- package/dist/types/pricing/litellm.d.ts +1 -1
- package/dist/types/processes.d.ts +1 -1
- package/dist/types/prompts/index.d.ts +1 -1
- package/dist/types/run/attachments.d.ts +7 -7
- package/dist/types/run/bird.d.ts +2 -2
- package/dist/types/run/cache-state.d.ts +2 -2
- package/dist/types/run/cli-fallback-state.d.ts +6 -0
- package/dist/types/run/constants.d.ts +1 -1
- package/dist/types/run/cookies/twitter.d.ts +1 -1
- package/dist/types/run/env.d.ts +1 -1
- package/dist/types/run/finish-line.d.ts +5 -5
- package/dist/types/run/flows/asset/extract.d.ts +4 -4
- package/dist/types/run/flows/asset/input.d.ts +9 -3
- package/dist/types/run/flows/asset/media.d.ts +1 -1
- package/dist/types/run/flows/asset/output.d.ts +5 -5
- package/dist/types/run/flows/asset/preprocess.d.ts +23 -17
- package/dist/types/run/flows/asset/summary.d.ts +19 -17
- package/dist/types/run/flows/url/extract.d.ts +1 -1
- package/dist/types/run/flows/url/flow.d.ts +1 -1
- package/dist/types/run/flows/url/markdown.d.ts +6 -6
- package/dist/types/run/flows/url/slides-output.d.ts +7 -7
- package/dist/types/run/flows/url/slides-text.d.ts +9 -9
- package/dist/types/run/flows/url/summary.d.ts +11 -11
- package/dist/types/run/flows/url/types.d.ts +26 -22
- package/dist/types/run/format.d.ts +3 -3
- package/dist/types/run/help.d.ts +1 -1
- package/dist/types/run/media-cache-state.d.ts +2 -2
- package/dist/types/run/model-attempts.d.ts +1 -1
- package/dist/types/run/run-config.d.ts +4 -4
- package/dist/types/run/run-context.d.ts +3 -1
- package/dist/types/run/run-env.d.ts +3 -1
- package/dist/types/run/run-input.d.ts +2 -2
- package/dist/types/run/run-metrics.d.ts +3 -3
- package/dist/types/run/run-models.d.ts +3 -2
- package/dist/types/run/run-output.d.ts +1 -1
- package/dist/types/run/run-settings.d.ts +15 -6
- package/dist/types/run/run-stream.d.ts +2 -2
- package/dist/types/run/runner.d.ts +3 -2
- package/dist/types/run/slides-render.d.ts +4 -4
- package/dist/types/run/stdin-temp-file.d.ts +9 -0
- package/dist/types/run/stream-output.d.ts +1 -1
- package/dist/types/run/streaming.d.ts +4 -4
- package/dist/types/run/summary-engine.d.ts +11 -11
- package/dist/types/run/summary-llm.d.ts +5 -5
- package/dist/types/run/types.d.ts +4 -4
- package/dist/types/run.d.ts +1 -1
- package/dist/types/shared/contracts.d.ts +2 -2
- package/dist/types/shared/sse-events.d.ts +9 -9
- package/dist/types/slides/extract.d.ts +5 -4
- package/dist/types/slides/index.d.ts +5 -5
- package/dist/types/slides/store.d.ts +2 -2
- package/dist/types/slides/types.d.ts +2 -2
- package/dist/types/tty/osc-progress.d.ts +5 -5
- package/dist/types/tty/progress/fetch-html.d.ts +3 -3
- package/dist/types/tty/progress/transcript.d.ts +3 -3
- package/dist/types/tty/spinner.d.ts +2 -2
- package/dist/types/tty/theme.d.ts +2 -2
- package/dist/types/tty/website-progress.d.ts +3 -3
- package/dist/types/version.d.ts +1 -1
- package/docs/agent.md +38 -4
- package/docs/assets/site.js +46 -46
- package/docs/chrome-extension.md +11 -5
- package/docs/cli.md +59 -13
- package/docs/config.md +59 -10
- package/docs/extract-only.md +2 -0
- package/docs/index.html +33 -14
- package/docs/llm.md +7 -4
- package/docs/media.md +5 -4
- package/docs/model-auto.md +3 -2
- package/docs/nvidia-onnx-transcription.md +3 -3
- package/docs/openai.md +1 -1
- package/docs/releasing.md +3 -0
- package/docs/site/404.html +4 -1
- package/docs/site/assets/site.js +46 -46
- package/docs/site/docs/chrome-extension.html +18 -6
- package/docs/site/docs/config.html +29 -8
- package/docs/site/docs/extract-only.html +16 -4
- package/docs/site/docs/firecrawl.html +12 -3
- package/docs/site/docs/index.html +35 -6
- package/docs/site/docs/llm.html +19 -5
- package/docs/site/docs/openai.html +18 -5
- package/docs/site/docs/website.html +29 -9
- package/docs/site/docs/youtube.html +12 -3
- package/docs/site/index.html +33 -14
- package/docs/slides.md +13 -5
- package/docs/smoketest.md +29 -20
- package/docs/timestamps.md +21 -0
- package/docs/website.md +2 -1
- package/docs/youtube.md +4 -0
- package/package.json +36 -35
package/dist/esm/tty/format.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export function formatElapsedMs(ms) {
|
|
2
2
|
if (!Number.isFinite(ms) || ms < 0)
|
|
3
|
-
return
|
|
3
|
+
return "unknown";
|
|
4
4
|
const totalSeconds = Math.max(0, Math.floor(ms / 1000));
|
|
5
5
|
if (totalSeconds < 10)
|
|
6
6
|
return `${(ms / 1000).toFixed(1)}s`;
|
|
@@ -15,15 +15,15 @@ export function formatElapsedMs(ms) {
|
|
|
15
15
|
if (minutes > 0 || hours > 0)
|
|
16
16
|
parts.push(`${minutes}m`);
|
|
17
17
|
parts.push(`${seconds}s`);
|
|
18
|
-
return parts.join(
|
|
18
|
+
return parts.join(" ");
|
|
19
19
|
}
|
|
20
20
|
export function formatBytes(bytes) {
|
|
21
21
|
if (!Number.isFinite(bytes) || bytes < 0)
|
|
22
|
-
return
|
|
22
|
+
return "unknown";
|
|
23
23
|
const rounded = Math.floor(bytes);
|
|
24
24
|
if (rounded < 1024)
|
|
25
25
|
return `${rounded} B`;
|
|
26
|
-
const units = [
|
|
26
|
+
const units = ["KB", "MB", "GB", "TB"];
|
|
27
27
|
let value = rounded / 1024;
|
|
28
28
|
let unitIndex = 0;
|
|
29
29
|
while (value >= 1024 && unitIndex < units.length - 1) {
|
|
@@ -34,39 +34,39 @@ export function formatBytes(bytes) {
|
|
|
34
34
|
}
|
|
35
35
|
export function formatBytesPerSecond(bytesPerSecond) {
|
|
36
36
|
if (!Number.isFinite(bytesPerSecond) || bytesPerSecond < 0)
|
|
37
|
-
return
|
|
37
|
+
return "unknown";
|
|
38
38
|
return `${formatBytes(Math.round(bytesPerSecond))}/s`;
|
|
39
39
|
}
|
|
40
40
|
export function formatCompactCount(value) {
|
|
41
41
|
if (!Number.isFinite(value))
|
|
42
|
-
return
|
|
42
|
+
return "unknown";
|
|
43
43
|
const abs = Math.abs(value);
|
|
44
44
|
const format = (n, suffix) => {
|
|
45
45
|
const decimals = n >= 10 ? 0 : 1;
|
|
46
46
|
return `${n.toFixed(decimals)}${suffix}`;
|
|
47
47
|
};
|
|
48
48
|
if (abs >= 1_000_000_000)
|
|
49
|
-
return format(value / 1_000_000_000,
|
|
49
|
+
return format(value / 1_000_000_000, "B");
|
|
50
50
|
if (abs >= 1_000_000)
|
|
51
|
-
return format(value / 1_000_000,
|
|
51
|
+
return format(value / 1_000_000, "M");
|
|
52
52
|
if (abs >= 10_000)
|
|
53
|
-
return format(value / 1_000,
|
|
53
|
+
return format(value / 1_000, "k");
|
|
54
54
|
if (abs >= 1_000)
|
|
55
55
|
return `${(value / 1_000).toFixed(1)}k`;
|
|
56
56
|
return String(Math.floor(value));
|
|
57
57
|
}
|
|
58
58
|
export function formatMinutesSmart(valueMinutes) {
|
|
59
59
|
if (!Number.isFinite(valueMinutes))
|
|
60
|
-
return
|
|
60
|
+
return "unknown";
|
|
61
61
|
const minutes = Math.max(0, valueMinutes);
|
|
62
62
|
const decimals = minutes >= 10 ? 0 : 1;
|
|
63
63
|
const formatted = minutes.toFixed(decimals);
|
|
64
|
-
const trimmed = formatted.endsWith(
|
|
64
|
+
const trimmed = formatted.endsWith(".0") ? formatted.slice(0, -2) : formatted;
|
|
65
65
|
return `${trimmed} min`;
|
|
66
66
|
}
|
|
67
67
|
export function formatDurationSecondsSmart(value) {
|
|
68
68
|
if (!Number.isFinite(value))
|
|
69
|
-
return
|
|
69
|
+
return "unknown";
|
|
70
70
|
const totalSeconds = Math.max(0, Math.round(value));
|
|
71
71
|
const hours = Math.floor(totalSeconds / 3600);
|
|
72
72
|
const minutes = Math.floor((totalSeconds % 3600) / 60);
|
|
@@ -78,6 +78,6 @@ export function formatDurationSecondsSmart(value) {
|
|
|
78
78
|
parts.push(`${minutes}m`);
|
|
79
79
|
if (seconds > 0 || parts.length === 0)
|
|
80
80
|
parts.push(`${seconds}s`);
|
|
81
|
-
return parts.join(
|
|
81
|
+
return parts.join(" ");
|
|
82
82
|
}
|
|
83
83
|
//# sourceMappingURL=format.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../../src/tty/format.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,eAAe,CAAC,EAAU;IACxC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC;QAAE,OAAO,SAAS,
|
|
1
|
+
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../../src/tty/format.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { createOscProgressController as createOscProgressControllerImpl, startOscProgress as startOscProgressImpl, supportsOscProgress as supportsOscProgressImpl, } from
|
|
1
|
+
import { createOscProgressController as createOscProgressControllerImpl, startOscProgress as startOscProgressImpl, supportsOscProgress as supportsOscProgressImpl, } from "osc-progress";
|
|
2
2
|
export function createOscProgressController(options) {
|
|
3
3
|
const controller = createOscProgressControllerImpl(options);
|
|
4
4
|
const holdMs = 2000;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"osc-progress.js","sourceRoot":"","sources":["../../../src/tty/osc-progress.ts"],"names":[],"mappings":"AACA,OAAO,EACL,2BAA2B,IAAI,+BAA+B,EAC9D,gBAAgB,IAAI,oBAAoB,EACxC,mBAAmB,IAAI,uBAAuB,GAC/C,MAAM,cAAc,
|
|
1
|
+
{"version":3,"file":"osc-progress.js","sourceRoot":"","sources":["../../../src/tty/osc-progress.ts"],"names":[],"mappings":"AACA,OAAO,EACL,2BAA2B,IAAI,+BAA+B,EAC9D,gBAAgB,IAAI,oBAAoB,EACxC,mBAAmB,IAAI,uBAAuB,GAC/C,MAAM,cAAc,CAAC;AAStB,MAAM,UAAU,2BAA2B,CACzC,OAAkD;IAElD,MAAM,UAAU,GAAG,+BAA+B,CAAC,OAAO,CAAC,CAAC;IAC5D,MAAM,MAAM,GAAG,IAAI,CAAC;IACpB,IAAI,aAAa,GAAG,CAAC,CAAC;IAEtB,OAAO;QACL,gBAAgB,EAAE,CAAC,KAAa,EAAE,EAAE;YAClC,IAAI,aAAa,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,aAAa,GAAG,MAAM,EAAE,CAAC;gBAC7D,OAAO;YACT,CAAC;YACD,UAAU,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACrC,CAAC;QACD,UAAU,EAAE,CAAC,KAAa,EAAE,OAAe,EAAE,EAAE;YAC7C,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC3B,UAAU,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACxC,CAAC;QACD,KAAK,EAAE,GAAG,EAAE;YACV,aAAa,GAAG,CAAC,CAAC;YAClB,UAAU,CAAC,KAAK,EAAE,CAAC;QACrB,CAAC;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,OAAkD;IACjF,OAAO,oBAAoB,CAAC,OAAO,CAAC,CAAC;AACvC,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,GAAuC,EACvC,KAAc,EACd,OAA0D;IAE1D,OAAO,uBAAuB,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;AACtD,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { formatBytes, formatBytesPerSecond, formatElapsedMs } from
|
|
1
|
+
import { formatBytes, formatBytesPerSecond, formatElapsedMs } from "../format.js";
|
|
2
2
|
export function createFetchHtmlProgressRenderer({ spinner, oscProgress, theme, }) {
|
|
3
3
|
const state = {
|
|
4
4
|
downloadedBytes: 0,
|
|
@@ -18,21 +18,21 @@ export function createFetchHtmlProgressRenderer({ spinner, oscProgress, theme, }
|
|
|
18
18
|
spinner.setText(text);
|
|
19
19
|
};
|
|
20
20
|
const render = () => {
|
|
21
|
-
const label =
|
|
21
|
+
const label = "Fetching website";
|
|
22
22
|
const downloaded = formatBytes(state.downloadedBytes);
|
|
23
|
-
const total = typeof state.totalBytes ===
|
|
23
|
+
const total = typeof state.totalBytes === "number" &&
|
|
24
24
|
state.totalBytes > 0 &&
|
|
25
25
|
state.downloadedBytes <= state.totalBytes
|
|
26
26
|
? `/${formatBytes(state.totalBytes)}`
|
|
27
|
-
:
|
|
28
|
-
const elapsedMs = typeof state.startedAtMs ===
|
|
27
|
+
: "";
|
|
28
|
+
const elapsedMs = typeof state.startedAtMs === "number" ? Date.now() - state.startedAtMs : 0;
|
|
29
29
|
const elapsed = formatElapsedMs(elapsedMs);
|
|
30
30
|
if (state.downloadedBytes === 0 && !state.totalBytes) {
|
|
31
31
|
return renderLine(label, ` (connecting, ${elapsed})…`);
|
|
32
32
|
}
|
|
33
33
|
const rate = elapsedMs > 0 && state.downloadedBytes > 0
|
|
34
34
|
? `, ${formatBytesPerSecond(state.downloadedBytes / (elapsedMs / 1000))}`
|
|
35
|
-
:
|
|
35
|
+
: "";
|
|
36
36
|
return renderLine(label, ` (${downloaded}${total}, ${elapsed}${rate})…`);
|
|
37
37
|
};
|
|
38
38
|
const startTicker = () => {
|
|
@@ -54,28 +54,28 @@ export function createFetchHtmlProgressRenderer({ spinner, oscProgress, theme, }
|
|
|
54
54
|
return {
|
|
55
55
|
stop: stopTicker,
|
|
56
56
|
onProgress: (event) => {
|
|
57
|
-
if (event.kind ===
|
|
57
|
+
if (event.kind === "fetch-html-start") {
|
|
58
58
|
state.downloadedBytes = 0;
|
|
59
59
|
state.totalBytes = null;
|
|
60
60
|
state.startedAtMs = Date.now();
|
|
61
61
|
startTicker();
|
|
62
|
-
updateSpinner(renderLine(
|
|
63
|
-
oscProgress?.setIndeterminate(
|
|
62
|
+
updateSpinner(renderLine("Fetching website", " (connecting)…"));
|
|
63
|
+
oscProgress?.setIndeterminate("Fetching website");
|
|
64
64
|
return;
|
|
65
65
|
}
|
|
66
|
-
if (event.kind ===
|
|
66
|
+
if (event.kind === "fetch-html-progress") {
|
|
67
67
|
state.downloadedBytes = event.downloadedBytes;
|
|
68
68
|
state.totalBytes = event.totalBytes;
|
|
69
69
|
updateSpinner(render());
|
|
70
|
-
if (typeof state.totalBytes ===
|
|
71
|
-
oscProgress?.setPercent(
|
|
70
|
+
if (typeof state.totalBytes === "number" && state.totalBytes > 0) {
|
|
71
|
+
oscProgress?.setPercent("Fetching website", (state.downloadedBytes / state.totalBytes) * 100);
|
|
72
72
|
}
|
|
73
73
|
else {
|
|
74
|
-
oscProgress?.setIndeterminate(
|
|
74
|
+
oscProgress?.setIndeterminate("Fetching website");
|
|
75
75
|
}
|
|
76
76
|
return;
|
|
77
77
|
}
|
|
78
|
-
if (event.kind ===
|
|
78
|
+
if (event.kind === "fetch-html-done") {
|
|
79
79
|
state.downloadedBytes = event.downloadedBytes;
|
|
80
80
|
state.totalBytes = event.totalBytes;
|
|
81
81
|
freeze();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-html.js","sourceRoot":"","sources":["../../../../src/tty/progress/fetch-html.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fetch-html.js","sourceRoot":"","sources":["../../../../src/tty/progress/fetch-html.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import { formatBytes, formatBytesPerSecond, formatDurationSecondsSmart, formatElapsedMs, } from
|
|
1
|
+
import { formatBytes, formatBytesPerSecond, formatDurationSecondsSmart, formatElapsedMs, } from "../format.js";
|
|
2
2
|
export function createTranscriptProgressRenderer({ spinner, oscProgress, theme, }) {
|
|
3
3
|
const state = {
|
|
4
|
-
phase:
|
|
5
|
-
service:
|
|
4
|
+
phase: "idle",
|
|
5
|
+
service: "generic",
|
|
6
6
|
downloadedBytes: 0,
|
|
7
7
|
totalBytes: null,
|
|
8
8
|
startedAtMs: null,
|
|
9
|
-
whisperProviderHint:
|
|
10
|
-
mediaKind:
|
|
9
|
+
whisperProviderHint: "unknown",
|
|
10
|
+
mediaKind: "audio",
|
|
11
11
|
whisperModelId: null,
|
|
12
12
|
whisperProcessedSeconds: null,
|
|
13
13
|
whisperTotalSeconds: null,
|
|
@@ -28,12 +28,12 @@ export function createTranscriptProgressRenderer({ spinner, oscProgress, theme,
|
|
|
28
28
|
const styleDim = (text) => (theme ? theme.dim(text) : text);
|
|
29
29
|
const renderLine = (label, detail, percentLabel) => {
|
|
30
30
|
if (!theme) {
|
|
31
|
-
return `${label}${percentLabel ? ` ${percentLabel}` :
|
|
31
|
+
return `${label}${percentLabel ? ` ${percentLabel}` : ""}${detail}`;
|
|
32
32
|
}
|
|
33
|
-
const percent = percentLabel ? ` ${styleValue(percentLabel)}` :
|
|
33
|
+
const percent = percentLabel ? ` ${styleValue(percentLabel)}` : "";
|
|
34
34
|
return `${styleLabel(label)}${percent}${styleDim(detail)}`;
|
|
35
35
|
};
|
|
36
|
-
const renderSimple = (label) => theme ? `${styleLabel(label)}${styleDim(
|
|
36
|
+
const renderSimple = (label) => theme ? `${styleLabel(label)}${styleDim("…")}` : `${label}…`;
|
|
37
37
|
const updateOscIndeterminate = (label) => {
|
|
38
38
|
if (!oscProgress)
|
|
39
39
|
return;
|
|
@@ -59,7 +59,7 @@ export function createTranscriptProgressRenderer({ spinner, oscProgress, theme,
|
|
|
59
59
|
}, 1000);
|
|
60
60
|
};
|
|
61
61
|
const resolveDownloadPercent = () => {
|
|
62
|
-
if (typeof state.totalBytes !==
|
|
62
|
+
if (typeof state.totalBytes !== "number" || state.totalBytes <= 0)
|
|
63
63
|
return null;
|
|
64
64
|
if (state.downloadedBytes <= 0)
|
|
65
65
|
return 0;
|
|
@@ -67,93 +67,101 @@ export function createTranscriptProgressRenderer({ spinner, oscProgress, theme,
|
|
|
67
67
|
};
|
|
68
68
|
const updateOscForDownload = () => {
|
|
69
69
|
const percent = resolveDownloadPercent();
|
|
70
|
-
if (typeof percent ===
|
|
70
|
+
if (typeof percent === "number") {
|
|
71
71
|
updateOscPercent(downloadTitle(), percent);
|
|
72
72
|
return;
|
|
73
73
|
}
|
|
74
74
|
updateOscIndeterminate(downloadTitle());
|
|
75
75
|
};
|
|
76
76
|
const resolveWhisperPercent = () => {
|
|
77
|
-
if (typeof state.whisperTotalSeconds ===
|
|
78
|
-
const processed = typeof state.whisperProcessedSeconds ===
|
|
77
|
+
if (typeof state.whisperTotalSeconds === "number" && state.whisperTotalSeconds > 0) {
|
|
78
|
+
const processed = typeof state.whisperProcessedSeconds === "number" ? state.whisperProcessedSeconds : 0;
|
|
79
79
|
return (processed / state.whisperTotalSeconds) * 100;
|
|
80
80
|
}
|
|
81
|
-
if (typeof state.whisperParts ===
|
|
82
|
-
const index = typeof state.whisperPartIndex ===
|
|
81
|
+
if (typeof state.whisperParts === "number" && state.whisperParts > 0) {
|
|
82
|
+
const index = typeof state.whisperPartIndex === "number" ? state.whisperPartIndex : 0;
|
|
83
83
|
return (index / state.whisperParts) * 100;
|
|
84
84
|
}
|
|
85
85
|
return null;
|
|
86
86
|
};
|
|
87
87
|
const updateOscForWhisper = () => {
|
|
88
88
|
const percent = resolveWhisperPercent();
|
|
89
|
-
if (typeof percent ===
|
|
90
|
-
updateOscPercent(
|
|
89
|
+
if (typeof percent === "number") {
|
|
90
|
+
updateOscPercent("Transcribing", percent);
|
|
91
91
|
return;
|
|
92
92
|
}
|
|
93
|
-
updateOscIndeterminate(
|
|
93
|
+
updateOscIndeterminate("Transcribing");
|
|
94
94
|
};
|
|
95
95
|
const renderDownloadLine = () => {
|
|
96
96
|
const downloaded = formatBytes(state.downloadedBytes);
|
|
97
|
-
const total = typeof state.totalBytes ===
|
|
97
|
+
const total = typeof state.totalBytes === "number" &&
|
|
98
98
|
state.totalBytes > 0 &&
|
|
99
99
|
state.downloadedBytes <= state.totalBytes
|
|
100
100
|
? `/${formatBytes(state.totalBytes)}`
|
|
101
|
-
:
|
|
102
|
-
const elapsedMs = typeof state.startedAtMs ===
|
|
101
|
+
: "";
|
|
102
|
+
const elapsedMs = typeof state.startedAtMs === "number" ? Date.now() - state.startedAtMs : 0;
|
|
103
103
|
const elapsed = formatElapsedMs(elapsedMs);
|
|
104
104
|
const rate = elapsedMs > 0 && state.downloadedBytes > 0
|
|
105
105
|
? `, ${formatBytesPerSecond(state.downloadedBytes / (elapsedMs / 1000))}`
|
|
106
|
-
:
|
|
107
|
-
const kindLabel = state.mediaKind ===
|
|
108
|
-
const svcLabel = state.service ===
|
|
109
|
-
return renderLine(`Downloading ${kindLabel}`, ` (${svcLabel ? `${svcLabel}, ` :
|
|
106
|
+
: "";
|
|
107
|
+
const kindLabel = state.mediaKind === "video" ? "video" : "audio";
|
|
108
|
+
const svcLabel = state.service === "podcast" ? "podcast" : state.service === "youtube" ? "youtube" : "";
|
|
109
|
+
return renderLine(`Downloading ${kindLabel}`, ` (${svcLabel ? `${svcLabel}, ` : ""}${downloaded}${total}, ${elapsed}${rate})…`);
|
|
110
110
|
};
|
|
111
|
-
const downloadTitle = () => state.mediaKind ===
|
|
111
|
+
const downloadTitle = () => state.mediaKind === "video" ? "Downloading video" : "Downloading audio";
|
|
112
112
|
const formatProvider = (hint) => {
|
|
113
|
-
if (hint ===
|
|
114
|
-
return
|
|
115
|
-
if (hint ===
|
|
116
|
-
return
|
|
117
|
-
if (hint ===
|
|
118
|
-
return
|
|
119
|
-
if (hint ===
|
|
120
|
-
return
|
|
121
|
-
if (hint ===
|
|
122
|
-
return
|
|
123
|
-
|
|
113
|
+
if (hint === "cpp")
|
|
114
|
+
return "Whisper.cpp";
|
|
115
|
+
if (hint === "onnx")
|
|
116
|
+
return "ONNX (Parakeet/Canary)";
|
|
117
|
+
if (hint === "groq")
|
|
118
|
+
return "Whisper/Groq";
|
|
119
|
+
if (hint === "groq->openai")
|
|
120
|
+
return "Whisper/Groq→OpenAI";
|
|
121
|
+
if (hint === "groq->fal")
|
|
122
|
+
return "Whisper/Groq→FAL";
|
|
123
|
+
if (hint === "groq->openai->fal")
|
|
124
|
+
return "Whisper/Groq→OpenAI→FAL";
|
|
125
|
+
if (hint === "openai")
|
|
126
|
+
return "Whisper/OpenAI";
|
|
127
|
+
if (hint === "fal")
|
|
128
|
+
return "Whisper/FAL";
|
|
129
|
+
if (hint === "openai->fal")
|
|
130
|
+
return "Whisper/OpenAI→FAL";
|
|
131
|
+
return "Whisper";
|
|
124
132
|
};
|
|
125
133
|
const renderWhisperLine = () => {
|
|
126
134
|
const provider = formatProvider(state.whisperProviderHint);
|
|
127
135
|
const providerLabel = state.whisperModelId ? `${provider}, ${state.whisperModelId}` : provider;
|
|
128
|
-
const svc = state.service ===
|
|
129
|
-
const elapsedMs = typeof state.startedAtMs ===
|
|
136
|
+
const svc = state.service === "podcast" ? "podcast" : state.service === "youtube" ? "youtube" : "media";
|
|
137
|
+
const elapsedMs = typeof state.startedAtMs === "number" ? Date.now() - state.startedAtMs : 0;
|
|
130
138
|
const elapsed = formatElapsedMs(elapsedMs);
|
|
131
|
-
const percent = typeof state.whisperProcessedSeconds ===
|
|
132
|
-
typeof state.whisperTotalSeconds ===
|
|
139
|
+
const percent = typeof state.whisperProcessedSeconds === "number" &&
|
|
140
|
+
typeof state.whisperTotalSeconds === "number" &&
|
|
133
141
|
state.whisperTotalSeconds > 0
|
|
134
142
|
? Math.min(100, Math.max(0, Math.round((state.whisperProcessedSeconds / state.whisperTotalSeconds) * 100)))
|
|
135
143
|
: null;
|
|
136
|
-
const duration = typeof state.whisperProcessedSeconds ===
|
|
137
|
-
typeof state.whisperTotalSeconds ===
|
|
144
|
+
const duration = typeof state.whisperProcessedSeconds === "number" &&
|
|
145
|
+
typeof state.whisperTotalSeconds === "number" &&
|
|
138
146
|
state.whisperTotalSeconds > 0
|
|
139
147
|
? `, ${formatDurationSecondsSmart(state.whisperProcessedSeconds)}/${formatDurationSecondsSmart(state.whisperTotalSeconds)}`
|
|
140
|
-
: typeof state.whisperTotalSeconds ===
|
|
148
|
+
: typeof state.whisperTotalSeconds === "number" && state.whisperTotalSeconds > 0
|
|
141
149
|
? `, ${formatDurationSecondsSmart(state.whisperTotalSeconds)}`
|
|
142
|
-
:
|
|
143
|
-
const parts = typeof state.whisperPartIndex ===
|
|
144
|
-
typeof state.whisperParts ===
|
|
150
|
+
: "";
|
|
151
|
+
const parts = typeof state.whisperPartIndex === "number" &&
|
|
152
|
+
typeof state.whisperParts === "number" &&
|
|
145
153
|
state.whisperPartIndex > 0 &&
|
|
146
154
|
state.whisperParts > 0
|
|
147
155
|
? `, ${state.whisperPartIndex}/${state.whisperParts}`
|
|
148
|
-
:
|
|
149
|
-
const percentLabel = typeof percent ===
|
|
150
|
-
return renderLine(
|
|
156
|
+
: "";
|
|
157
|
+
const percentLabel = typeof percent === "number" ? `${percent}%` : null;
|
|
158
|
+
return renderLine("Transcribing", ` (${svc}, ${providerLabel}${duration}${parts}, ${elapsed})…`, percentLabel ?? undefined);
|
|
151
159
|
};
|
|
152
160
|
return {
|
|
153
161
|
stop: stopTicker,
|
|
154
162
|
onProgress: (event) => {
|
|
155
|
-
if (event.kind ===
|
|
156
|
-
state.phase =
|
|
163
|
+
if (event.kind === "transcript-media-download-start") {
|
|
164
|
+
state.phase = "download";
|
|
157
165
|
state.service = event.service;
|
|
158
166
|
state.mediaKind = event.mediaKind ?? state.mediaKind;
|
|
159
167
|
state.downloadedBytes = 0;
|
|
@@ -165,8 +173,8 @@ export function createTranscriptProgressRenderer({ spinner, oscProgress, theme,
|
|
|
165
173
|
updateOscForDownload();
|
|
166
174
|
return;
|
|
167
175
|
}
|
|
168
|
-
if (event.kind ===
|
|
169
|
-
state.phase =
|
|
176
|
+
if (event.kind === "transcript-media-download-progress") {
|
|
177
|
+
state.phase = "download";
|
|
170
178
|
state.service = event.service;
|
|
171
179
|
state.mediaKind = event.mediaKind ?? state.mediaKind;
|
|
172
180
|
state.downloadedBytes = event.downloadedBytes;
|
|
@@ -175,8 +183,8 @@ export function createTranscriptProgressRenderer({ spinner, oscProgress, theme,
|
|
|
175
183
|
updateOscForDownload();
|
|
176
184
|
return;
|
|
177
185
|
}
|
|
178
|
-
if (event.kind ===
|
|
179
|
-
state.phase =
|
|
186
|
+
if (event.kind === "transcript-media-download-done") {
|
|
187
|
+
state.phase = "download";
|
|
180
188
|
state.service = event.service;
|
|
181
189
|
state.mediaKind = event.mediaKind ?? state.mediaKind;
|
|
182
190
|
state.downloadedBytes = event.downloadedBytes;
|
|
@@ -186,8 +194,8 @@ export function createTranscriptProgressRenderer({ spinner, oscProgress, theme,
|
|
|
186
194
|
updateOscForDownload();
|
|
187
195
|
return;
|
|
188
196
|
}
|
|
189
|
-
if (event.kind ===
|
|
190
|
-
state.phase =
|
|
197
|
+
if (event.kind === "transcript-whisper-start") {
|
|
198
|
+
state.phase = "whisper";
|
|
191
199
|
state.service = event.service;
|
|
192
200
|
state.whisperProviderHint = event.providerHint;
|
|
193
201
|
state.whisperModelId = event.modelId;
|
|
@@ -202,8 +210,8 @@ export function createTranscriptProgressRenderer({ spinner, oscProgress, theme,
|
|
|
202
210
|
updateOscForWhisper();
|
|
203
211
|
return;
|
|
204
212
|
}
|
|
205
|
-
if (event.kind ===
|
|
206
|
-
state.phase =
|
|
213
|
+
if (event.kind === "transcript-whisper-progress") {
|
|
214
|
+
state.phase = "whisper";
|
|
207
215
|
state.service = event.service;
|
|
208
216
|
state.whisperProcessedSeconds = event.processedDurationSeconds;
|
|
209
217
|
state.whisperTotalSeconds = event.totalDurationSeconds;
|
|
@@ -213,14 +221,14 @@ export function createTranscriptProgressRenderer({ spinner, oscProgress, theme,
|
|
|
213
221
|
updateOscForWhisper();
|
|
214
222
|
return;
|
|
215
223
|
}
|
|
216
|
-
if (event.kind ===
|
|
224
|
+
if (event.kind === "transcript-done") {
|
|
217
225
|
stopTicker();
|
|
218
226
|
oscProgress?.clear();
|
|
219
227
|
if (event.ok) {
|
|
220
|
-
updateSpinner(renderSimple(
|
|
228
|
+
updateSpinner(renderSimple("Transcribed"), { force: true });
|
|
221
229
|
}
|
|
222
230
|
else {
|
|
223
|
-
updateSpinner(renderLine(
|
|
231
|
+
updateSpinner(renderLine("Transcript failed", "; fallback…"), { force: true });
|
|
224
232
|
}
|
|
225
233
|
}
|
|
226
234
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transcript.js","sourceRoot":"","sources":["../../../../src/tty/progress/transcript.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"transcript.js","sourceRoot":"","sources":["../../../../src/tty/progress/transcript.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/tty/spinner.js
CHANGED
|
@@ -1,4 +1,11 @@
|
|
|
1
|
-
import ora from
|
|
1
|
+
import ora from "ora";
|
|
2
|
+
function hasVisibleText(input) {
|
|
3
|
+
// Strip CSI and OSC escape sequences before checking for visible text.
|
|
4
|
+
const withoutAnsi = input
|
|
5
|
+
.replace(/\u001B\[[0-?]*[ -/]*[@-~]/g, "")
|
|
6
|
+
.replace(/\u001B\][^\u0007]*(?:\u0007|\u001B\\)/g, "");
|
|
7
|
+
return withoutAnsi.trim().length > 0;
|
|
8
|
+
}
|
|
2
9
|
export function startSpinner({ text, enabled, stream, color, }) {
|
|
3
10
|
if (!enabled) {
|
|
4
11
|
return {
|
|
@@ -13,11 +20,11 @@ export function startSpinner({ text, enabled, stream, color, }) {
|
|
|
13
20
|
let ended = false;
|
|
14
21
|
let paused = false;
|
|
15
22
|
const oraStream = stream;
|
|
16
|
-
if (typeof oraStream.cursorTo !==
|
|
23
|
+
if (typeof oraStream.cursorTo !== "function")
|
|
17
24
|
oraStream.cursorTo = () => { };
|
|
18
|
-
if (typeof oraStream.clearLine !==
|
|
25
|
+
if (typeof oraStream.clearLine !== "function")
|
|
19
26
|
oraStream.clearLine = () => { };
|
|
20
|
-
if (typeof oraStream.moveCursor !==
|
|
27
|
+
if (typeof oraStream.moveCursor !== "function")
|
|
21
28
|
oraStream.moveCursor = () => { };
|
|
22
29
|
const clear = () => {
|
|
23
30
|
if (ended)
|
|
@@ -25,7 +32,7 @@ export function startSpinner({ text, enabled, stream, color, }) {
|
|
|
25
32
|
// Keep output clean in scrollback.
|
|
26
33
|
// `ora` clears the line, but we also hard-clear as a fallback.
|
|
27
34
|
spinner.clear();
|
|
28
|
-
stream.write(
|
|
35
|
+
stream.write("\r\u001b[2K");
|
|
29
36
|
};
|
|
30
37
|
const pause = () => {
|
|
31
38
|
if (ended || paused)
|
|
@@ -34,7 +41,7 @@ export function startSpinner({ text, enabled, stream, color, }) {
|
|
|
34
41
|
if (spinner.isSpinning)
|
|
35
42
|
spinner.stop();
|
|
36
43
|
spinner.clear();
|
|
37
|
-
stream.write(
|
|
44
|
+
stream.write("\r\u001b[2K");
|
|
38
45
|
};
|
|
39
46
|
const resume = () => {
|
|
40
47
|
if (ended || !paused)
|
|
@@ -57,11 +64,15 @@ export function startSpinner({ text, enabled, stream, color, }) {
|
|
|
57
64
|
if (spinner.isSpinning)
|
|
58
65
|
spinner.stop();
|
|
59
66
|
spinner.clear();
|
|
60
|
-
stream.write(
|
|
67
|
+
stream.write("\r\u001b[2K");
|
|
61
68
|
};
|
|
62
69
|
const setText = (next) => {
|
|
63
70
|
if (ended)
|
|
64
71
|
return;
|
|
72
|
+
if (!hasVisibleText(next))
|
|
73
|
+
return;
|
|
74
|
+
if (spinner.text === next)
|
|
75
|
+
return;
|
|
65
76
|
spinner.text = next;
|
|
66
77
|
if (!paused)
|
|
67
78
|
spinner.render?.();
|
|
@@ -70,8 +81,8 @@ export function startSpinner({ text, enabled, stream, color, }) {
|
|
|
70
81
|
text,
|
|
71
82
|
stream: oraStream,
|
|
72
83
|
// Match Sweetistics CLI vibe; keep it clean.
|
|
73
|
-
spinner:
|
|
74
|
-
color: color ??
|
|
84
|
+
spinner: "dots12",
|
|
85
|
+
color: color ?? "cyan",
|
|
75
86
|
discardStdin: true,
|
|
76
87
|
}).start();
|
|
77
88
|
return { stop, clear, pause, resume, stopAndClear, setText };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spinner.js","sourceRoot":"","sources":["../../../src/tty/spinner.ts"],"names":[],"mappings":"AAAA,OAAO,GAAmC,MAAM,KAAK,
|
|
1
|
+
{"version":3,"file":"spinner.js","sourceRoot":"","sources":["../../../src/tty/spinner.ts"],"names":[],"mappings":"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"}
|