@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/run/help.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../../src/run/help.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../../src/run/help.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/run/logging.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { createThemeRenderer, resolveThemeNameFromSources, resolveTrueColor } from
|
|
2
|
-
import { VERBOSE_PREFIX } from
|
|
3
|
-
import { ansi } from
|
|
1
|
+
import { createThemeRenderer, resolveThemeNameFromSources, resolveTrueColor, } from "../tty/theme.js";
|
|
2
|
+
import { VERBOSE_PREFIX } from "./constants.js";
|
|
3
|
+
import { ansi } from "./terminal.js";
|
|
4
4
|
export function writeVerbose(stderr, verbose, message, color, env) {
|
|
5
5
|
if (!verbose) {
|
|
6
6
|
return;
|
|
@@ -12,23 +12,23 @@ export function writeVerbose(stderr, verbose, message, color, env) {
|
|
|
12
12
|
trueColor: resolveTrueColor(env),
|
|
13
13
|
})
|
|
14
14
|
: null;
|
|
15
|
-
const prefix = theme ? theme.accent(VERBOSE_PREFIX) : ansi(
|
|
15
|
+
const prefix = theme ? theme.accent(VERBOSE_PREFIX) : ansi("36", VERBOSE_PREFIX, color);
|
|
16
16
|
stderr.write(`${prefix} ${message}\n`);
|
|
17
17
|
}
|
|
18
18
|
export function createRetryLogger({ stderr, verbose, color, modelId, env, }) {
|
|
19
19
|
return (notice) => {
|
|
20
|
-
const message = typeof notice.error ===
|
|
20
|
+
const message = typeof notice.error === "string"
|
|
21
21
|
? notice.error
|
|
22
22
|
: notice.error instanceof Error
|
|
23
23
|
? notice.error.message
|
|
24
|
-
: typeof notice.error?.message ===
|
|
24
|
+
: typeof notice.error?.message === "string"
|
|
25
25
|
? String(notice.error.message)
|
|
26
|
-
:
|
|
26
|
+
: "";
|
|
27
27
|
const reason = /empty summary/i.test(message)
|
|
28
|
-
?
|
|
28
|
+
? "empty output"
|
|
29
29
|
: /timed out/i.test(message)
|
|
30
|
-
?
|
|
31
|
-
:
|
|
30
|
+
? "timeout"
|
|
31
|
+
: "error";
|
|
32
32
|
writeVerbose(stderr, verbose, `LLM ${reason} for ${modelId}; retry ${notice.attempt}/${notice.maxRetries} in ${notice.delayMs}ms.`, color, env);
|
|
33
33
|
};
|
|
34
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../../src/run/logging.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../../src/run/logging.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,2BAA2B,EAC3B,gBAAgB,GACjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAErC,MAAM,UAAU,YAAY,CAC1B,MAA6B,EAC7B,OAAgB,EAChB,OAAe,EACf,KAAc,EACd,GAAwC;IAExC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO;IACT,CAAC;IACD,MAAM,KAAK,GACT,GAAG,IAAI,KAAK;QACV,CAAC,CAAC,mBAAmB,CAAC;YAClB,SAAS,EAAE,2BAA2B,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,eAAe,EAAE,CAAC;YACpE,OAAO,EAAE,KAAK;YACd,SAAS,EAAE,gBAAgB,CAAC,GAAG,CAAC;SACjC,CAAC;QACJ,CAAC,CAAC,IAAI,CAAC;IACX,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC;IACxF,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,IAAI,OAAO,IAAI,CAAC,CAAC;AACzC,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,EAChC,MAAM,EACN,OAAO,EACP,KAAK,EACL,OAAO,EACP,GAAG,GAOJ;IACC,OAAO,CAAC,MAAiF,EAAE,EAAE;QAC3F,MAAM,OAAO,GACX,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ;YAC9B,CAAC,CAAC,MAAM,CAAC,KAAK;YACd,CAAC,CAAC,MAAM,CAAC,KAAK,YAAY,KAAK;gBAC7B,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO;gBACtB,CAAC,CAAC,OAAQ,MAAM,CAAC,KAAsC,EAAE,OAAO,KAAK,QAAQ;oBAC3E,CAAC,CAAC,MAAM,CAAE,MAAM,CAAC,KAA+B,CAAC,OAAO,CAAC;oBACzD,CAAC,CAAC,EAAE,CAAC;QACb,MAAM,MAAM,GAAG,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC;YAC3C,CAAC,CAAC,cAAc;YAChB,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC;gBAC1B,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,OAAO,CAAC;QACd,YAAY,CACV,MAAM,EACN,OAAO,EACP,OAAO,MAAM,QAAQ,OAAO,WAAW,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,UAAU,OAAO,MAAM,CAAC,OAAO,KAAK,EACpG,KAAK,EACL,GAAG,CACJ,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC"}
|
package/dist/esm/run/markdown.js
CHANGED
|
@@ -6,7 +6,7 @@ function materializeInlineMarkdownLinks(markdown) {
|
|
|
6
6
|
const out = [];
|
|
7
7
|
for (const line of lines) {
|
|
8
8
|
const trimmed = line.trimStart();
|
|
9
|
-
if (trimmed.startsWith(
|
|
9
|
+
if (trimmed.startsWith("```")) {
|
|
10
10
|
inFence = !inFence;
|
|
11
11
|
out.push(line);
|
|
12
12
|
continue;
|
|
@@ -16,15 +16,15 @@ function materializeInlineMarkdownLinks(markdown) {
|
|
|
16
16
|
continue;
|
|
17
17
|
}
|
|
18
18
|
out.push(line.replace(/(?<!!)\[([^\]]+)\]\((\S+?)\)/g, (_full, label, url) => {
|
|
19
|
-
const safeLabel = String(label ??
|
|
20
|
-
const safeUrl = String(url ??
|
|
19
|
+
const safeLabel = String(label ?? "").trim();
|
|
20
|
+
const safeUrl = String(url ?? "").trim();
|
|
21
21
|
if (!safeLabel || !safeUrl)
|
|
22
22
|
return _full;
|
|
23
23
|
// Keep the raw URL visible and terminal-linkable (avoid trailing ')' issues).
|
|
24
24
|
return `${safeLabel}: ${safeUrl}`;
|
|
25
25
|
}));
|
|
26
26
|
}
|
|
27
|
-
return out.join(
|
|
27
|
+
return out.join("\n");
|
|
28
28
|
}
|
|
29
29
|
function collapseExtraBlankLines(markdown) {
|
|
30
30
|
const lines = markdown.split(/\r?\n/);
|
|
@@ -33,7 +33,7 @@ function collapseExtraBlankLines(markdown) {
|
|
|
33
33
|
const out = [];
|
|
34
34
|
for (const line of lines) {
|
|
35
35
|
const trimmed = line.trimStart();
|
|
36
|
-
if (trimmed.startsWith(
|
|
36
|
+
if (trimmed.startsWith("```")) {
|
|
37
37
|
inFence = !inFence;
|
|
38
38
|
blankRun = 0;
|
|
39
39
|
out.push(line);
|
|
@@ -47,18 +47,18 @@ function collapseExtraBlankLines(markdown) {
|
|
|
47
47
|
if (line.trim().length === 0) {
|
|
48
48
|
blankRun += 1;
|
|
49
49
|
if (blankRun === 1)
|
|
50
|
-
out.push(
|
|
50
|
+
out.push("");
|
|
51
51
|
continue;
|
|
52
52
|
}
|
|
53
53
|
blankRun = 0;
|
|
54
54
|
out.push(line);
|
|
55
55
|
}
|
|
56
|
-
return out.join(
|
|
56
|
+
return out.join("\n");
|
|
57
57
|
}
|
|
58
58
|
export function prepareMarkdownLineForTerminal(line) {
|
|
59
59
|
return line.replace(/(?<!!)\[([^\]]+)\]\((\S+?)\)/g, (_full, label, url) => {
|
|
60
|
-
const safeLabel = String(label ??
|
|
61
|
-
const safeUrl = String(url ??
|
|
60
|
+
const safeLabel = String(label ?? "").trim();
|
|
61
|
+
const safeUrl = String(url ?? "").trim();
|
|
62
62
|
if (!safeLabel || !safeUrl)
|
|
63
63
|
return _full;
|
|
64
64
|
return `${safeLabel}: ${safeUrl}`;
|
|
@@ -86,8 +86,8 @@ function inlineReferenceStyleLinks(markdown) {
|
|
|
86
86
|
return markdown;
|
|
87
87
|
const used = new Set();
|
|
88
88
|
const inlined = markdown.replace(/\[([^\]]+)\]\[([^\]]*)\]/g, (full, rawLabel, rawRef) => {
|
|
89
|
-
const label = String(rawLabel ??
|
|
90
|
-
const ref = String(rawRef ??
|
|
89
|
+
const label = String(rawLabel ?? "").trim();
|
|
90
|
+
const ref = String(rawRef ?? "").trim();
|
|
91
91
|
const key = (ref || label).toLowerCase();
|
|
92
92
|
const url = definitions.get(key);
|
|
93
93
|
if (!url)
|
|
@@ -105,7 +105,7 @@ function inlineReferenceStyleLinks(markdown) {
|
|
|
105
105
|
return true;
|
|
106
106
|
return !used.has(match[1].trim().toLowerCase());
|
|
107
107
|
})
|
|
108
|
-
.join(
|
|
108
|
+
.join("\n");
|
|
109
109
|
return withoutDefinitions;
|
|
110
110
|
}
|
|
111
111
|
export function prepareMarkdownForTerminal(markdown) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"markdown.js","sourceRoot":"","sources":["../../../src/run/markdown.ts"],"names":[],"mappings":"AAAA,SAAS,8BAA8B,CAAC,QAAgB;IACtD,uGAAuG;IACvG,sEAAsE;IACtE,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"markdown.js","sourceRoot":"","sources":["../../../src/run/markdown.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { createMediaCache, DEFAULT_MEDIA_CACHE_MAX_MB, DEFAULT_MEDIA_CACHE_TTL_DAYS, DEFAULT_MEDIA_CACHE_VERIFY, resolveMediaCachePath, } from
|
|
1
|
+
import { createMediaCache, DEFAULT_MEDIA_CACHE_MAX_MB, DEFAULT_MEDIA_CACHE_TTL_DAYS, DEFAULT_MEDIA_CACHE_VERIFY, resolveMediaCachePath, } from "../media-cache.js";
|
|
2
2
|
export async function createMediaCacheFromConfig({ envForRun, config, noMediaCacheFlag = false, }) {
|
|
3
3
|
const mediaConfig = config?.cache?.media;
|
|
4
4
|
const enabled = mediaConfig?.enabled !== false;
|
|
@@ -6,17 +6,17 @@ export async function createMediaCacheFromConfig({ envForRun, config, noMediaCac
|
|
|
6
6
|
return null;
|
|
7
7
|
const cachePath = resolveMediaCachePath({
|
|
8
8
|
env: envForRun,
|
|
9
|
-
cachePath: typeof mediaConfig?.path ===
|
|
9
|
+
cachePath: typeof mediaConfig?.path === "string" ? mediaConfig.path : null,
|
|
10
10
|
});
|
|
11
11
|
if (!cachePath)
|
|
12
12
|
return null;
|
|
13
|
-
const maxMb = typeof mediaConfig?.maxMb ===
|
|
13
|
+
const maxMb = typeof mediaConfig?.maxMb === "number" && Number.isFinite(mediaConfig.maxMb)
|
|
14
14
|
? mediaConfig.maxMb
|
|
15
15
|
: DEFAULT_MEDIA_CACHE_MAX_MB;
|
|
16
|
-
const ttlDays = typeof mediaConfig?.ttlDays ===
|
|
16
|
+
const ttlDays = typeof mediaConfig?.ttlDays === "number" && Number.isFinite(mediaConfig.ttlDays)
|
|
17
17
|
? mediaConfig.ttlDays
|
|
18
18
|
: DEFAULT_MEDIA_CACHE_TTL_DAYS;
|
|
19
|
-
const verify = typeof mediaConfig?.verify ===
|
|
19
|
+
const verify = typeof mediaConfig?.verify === "string"
|
|
20
20
|
? mediaConfig.verify
|
|
21
21
|
: DEFAULT_MEDIA_CACHE_VERIFY;
|
|
22
22
|
const maxBytes = Math.max(0, maxMb) * 1024 * 1024;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-cache-state.js","sourceRoot":"","sources":["../../../src/run/media-cache-state.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,gBAAgB,EAChB,0BAA0B,EAC1B,4BAA4B,EAC5B,0BAA0B,EAE1B,qBAAqB,GACtB,MAAM,mBAAmB,
|
|
1
|
+
{"version":3,"file":"media-cache-state.js","sourceRoot":"","sources":["../../../src/run/media-cache-state.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,gBAAgB,EAChB,0BAA0B,EAC1B,4BAA4B,EAC5B,0BAA0B,EAE1B,qBAAqB,GACtB,MAAM,mBAAmB,CAAC;AAE3B,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAAC,EAC/C,SAAS,EACT,MAAM,EACN,gBAAgB,GAAG,KAAK,GAKzB;IACC,MAAM,WAAW,GAAG,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC;IACzC,MAAM,OAAO,GAAG,WAAW,EAAE,OAAO,KAAK,KAAK,CAAC;IAC/C,IAAI,CAAC,OAAO,IAAI,gBAAgB;QAAE,OAAO,IAAI,CAAC;IAE9C,MAAM,SAAS,GAAG,qBAAqB,CAAC;QACtC,GAAG,EAAE,SAAS;QACd,SAAS,EAAE,OAAO,WAAW,EAAE,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;KAC3E,CAAC,CAAC;IACH,IAAI,CAAC,SAAS;QAAE,OAAO,IAAI,CAAC;IAE5B,MAAM,KAAK,GACT,OAAO,WAAW,EAAE,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC;QAC1E,CAAC,CAAC,WAAW,CAAC,KAAK;QACnB,CAAC,CAAC,0BAA0B,CAAC;IACjC,MAAM,OAAO,GACX,OAAO,WAAW,EAAE,OAAO,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC;QAC9E,CAAC,CAAC,WAAW,CAAC,OAAO;QACrB,CAAC,CAAC,4BAA4B,CAAC;IACnC,MAAM,MAAM,GACV,OAAO,WAAW,EAAE,MAAM,KAAK,QAAQ;QACrC,CAAC,CAAE,WAAW,CAAC,MAA+B;QAC9C,CAAC,CAAC,0BAA0B,CAAC;IACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;IAClD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IACzD,IAAI,QAAQ,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IAE/B,OAAO,MAAM,gBAAgB,CAAC;QAC5B,IAAI,EAAE,SAAS;QACf,QAAQ;QACR,KAAK;QACL,MAAM;KACP,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-attempts.js","sourceRoot":"","sources":["../../../src/run/model-attempts.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAI,EACxC,QAAQ,EACR,eAAe,EACf,qBAAqB,EACrB,YAAY,EACZ,uBAAuB,EACvB,UAAU,EACV,aAAa,EACb,iBAAiB,EACjB,UAAU,GAWX;IAOC,IAAI,MAAM,GAAa,IAAI,
|
|
1
|
+
{"version":3,"file":"model-attempts.js","sourceRoot":"","sources":["../../../src/run/model-attempts.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAI,EACxC,QAAQ,EACR,eAAe,EACf,qBAAqB,EACrB,YAAY,EACZ,uBAAuB,EACvB,UAAU,EACV,aAAa,EACb,iBAAiB,EACjB,UAAU,GAWX;IAOC,IAAI,MAAM,GAAa,IAAI,CAAC;IAC5B,IAAI,WAAW,GAAwB,IAAI,CAAC;IAC5C,IAAI,SAAS,GAAY,IAAI,CAAC;IAC9B,IAAI,+BAA+B,GAAG,KAAK,CAAC;IAC5C,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAA2B,CAAC;IAE/D,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACjD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,IAAI,eAAe,EAAE,CAAC;gBACpB,qFAAqF;gBACrF,IAAI,qBAAqB,EAAE,CAAC;oBAC1B,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;gBAC/C,CAAC;qBAAM,CAAC;oBACN,UAAU,EAAE,CAAC,OAAO,CAAC,CAAC;gBACxB,CAAC;gBACD,SAAS;YACX,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC,CAAC;QACpD,CAAC;QAED,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,CAAC;YACnC,WAAW,GAAG,OAAO,CAAC;YACtB,MAAM;QACR,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,SAAS,GAAG,KAAK,CAAC;YAClB,IACE,qBAAqB;gBACrB,KAAK,YAAY,KAAK;gBACtB,4DAA4D,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAChF,CAAC;gBACD,+BAA+B,GAAG,IAAI,CAAC;YACzC,CAAC;YAED,IAAI,CAAC,eAAe,EAAE,CAAC;gBACrB,IAAI,iBAAiB,EAAE,CAAC;oBACtB,iBAAiB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;gBACpC,CAAC;gBACD,MAAM,KAAK,CAAC;YACd,CAAC;YACD,aAAa,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,mBAAmB,EAAE,SAAS,EAAE,+BAA+B,EAAE,CAAC;AAClG,CAAC"}
|
|
@@ -1,19 +1,19 @@
|
|
|
1
|
-
import { fetchWithTimeout } from
|
|
1
|
+
import { fetchWithTimeout } from "./fetch-with-timeout.js";
|
|
2
2
|
function truncateList(items, max) {
|
|
3
3
|
const normalized = items.map((item) => item.trim()).filter(Boolean);
|
|
4
4
|
if (normalized.length <= max)
|
|
5
|
-
return normalized.join(
|
|
6
|
-
return `${normalized.slice(0, max).join(
|
|
5
|
+
return normalized.join(", ");
|
|
6
|
+
return `${normalized.slice(0, max).join(", ")} (+${normalized.length - max} more)`;
|
|
7
7
|
}
|
|
8
8
|
function parseOpenRouterModelId(modelId) {
|
|
9
9
|
const normalized = modelId.trim();
|
|
10
|
-
if (!normalized.startsWith(
|
|
10
|
+
if (!normalized.startsWith("openrouter/"))
|
|
11
11
|
return null;
|
|
12
|
-
const rest = normalized.slice(
|
|
13
|
-
const [author, ...slugParts] = rest.split(
|
|
12
|
+
const rest = normalized.slice("openrouter/".length);
|
|
13
|
+
const [author, ...slugParts] = rest.split("/");
|
|
14
14
|
if (!author || slugParts.length === 0)
|
|
15
15
|
return null;
|
|
16
|
-
return { author, slug: slugParts.join(
|
|
16
|
+
return { author, slug: slugParts.join("/") };
|
|
17
17
|
}
|
|
18
18
|
async function resolveOpenRouterProvidersForModels({ modelIds, fetchImpl, timeoutMs, }) {
|
|
19
19
|
const results = new Map();
|
|
@@ -24,13 +24,13 @@ async function resolveOpenRouterProvidersForModels({ modelIds, fetchImpl, timeou
|
|
|
24
24
|
return;
|
|
25
25
|
const url = `https://openrouter.ai/api/v1/models/${encodeURIComponent(parsed.author)}/${encodeURIComponent(parsed.slug)}/endpoints`;
|
|
26
26
|
try {
|
|
27
|
-
const response = await fetchWithTimeout(fetchImpl, url, { headers: { Accept:
|
|
27
|
+
const response = await fetchWithTimeout(fetchImpl, url, { headers: { Accept: "application/json" } }, Math.min(timeoutMs, 15_000));
|
|
28
28
|
if (!response.ok)
|
|
29
29
|
return;
|
|
30
30
|
const payload = (await response.json());
|
|
31
31
|
const endpoints = Array.isArray(payload.data?.endpoints) ? payload.data?.endpoints : [];
|
|
32
32
|
const providers = endpoints
|
|
33
|
-
.map((endpoint) => endpoint && typeof endpoint.provider_name ===
|
|
33
|
+
.map((endpoint) => endpoint && typeof endpoint.provider_name === "string"
|
|
34
34
|
? endpoint.provider_name.trim()
|
|
35
35
|
: null)
|
|
36
36
|
.filter((value) => Boolean(value));
|
|
@@ -47,11 +47,11 @@ async function resolveOpenRouterProvidersForModels({ modelIds, fetchImpl, timeou
|
|
|
47
47
|
export async function buildOpenRouterNoAllowedProvidersMessage({ attempts, fetchImpl, timeoutMs, }) {
|
|
48
48
|
const modelIds = attempts
|
|
49
49
|
.map((attempt) => attempt.userModelId)
|
|
50
|
-
.filter((id) => id.startsWith(
|
|
50
|
+
.filter((id) => id.startsWith("openrouter/"));
|
|
51
51
|
const tried = truncateList(modelIds, 6);
|
|
52
52
|
const providerMap = await resolveOpenRouterProvidersForModels({ modelIds, fetchImpl, timeoutMs });
|
|
53
53
|
const allProviders = Array.from(new Set(Array.from(providerMap.values()).flat())).sort((a, b) => a.localeCompare(b));
|
|
54
|
-
const providersHint = allProviders.length > 0 ? ` Providers to allow: ${truncateList(allProviders, 10)}.` :
|
|
54
|
+
const providersHint = allProviders.length > 0 ? ` Providers to allow: ${truncateList(allProviders, 10)}.` : "";
|
|
55
55
|
return `OpenRouter could not route any models with this API key (no allowed providers). Tried: ${tried}.${providersHint} Hint: increase --timeout (e.g. 10m) and/or use --debug/--verbose to see per-model failures. (OpenRouter: Settings → API Keys → edit key → Allowed providers.)`;
|
|
56
56
|
}
|
|
57
57
|
//# sourceMappingURL=openrouter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openrouter.js","sourceRoot":"","sources":["../../../src/run/openrouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,
|
|
1
|
+
{"version":3,"file":"openrouter.js","sourceRoot":"","sources":["../../../src/run/openrouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D,SAAS,YAAY,CAAC,KAAe,EAAE,GAAW;IAChD,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACpE,IAAI,UAAU,CAAC,MAAM,IAAI,GAAG;QAAE,OAAO,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3D,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,UAAU,CAAC,MAAM,GAAG,GAAG,QAAQ,CAAC;AACrF,CAAC;AAED,SAAS,sBAAsB,CAAC,OAAe;IAC7C,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAClC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,aAAa,CAAC;QAAE,OAAO,IAAI,CAAC;IACvD,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IACpD,MAAM,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC/C,IAAI,CAAC,MAAM,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACnD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;AAC/C,CAAC;AAED,KAAK,UAAU,mCAAmC,CAAC,EACjD,QAAQ,EACR,SAAS,EACT,SAAS,GAKV;IACC,MAAM,OAAO,GAAG,IAAI,GAAG,EAAoB,CAAC;IAC5C,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAEpF,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QAC3B,MAAM,MAAM,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;QAC/C,IAAI,CAAC,MAAM;YAAE,OAAO;QACpB,MAAM,GAAG,GAAG,uCAAuC,kBAAkB,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC;QACpI,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CACrC,SAAS,EACT,GAAG,EACH,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,kBAAkB,EAAE,EAAE,EAC3C,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAC5B,CAAC;YACF,IAAI,CAAC,QAAQ,CAAC,EAAE;gBAAE,OAAO;YACzB,MAAM,OAAO,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAErC,CAAC;YACF,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;YACxF,MAAM,SAAS,GAAG,SAAS;iBACxB,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAChB,QAAQ,IAAI,OAAO,QAAQ,CAAC,aAAa,KAAK,QAAQ;gBACpD,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,EAAE;gBAC/B,CAAC,CAAC,IAAI,CACT;iBACA,MAAM,CAAC,CAAC,KAAK,EAAmB,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;YACtD,MAAM,eAAe,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1F,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC;gBAAE,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QACxE,CAAC;QAAC,MAAM,CAAC;YACP,mBAAmB;QACrB,CAAC;IACH,CAAC,CAAC,CACH,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wCAAwC,CAAC,EAC7D,QAAQ,EACR,SAAS,EACT,SAAS,GAKV;IACC,MAAM,QAAQ,GAAG,QAAQ;SACtB,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC;SACrC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC;IAChD,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IAExC,MAAM,WAAW,GAAG,MAAM,mCAAmC,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;IAClG,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAC9F,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CACnB,CAAC;IAEF,MAAM,aAAa,GACjB,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,wBAAwB,YAAY,CAAC,YAAY,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAE3F,OAAO,0FAA0F,KAAK,IAAI,aAAa,gKAAgK,CAAC;AAC1R,CAAC"}
|
package/dist/esm/run/progress.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"progress.js","sourceRoot":"","sources":["../../../src/run/progress.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,kBAAkB;IAChC,IAAI,OAAO,GAA4C,IAAI,
|
|
1
|
+
{"version":3,"file":"progress.js","sourceRoot":"","sources":["../../../src/run/progress.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,kBAAkB;IAChC,IAAI,OAAO,GAA4C,IAAI,CAAC;IAC5D,IAAI,SAAS,GAAwB,IAAI,CAAC;IAE1C,OAAO;QACL,4BAA4B,EAAE,CAAC,EAAE,EAAE,EAAE;YACnC,OAAO,GAAG,EAAE,CAAC;YACb,SAAS,GAAG,IAAI,CAAC;QACnB,CAAC;QACD,sBAAsB,EAAE,GAAG,EAAE;YAC3B,IAAI,CAAC,OAAO;gBAAE,OAAO;YACrB,MAAM,OAAO,GAAG,OAAO,EAAE,CAAC;YAC1B,IAAI,OAAO,OAAO,KAAK,UAAU,EAAE,CAAC;gBAClC,SAAS,GAAG,OAAO,CAAC;YACtB,CAAC;iBAAM,CAAC;gBACN,SAAS,GAAG,IAAI,CAAC;YACnB,CAAC;QACH,CAAC;QACD,0BAA0B,EAAE,GAAG,EAAE;YAC/B,IAAI,CAAC,SAAS;gBAAE,OAAO;YACvB,MAAM,OAAO,GAAG,SAAS,CAAC;YAC1B,SAAS,GAAG,IAAI,CAAC;YACjB,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,sBAAsB,EAAE,CAAC,EAAE,EAAE,EAAE;YAC7B,IAAI,OAAO,KAAK,EAAE,EAAE,CAAC;gBACnB,OAAO,GAAG,IAAI,CAAC;gBACf,SAAS,GAAG,IAAI,CAAC;YACnB,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -1,21 +1,21 @@
|
|
|
1
|
-
import { loadSummarizeConfig } from
|
|
2
|
-
import { parseVideoMode } from
|
|
3
|
-
import { parseOutputLanguage } from
|
|
4
|
-
import { parseBooleanEnv } from
|
|
1
|
+
import { loadSummarizeConfig } from "../config.js";
|
|
2
|
+
import { parseVideoMode } from "../flags.js";
|
|
3
|
+
import { parseOutputLanguage } from "../language.js";
|
|
4
|
+
import { parseBooleanEnv } from "./env.js";
|
|
5
5
|
export function resolveConfigState({ envForRun, programOpts, languageExplicitlySet, videoModeExplicitlySet, cliFlagPresent, cliProviderArg, }) {
|
|
6
6
|
const { config, path: configPath } = loadSummarizeConfig({ env: envForRun });
|
|
7
|
-
const cliLanguageRaw = typeof programOpts.language ===
|
|
7
|
+
const cliLanguageRaw = typeof programOpts.language === "string"
|
|
8
8
|
? programOpts.language
|
|
9
|
-
: typeof programOpts.lang ===
|
|
9
|
+
: typeof programOpts.lang === "string"
|
|
10
10
|
? programOpts.lang
|
|
11
11
|
: null;
|
|
12
|
-
const defaultLanguageRaw = (config?.output?.language ?? config?.language ??
|
|
13
|
-
const outputLanguage = parseOutputLanguage(languageExplicitlySet && typeof cliLanguageRaw ===
|
|
12
|
+
const defaultLanguageRaw = (config?.output?.language ?? config?.language ?? "auto");
|
|
13
|
+
const outputLanguage = parseOutputLanguage(languageExplicitlySet && typeof cliLanguageRaw === "string" && cliLanguageRaw.trim().length > 0
|
|
14
14
|
? cliLanguageRaw
|
|
15
15
|
: defaultLanguageRaw);
|
|
16
16
|
const openaiWhisperUsdPerMinute = (() => {
|
|
17
17
|
const value = config?.openai?.whisperUsdPerMinute;
|
|
18
|
-
return typeof value ===
|
|
18
|
+
return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : 0.006;
|
|
19
19
|
})();
|
|
20
20
|
const videoMode = parseVideoMode(videoModeExplicitlySet
|
|
21
21
|
? programOpts.videoMode
|
|
@@ -25,7 +25,7 @@ export function resolveConfigState({ envForRun, programOpts, languageExplicitlyS
|
|
|
25
25
|
return null;
|
|
26
26
|
if (Array.isArray(config?.cli?.enabled))
|
|
27
27
|
return config.cli.enabled;
|
|
28
|
-
return [
|
|
28
|
+
return ["claude", "gemini", "codex", "agent"];
|
|
29
29
|
})();
|
|
30
30
|
const cliConfigForRun = cliEnabledOverride
|
|
31
31
|
? { ...(config?.cli ?? {}), enabled: cliEnabledOverride }
|
|
@@ -34,24 +34,24 @@ export function resolveConfigState({ envForRun, programOpts, languageExplicitlyS
|
|
|
34
34
|
? { ...(config ?? {}), ...(cliConfigForRun ? { cli: cliConfigForRun } : {}) }
|
|
35
35
|
: config;
|
|
36
36
|
const openaiUseChatCompletions = (() => {
|
|
37
|
-
const envValue = parseBooleanEnv(typeof envForRun.OPENAI_USE_CHAT_COMPLETIONS ===
|
|
37
|
+
const envValue = parseBooleanEnv(typeof envForRun.OPENAI_USE_CHAT_COMPLETIONS === "string"
|
|
38
38
|
? envForRun.OPENAI_USE_CHAT_COMPLETIONS
|
|
39
39
|
: null);
|
|
40
40
|
if (envValue !== null)
|
|
41
41
|
return envValue;
|
|
42
42
|
const configValue = config?.openai?.useChatCompletions;
|
|
43
|
-
return typeof configValue ===
|
|
43
|
+
return typeof configValue === "boolean" ? configValue : false;
|
|
44
44
|
})();
|
|
45
45
|
const configModelLabel = (() => {
|
|
46
46
|
const model = config?.model;
|
|
47
47
|
if (!model)
|
|
48
48
|
return null;
|
|
49
|
-
if (
|
|
49
|
+
if ("id" in model)
|
|
50
50
|
return model.id;
|
|
51
|
-
if (
|
|
51
|
+
if ("name" in model)
|
|
52
52
|
return model.name;
|
|
53
|
-
if (
|
|
54
|
-
return
|
|
53
|
+
if ("mode" in model && model.mode === "auto")
|
|
54
|
+
return "auto";
|
|
55
55
|
return null;
|
|
56
56
|
})();
|
|
57
57
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-config.js","sourceRoot":"","sources":["../../../src/run/run-config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,
|
|
1
|
+
{"version":3,"file":"run-config.js","sourceRoot":"","sources":["../../../src/run/run-config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAuB,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAc3C,MAAM,UAAU,kBAAkB,CAAC,EACjC,SAAS,EACT,WAAW,EACX,qBAAqB,EACrB,sBAAsB,EACtB,cAAc,EACd,cAAc,GAQf;IACC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,mBAAmB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC;IAC7E,MAAM,cAAc,GAClB,OAAO,WAAW,CAAC,QAAQ,KAAK,QAAQ;QACtC,CAAC,CAAE,WAAW,CAAC,QAAmB;QAClC,CAAC,CAAC,OAAO,WAAW,CAAC,IAAI,KAAK,QAAQ;YACpC,CAAC,CAAE,WAAW,CAAC,IAAe;YAC9B,CAAC,CAAC,IAAI,CAAC;IACb,MAAM,kBAAkB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,IAAI,MAAM,EAAE,QAAQ,IAAI,MAAM,CAAW,CAAC;IAC9F,MAAM,cAAc,GAAmB,mBAAmB,CACxD,qBAAqB,IAAI,OAAO,cAAc,KAAK,QAAQ,IAAI,cAAc,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC;QAC7F,CAAC,CAAC,cAAc;QAChB,CAAC,CAAC,kBAAkB,CACvB,CAAC;IACF,MAAM,yBAAyB,GAAG,CAAC,GAAG,EAAE;QACtC,MAAM,KAAK,GAAG,MAAM,EAAE,MAAM,EAAE,mBAAmB,CAAC;QAClD,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;IAC1F,CAAC,CAAC,EAAE,CAAC;IACL,MAAM,SAAS,GAAG,cAAc,CAC9B,sBAAsB;QACpB,CAAC,CAAE,WAAW,CAAC,SAAoB;QACnC,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,IAAK,WAAW,CAAC,SAAoB,CAAC,CACpE,CAAC;IAEF,MAAM,kBAAkB,GAAyB,CAAC,GAAG,EAAE;QACrD,IAAI,CAAC,cAAc,IAAI,cAAc;YAAE,OAAO,IAAI,CAAC;QACnD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC;YAAE,OAAO,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC;QACnE,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAChD,CAAC,CAAC,EAAE,CAAC;IACL,MAAM,eAAe,GAAG,kBAAkB;QACxC,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,kBAAkB,EAAE;QACzD,CAAC,CAAC,MAAM,EAAE,GAAG,CAAC;IAChB,MAAM,YAAY,GAChB,kBAAkB,KAAK,IAAI;QACzB,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE;QAC7E,CAAC,CAAC,MAAM,CAAC;IAEb,MAAM,wBAAwB,GAAG,CAAC,GAAG,EAAE;QACrC,MAAM,QAAQ,GAAG,eAAe,CAC9B,OAAO,SAAS,CAAC,2BAA2B,KAAK,QAAQ;YACvD,CAAC,CAAC,SAAS,CAAC,2BAA2B;YACvC,CAAC,CAAC,IAAI,CACT,CAAC;QACF,IAAI,QAAQ,KAAK,IAAI;YAAE,OAAO,QAAQ,CAAC;QACvC,MAAM,WAAW,GAAG,MAAM,EAAE,MAAM,EAAE,kBAAkB,CAAC;QACvD,OAAO,OAAO,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC;IAChE,CAAC,CAAC,EAAE,CAAC;IAEL,MAAM,gBAAgB,GAAG,CAAC,GAAG,EAAE;QAC7B,MAAM,KAAK,GAAG,MAAM,EAAE,KAAK,CAAC;QAC5B,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,IAAI,IAAI,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC,EAAE,CAAC;QACnC,IAAI,MAAM,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC,IAAI,CAAC;QACvC,IAAI,MAAM,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM;YAAE,OAAO,MAAM,CAAC;QAC5D,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,EAAE,CAAC;IAEL,OAAO;QACL,MAAM;QACN,UAAU;QACV,cAAc;QACd,yBAAyB;QACzB,SAAS;QACT,eAAe;QACf,YAAY;QACZ,wBAAwB;QACxB,gBAAgB;KACjB,CAAC;AACJ,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { resolveConfigState } from
|
|
2
|
-
import { resolveEnvState } from
|
|
1
|
+
import { resolveConfigState } from "./run-config.js";
|
|
2
|
+
import { resolveEnvState } from "./run-env.js";
|
|
3
3
|
export function resolveRunContextState({ env, envForRun, programOpts, languageExplicitlySet, videoModeExplicitlySet, cliFlagPresent, cliProviderArg, }) {
|
|
4
4
|
const configState = resolveConfigState({
|
|
5
5
|
envForRun,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-context.js","sourceRoot":"","sources":["../../../src/run/run-context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,
|
|
1
|
+
{"version":3,"file":"run-context.js","sourceRoot":"","sources":["../../../src/run/run-context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,UAAU,sBAAsB,CAAC,EACrC,GAAG,EACH,SAAS,EACT,WAAW,EACX,qBAAqB,EACrB,sBAAsB,EACtB,cAAc,EACd,cAAc,GASf;IACC,MAAM,WAAW,GAAG,kBAAkB,CAAC;QACrC,SAAS;QACT,WAAW;QACX,qBAAqB;QACrB,sBAAsB;QACtB,cAAc;QACd,cAAc;KACf,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,eAAe,CAAC;QAC/B,GAAG;QACH,SAAS;QACT,YAAY,EAAE,WAAW,CAAC,YAAY;KACvC,CAAC,CAAC;IACH,OAAO,EAAE,GAAG,WAAW,EAAE,GAAG,QAAQ,EAAE,CAAC;AACzC,CAAC"}
|