@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
|
@@ -1,54 +1,54 @@
|
|
|
1
|
-
import { execFile } from
|
|
2
|
-
import fs from
|
|
3
|
-
import path from
|
|
4
|
-
import { promisify } from
|
|
5
|
-
import { DAEMON_LAUNCH_AGENT_LABEL } from
|
|
1
|
+
import { execFile } from "node:child_process";
|
|
2
|
+
import fs from "node:fs/promises";
|
|
3
|
+
import path from "node:path";
|
|
4
|
+
import { promisify } from "node:util";
|
|
5
|
+
import { DAEMON_LAUNCH_AGENT_LABEL } from "./constants.js";
|
|
6
6
|
const execFileAsync = promisify(execFile);
|
|
7
7
|
function resolveHomeDir(env) {
|
|
8
8
|
const home = env.HOME?.trim() || env.USERPROFILE?.trim();
|
|
9
9
|
if (!home)
|
|
10
|
-
throw new Error(
|
|
10
|
+
throw new Error("Missing HOME");
|
|
11
11
|
return home;
|
|
12
12
|
}
|
|
13
13
|
export function resolveLaunchAgentPlistPath(env) {
|
|
14
14
|
const home = resolveHomeDir(env);
|
|
15
|
-
return path.join(home,
|
|
15
|
+
return path.join(home, "Library", "LaunchAgents", `${DAEMON_LAUNCH_AGENT_LABEL}.plist`);
|
|
16
16
|
}
|
|
17
17
|
export function resolveDaemonLogPaths(env) {
|
|
18
18
|
const home = resolveHomeDir(env);
|
|
19
|
-
const logDir = path.join(home,
|
|
19
|
+
const logDir = path.join(home, ".summarize", "logs");
|
|
20
20
|
return {
|
|
21
21
|
logDir,
|
|
22
|
-
stdoutPath: path.join(logDir,
|
|
23
|
-
stderrPath: path.join(logDir,
|
|
22
|
+
stdoutPath: path.join(logDir, "daemon.log"),
|
|
23
|
+
stderrPath: path.join(logDir, "daemon.err.log"),
|
|
24
24
|
};
|
|
25
25
|
}
|
|
26
26
|
function plistEscape(value) {
|
|
27
27
|
return value
|
|
28
|
-
.replaceAll(
|
|
29
|
-
.replaceAll(
|
|
30
|
-
.replaceAll(
|
|
31
|
-
.replaceAll('"',
|
|
32
|
-
.replaceAll("'",
|
|
28
|
+
.replaceAll("&", "&")
|
|
29
|
+
.replaceAll("<", "<")
|
|
30
|
+
.replaceAll(">", ">")
|
|
31
|
+
.replaceAll('"', """)
|
|
32
|
+
.replaceAll("'", "'");
|
|
33
33
|
}
|
|
34
34
|
function plistUnescape(value) {
|
|
35
35
|
return value
|
|
36
|
-
.replaceAll(
|
|
37
|
-
.replaceAll(
|
|
38
|
-
.replaceAll(
|
|
39
|
-
.replaceAll(
|
|
40
|
-
.replaceAll(
|
|
36
|
+
.replaceAll("'", "'")
|
|
37
|
+
.replaceAll(""", '"')
|
|
38
|
+
.replaceAll(">", ">")
|
|
39
|
+
.replaceAll("<", "<")
|
|
40
|
+
.replaceAll("&", "&");
|
|
41
41
|
}
|
|
42
42
|
export async function readLaunchAgentProgramArguments(env) {
|
|
43
43
|
const plistPath = resolveLaunchAgentPlistPath(env);
|
|
44
44
|
try {
|
|
45
|
-
const plist = await fs.readFile(plistPath,
|
|
45
|
+
const plist = await fs.readFile(plistPath, "utf8");
|
|
46
46
|
const programMatch = plist.match(/<key>ProgramArguments<\/key>\s*<array>([\s\S]*?)<\/array>/i);
|
|
47
47
|
if (!programMatch)
|
|
48
48
|
return null;
|
|
49
|
-
const args = Array.from(programMatch[1].matchAll(/<string>([\s\S]*?)<\/string>/gi)).map((match) => plistUnescape(match[1] ??
|
|
49
|
+
const args = Array.from(programMatch[1].matchAll(/<string>([\s\S]*?)<\/string>/gi)).map((match) => plistUnescape(match[1] ?? "").trim());
|
|
50
50
|
const workingDirMatch = plist.match(/<key>WorkingDirectory<\/key>\s*<string>([\s\S]*?)<\/string>/i);
|
|
51
|
-
const workingDirectory = workingDirMatch ? plistUnescape(workingDirMatch[1] ??
|
|
51
|
+
const workingDirectory = workingDirMatch ? plistUnescape(workingDirMatch[1] ?? "").trim() : "";
|
|
52
52
|
return {
|
|
53
53
|
programArguments: args.filter(Boolean),
|
|
54
54
|
...(workingDirectory ? { workingDirectory } : {}),
|
|
@@ -61,12 +61,12 @@ export async function readLaunchAgentProgramArguments(env) {
|
|
|
61
61
|
export function buildLaunchAgentPlist({ label = DAEMON_LAUNCH_AGENT_LABEL, programArguments, workingDirectory, stdoutPath, stderrPath, }) {
|
|
62
62
|
const argsXml = programArguments
|
|
63
63
|
.map((arg) => `\n <string>${plistEscape(arg)}</string>`)
|
|
64
|
-
.join(
|
|
64
|
+
.join("");
|
|
65
65
|
const workingDirXml = workingDirectory
|
|
66
66
|
? `
|
|
67
67
|
<key>WorkingDirectory</key>
|
|
68
68
|
<string>${plistEscape(workingDirectory)}</string>`
|
|
69
|
-
:
|
|
69
|
+
: "";
|
|
70
70
|
return `<?xml version="1.0" encoding="UTF-8"?>
|
|
71
71
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
|
72
72
|
<plist version="1.0">
|
|
@@ -91,34 +91,61 @@ export function buildLaunchAgentPlist({ label = DAEMON_LAUNCH_AGENT_LABEL, progr
|
|
|
91
91
|
}
|
|
92
92
|
async function execLaunchctl(args) {
|
|
93
93
|
try {
|
|
94
|
-
const { stdout, stderr } = await execFileAsync(
|
|
95
|
-
return { stdout: String(stdout ??
|
|
94
|
+
const { stdout, stderr } = await execFileAsync("launchctl", args, { encoding: "utf8" });
|
|
95
|
+
return { stdout: String(stdout ?? ""), stderr: String(stderr ?? ""), code: 0 };
|
|
96
96
|
}
|
|
97
97
|
catch (error) {
|
|
98
98
|
const e = error;
|
|
99
99
|
return {
|
|
100
|
-
stdout: typeof e.stdout ===
|
|
101
|
-
stderr: typeof e.stderr ===
|
|
102
|
-
code: typeof e.code ===
|
|
100
|
+
stdout: typeof e.stdout === "string" ? e.stdout : "",
|
|
101
|
+
stderr: typeof e.stderr === "string" ? e.stderr : typeof e.message === "string" ? e.message : "",
|
|
102
|
+
code: typeof e.code === "number" ? e.code : 1,
|
|
103
103
|
};
|
|
104
104
|
}
|
|
105
105
|
}
|
|
106
|
-
function
|
|
107
|
-
if (
|
|
108
|
-
return
|
|
109
|
-
|
|
106
|
+
function parseUid(raw) {
|
|
107
|
+
if (!raw)
|
|
108
|
+
return null;
|
|
109
|
+
const value = Number(raw.trim());
|
|
110
|
+
if (!Number.isInteger(value) || value < 0)
|
|
111
|
+
return null;
|
|
112
|
+
return value;
|
|
113
|
+
}
|
|
114
|
+
export function resolveLaunchctlTargetUid({ uid, sudoUid, } = {}) {
|
|
115
|
+
const currentUid = typeof uid === "number" ? uid : typeof process.getuid === "function" ? process.getuid() : null;
|
|
116
|
+
if (currentUid === 0) {
|
|
117
|
+
const sudo = parseUid(sudoUid ?? process.env.SUDO_UID);
|
|
118
|
+
if (sudo !== null)
|
|
119
|
+
return sudo;
|
|
120
|
+
}
|
|
121
|
+
if (typeof currentUid === "number" && currentUid >= 0)
|
|
122
|
+
return currentUid;
|
|
123
|
+
const fallbackSudo = parseUid(sudoUid ?? process.env.SUDO_UID);
|
|
124
|
+
if (fallbackSudo !== null)
|
|
125
|
+
return fallbackSudo;
|
|
126
|
+
return 501;
|
|
127
|
+
}
|
|
128
|
+
export function resolveLaunchctlDomains({ uid, sudoUid, } = {}) {
|
|
129
|
+
const targetUid = resolveLaunchctlTargetUid({ uid, sudoUid });
|
|
130
|
+
return [`gui/${targetUid}`, `user/${targetUid}`];
|
|
110
131
|
}
|
|
111
132
|
export async function isLaunchAgentLoaded() {
|
|
112
|
-
const domain = resolveGuiDomain();
|
|
113
133
|
const label = DAEMON_LAUNCH_AGENT_LABEL;
|
|
114
|
-
const
|
|
115
|
-
|
|
134
|
+
const domains = resolveLaunchctlDomains();
|
|
135
|
+
for (const domain of domains) {
|
|
136
|
+
const res = await execLaunchctl(["print", `${domain}/${label}`]);
|
|
137
|
+
if (res.code === 0)
|
|
138
|
+
return true;
|
|
139
|
+
}
|
|
140
|
+
return false;
|
|
116
141
|
}
|
|
117
142
|
export async function uninstallLaunchAgent({ env, stdout, }) {
|
|
118
|
-
const
|
|
143
|
+
const domains = resolveLaunchctlDomains();
|
|
119
144
|
const plistPath = resolveLaunchAgentPlistPath(env);
|
|
120
|
-
|
|
121
|
-
|
|
145
|
+
for (const domain of domains) {
|
|
146
|
+
await execLaunchctl(["bootout", domain, plistPath]);
|
|
147
|
+
}
|
|
148
|
+
await execLaunchctl(["unload", plistPath]);
|
|
122
149
|
try {
|
|
123
150
|
await fs.access(plistPath);
|
|
124
151
|
}
|
|
@@ -127,7 +154,7 @@ export async function uninstallLaunchAgent({ env, stdout, }) {
|
|
|
127
154
|
return;
|
|
128
155
|
}
|
|
129
156
|
const home = resolveHomeDir(env);
|
|
130
|
-
const trashDir = path.join(home,
|
|
157
|
+
const trashDir = path.join(home, ".Trash");
|
|
131
158
|
const dest = path.join(trashDir, `${DAEMON_LAUNCH_AGENT_LABEL}.plist`);
|
|
132
159
|
try {
|
|
133
160
|
await fs.mkdir(trashDir, { recursive: true });
|
|
@@ -150,27 +177,45 @@ export async function installLaunchAgent({ env, stdout, programArguments, workin
|
|
|
150
177
|
stdoutPath,
|
|
151
178
|
stderrPath,
|
|
152
179
|
});
|
|
153
|
-
await fs.writeFile(plistPath, plist,
|
|
154
|
-
const
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
180
|
+
await fs.writeFile(plistPath, plist, "utf8");
|
|
181
|
+
const domains = resolveLaunchctlDomains();
|
|
182
|
+
for (const domain of domains) {
|
|
183
|
+
await execLaunchctl(["bootout", domain, plistPath]);
|
|
184
|
+
}
|
|
185
|
+
await execLaunchctl(["unload", plistPath]);
|
|
186
|
+
let installedDomain = null;
|
|
187
|
+
let lastBootstrap = null;
|
|
188
|
+
for (const domain of domains) {
|
|
189
|
+
const boot = await execLaunchctl(["bootstrap", domain, plistPath]);
|
|
190
|
+
if (boot.code === 0) {
|
|
191
|
+
installedDomain = domain;
|
|
192
|
+
break;
|
|
193
|
+
}
|
|
194
|
+
lastBootstrap = boot;
|
|
195
|
+
}
|
|
196
|
+
if (!installedDomain) {
|
|
197
|
+
const details = lastBootstrap?.stderr || lastBootstrap?.stdout || "unknown error";
|
|
198
|
+
throw new Error(`launchctl bootstrap failed: ${details}`.trim());
|
|
160
199
|
}
|
|
161
|
-
await execLaunchctl([
|
|
162
|
-
await execLaunchctl([
|
|
200
|
+
await execLaunchctl(["enable", `${installedDomain}/${DAEMON_LAUNCH_AGENT_LABEL}`]);
|
|
201
|
+
await execLaunchctl(["kickstart", "-k", `${installedDomain}/${DAEMON_LAUNCH_AGENT_LABEL}`]);
|
|
163
202
|
stdout.write(`Installed LaunchAgent: ${plistPath}\n`);
|
|
203
|
+
stdout.write(`Launch domain: ${installedDomain}\n`);
|
|
164
204
|
stdout.write(`Logs: ${stdoutPath}\n`);
|
|
165
205
|
return { plistPath };
|
|
166
206
|
}
|
|
167
207
|
export async function restartLaunchAgent({ stdout, }) {
|
|
168
|
-
const domain = resolveGuiDomain();
|
|
169
208
|
const label = DAEMON_LAUNCH_AGENT_LABEL;
|
|
170
|
-
const
|
|
171
|
-
|
|
172
|
-
|
|
209
|
+
const domains = resolveLaunchctlDomains();
|
|
210
|
+
let lastResult = null;
|
|
211
|
+
for (const domain of domains) {
|
|
212
|
+
const res = await execLaunchctl(["kickstart", "-k", `${domain}/${label}`]);
|
|
213
|
+
if (res.code === 0) {
|
|
214
|
+
stdout.write(`Restarted LaunchAgent: ${domain}/${label}\n`);
|
|
215
|
+
return;
|
|
216
|
+
}
|
|
217
|
+
lastResult = res;
|
|
173
218
|
}
|
|
174
|
-
|
|
219
|
+
throw new Error(`launchctl kickstart failed: ${lastResult?.stderr || lastResult?.stdout || "unknown error"}`.trim());
|
|
175
220
|
}
|
|
176
221
|
//# sourceMappingURL=launchd.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launchd.js","sourceRoot":"","sources":["../../../src/daemon/launchd.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,
|
|
1
|
+
{"version":3,"file":"launchd.js","sourceRoot":"","sources":["../../../src/daemon/launchd.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/daemon/meta.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { formatCompactCount, formatDurationSecondsSmart, formatMinutesSmart, } from
|
|
1
|
+
import { formatCompactCount, formatDurationSecondsSmart, formatMinutesSmart, } from "../tty/format.js";
|
|
2
2
|
export function estimateDurationSecondsFromWords(words, { minSeconds = 60 } = {}) {
|
|
3
|
-
const safe = typeof words ===
|
|
3
|
+
const safe = typeof words === "number" && Number.isFinite(words) ? words : 0;
|
|
4
4
|
if (safe <= 0)
|
|
5
5
|
return minSeconds;
|
|
6
6
|
return Math.max(minSeconds, (safe / 160) * 60);
|
|
@@ -24,12 +24,12 @@ export function formatInputSummary({ kindLabel, durationSeconds, words, characte
|
|
|
24
24
|
parts.push(kindLabel);
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
|
-
if (typeof words ===
|
|
27
|
+
if (typeof words === "number" && Number.isFinite(words) && words > 0) {
|
|
28
28
|
parts.push(`${formatCompactCount(words)} words`);
|
|
29
29
|
}
|
|
30
|
-
if (typeof characters ===
|
|
30
|
+
if (typeof characters === "number" && Number.isFinite(characters) && characters > 0) {
|
|
31
31
|
parts.push(`${formatCompactCount(characters)} chars`);
|
|
32
32
|
}
|
|
33
|
-
return parts.length > 0 ? parts.join(
|
|
33
|
+
return parts.length > 0 ? parts.join(" · ") : null;
|
|
34
34
|
}
|
|
35
35
|
//# sourceMappingURL=meta.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"meta.js","sourceRoot":"","sources":["../../../src/daemon/meta.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,0BAA0B,EAC1B,kBAAkB,GACnB,MAAM,kBAAkB,
|
|
1
|
+
{"version":3,"file":"meta.js","sourceRoot":"","sources":["../../../src/daemon/meta.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,0BAA0B,EAC1B,kBAAkB,GACnB,MAAM,kBAAkB,CAAC;AAU1B,MAAM,UAAU,gCAAgC,CAAC,KAAa,EAAE,EAAE,UAAU,GAAG,EAAE,EAAE,GAAG,EAAE;IACtF,MAAM,IAAI,GAAG,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7E,IAAI,IAAI,IAAI,CAAC;QAAE,OAAO,UAAU,CAAC;IACjC,OAAO,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,IAAI,GAAG,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,IAAY;IACrC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IAC5B,IAAI,CAAC,OAAO;QAAE,OAAO,CAAC,CAAC;IACvB,OAAO,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,EACjC,SAAS,EACT,eAAe,EACf,KAAK,EACL,UAAU,EACV,qBAAqB,GACJ;IACjB,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,IAAI,SAAS,EAAE,CAAC;QACd,IAAI,eAAe,IAAI,IAAI,IAAI,eAAe,GAAG,CAAC,EAAE,CAAC;YACnD,MAAM,QAAQ,GAAG,qBAAqB;gBACpC,CAAC,CAAC,kBAAkB,CAAC,eAAe,GAAG,EAAE,CAAC;gBAC1C,CAAC,CAAC,0BAA0B,CAAC,eAAe,CAAC,CAAC;YAChD,KAAK,CAAC,IAAI,CAAC,GAAG,QAAQ,IAAI,SAAS,EAAE,CAAC,CAAC;QACzC,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;QACrE,KAAK,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACnD,CAAC;IACD,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,UAAU,GAAG,CAAC,EAAE,CAAC;QACpF,KAAK,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACxD,CAAC;IAED,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACrD,CAAC"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
-
import { getModels } from
|
|
2
|
-
import {
|
|
1
|
+
import { getModels } from "@mariozechner/pi-ai";
|
|
2
|
+
import { isOpenRouterBaseUrl } from "@steipete/summarize-core";
|
|
3
|
+
import { resolveCliAvailability } from "../run/env.js";
|
|
4
|
+
import { resolveEnvState } from "../run/run-env.js";
|
|
3
5
|
function uniqById(options) {
|
|
4
6
|
const seen = new Set();
|
|
5
7
|
const out = [];
|
|
@@ -15,7 +17,7 @@ function uniqById(options) {
|
|
|
15
17
|
return out;
|
|
16
18
|
}
|
|
17
19
|
function isProbablyOpenRouterBaseUrl(baseUrl) {
|
|
18
|
-
return
|
|
20
|
+
return isOpenRouterBaseUrl(baseUrl);
|
|
19
21
|
}
|
|
20
22
|
function isProbablyZaiBaseUrl(baseUrl) {
|
|
21
23
|
return /api\.z\.ai/i.test(baseUrl);
|
|
@@ -41,34 +43,34 @@ function pushPiAiModels({ options, provider, prefix, labelPrefix, }) {
|
|
|
41
43
|
}
|
|
42
44
|
}
|
|
43
45
|
async function discoverOpenAiCompatibleModelIds({ baseUrl, apiKey, fetchImpl, timeoutMs, }) {
|
|
44
|
-
const base = baseUrl.endsWith(
|
|
45
|
-
const modelsUrl = new URL(
|
|
46
|
+
const base = baseUrl.endsWith("/") ? baseUrl : `${baseUrl}/`;
|
|
47
|
+
const modelsUrl = new URL("models", base).toString();
|
|
46
48
|
const controller = new AbortController();
|
|
47
49
|
const timeout = setTimeout(() => controller.abort(), timeoutMs);
|
|
48
50
|
try {
|
|
49
51
|
const res = await fetchImpl(modelsUrl, {
|
|
50
|
-
method:
|
|
52
|
+
method: "GET",
|
|
51
53
|
headers: apiKey ? { authorization: `Bearer ${apiKey}` } : undefined,
|
|
52
54
|
signal: controller.signal,
|
|
53
55
|
});
|
|
54
56
|
if (!res.ok)
|
|
55
57
|
return [];
|
|
56
58
|
const json = (await res.json());
|
|
57
|
-
if (!json || typeof json !==
|
|
59
|
+
if (!json || typeof json !== "object")
|
|
58
60
|
return [];
|
|
59
61
|
const obj = json;
|
|
60
62
|
const data = obj.data;
|
|
61
63
|
if (Array.isArray(data)) {
|
|
62
64
|
const ids = data
|
|
63
|
-
.map((item) => (item && typeof item ===
|
|
64
|
-
.filter((id) => typeof id ===
|
|
65
|
+
.map((item) => (item && typeof item === "object" ? item.id : null))
|
|
66
|
+
.filter((id) => typeof id === "string" && id.trim().length > 0)
|
|
65
67
|
.map((id) => id.trim());
|
|
66
68
|
return Array.from(new Set(ids)).sort((a, b) => a.localeCompare(b));
|
|
67
69
|
}
|
|
68
70
|
const models = obj.models;
|
|
69
71
|
if (Array.isArray(models)) {
|
|
70
72
|
const ids = models
|
|
71
|
-
.filter((id) => typeof id ===
|
|
73
|
+
.filter((id) => typeof id === "string" && id.trim().length > 0)
|
|
72
74
|
.map((id) => id.trim());
|
|
73
75
|
return Array.from(new Set(ids)).sort((a, b) => a.localeCompare(b));
|
|
74
76
|
}
|
|
@@ -90,55 +92,76 @@ export async function buildModelPickerOptions({ env, envForRun, configForCli, fe
|
|
|
90
92
|
anthropic: envState.anthropicConfigured,
|
|
91
93
|
openrouter: envState.openrouterConfigured,
|
|
92
94
|
zai: Boolean(envState.zaiApiKey),
|
|
95
|
+
cliClaude: false,
|
|
96
|
+
cliGemini: false,
|
|
97
|
+
cliCodex: false,
|
|
98
|
+
cliAgent: false,
|
|
93
99
|
};
|
|
94
|
-
const
|
|
100
|
+
const cliAvailability = resolveCliAvailability({ env: envForRun, config: configForCli });
|
|
101
|
+
providers.cliClaude = Boolean(cliAvailability.claude);
|
|
102
|
+
providers.cliGemini = Boolean(cliAvailability.gemini);
|
|
103
|
+
providers.cliCodex = Boolean(cliAvailability.codex);
|
|
104
|
+
providers.cliAgent = Boolean(cliAvailability.agent);
|
|
105
|
+
const options = [{ id: "auto", label: "Auto" }];
|
|
106
|
+
if (providers.cliClaude) {
|
|
107
|
+
options.push({ id: "cli/claude", label: "CLI: Claude" });
|
|
108
|
+
}
|
|
109
|
+
if (providers.cliGemini) {
|
|
110
|
+
options.push({ id: "cli/gemini", label: "CLI: Gemini" });
|
|
111
|
+
}
|
|
112
|
+
if (providers.cliCodex) {
|
|
113
|
+
options.push({ id: "cli/codex", label: "CLI: Codex" });
|
|
114
|
+
}
|
|
115
|
+
if (providers.cliAgent) {
|
|
116
|
+
options.push({ id: "cli/agent", label: "CLI: Cursor Agent" });
|
|
117
|
+
}
|
|
95
118
|
if (providers.openrouter) {
|
|
96
|
-
options.push({ id:
|
|
119
|
+
options.push({ id: "free", label: "Free (OpenRouter)" });
|
|
97
120
|
pushPiAiModels({
|
|
98
121
|
options,
|
|
99
|
-
provider:
|
|
100
|
-
prefix:
|
|
101
|
-
labelPrefix:
|
|
122
|
+
provider: "openrouter",
|
|
123
|
+
prefix: "openrouter/",
|
|
124
|
+
labelPrefix: "OpenRouter: ",
|
|
102
125
|
});
|
|
103
126
|
}
|
|
104
127
|
if (providers.openai) {
|
|
105
128
|
pushPiAiModels({
|
|
106
129
|
options,
|
|
107
|
-
provider:
|
|
108
|
-
prefix:
|
|
109
|
-
labelPrefix:
|
|
130
|
+
provider: "openai",
|
|
131
|
+
prefix: "openai/",
|
|
132
|
+
labelPrefix: "OpenAI: ",
|
|
110
133
|
});
|
|
111
134
|
}
|
|
112
135
|
if (providers.anthropic) {
|
|
113
136
|
pushPiAiModels({
|
|
114
137
|
options,
|
|
115
|
-
provider:
|
|
116
|
-
prefix:
|
|
117
|
-
labelPrefix:
|
|
138
|
+
provider: "anthropic",
|
|
139
|
+
prefix: "anthropic/",
|
|
140
|
+
labelPrefix: "Anthropic: ",
|
|
118
141
|
});
|
|
119
142
|
}
|
|
120
143
|
if (providers.google) {
|
|
121
144
|
pushPiAiModels({
|
|
122
145
|
options,
|
|
123
|
-
provider:
|
|
124
|
-
prefix:
|
|
125
|
-
labelPrefix:
|
|
146
|
+
provider: "google",
|
|
147
|
+
prefix: "google/",
|
|
148
|
+
labelPrefix: "Google: ",
|
|
126
149
|
});
|
|
127
150
|
}
|
|
128
151
|
if (providers.xai) {
|
|
129
152
|
pushPiAiModels({
|
|
130
153
|
options,
|
|
131
|
-
provider:
|
|
132
|
-
prefix:
|
|
133
|
-
labelPrefix:
|
|
154
|
+
provider: "xai",
|
|
155
|
+
prefix: "xai/",
|
|
156
|
+
labelPrefix: "xAI: ",
|
|
134
157
|
});
|
|
135
158
|
}
|
|
136
159
|
if (providers.zai) {
|
|
137
160
|
pushPiAiModels({
|
|
138
161
|
options,
|
|
139
|
-
provider:
|
|
140
|
-
prefix:
|
|
141
|
-
labelPrefix:
|
|
162
|
+
provider: "zai",
|
|
163
|
+
prefix: "zai/",
|
|
164
|
+
labelPrefix: "Z.AI: ",
|
|
142
165
|
});
|
|
143
166
|
}
|
|
144
167
|
const openaiBaseUrl = (() => {
|
|
@@ -157,7 +180,7 @@ export async function buildModelPickerOptions({ env, envForRun, configForCli, fe
|
|
|
157
180
|
timeoutMs: 900,
|
|
158
181
|
});
|
|
159
182
|
if (discovered.length > 0) {
|
|
160
|
-
localModelsSource = { kind:
|
|
183
|
+
localModelsSource = { kind: "openai-compatible", baseUrlHost };
|
|
161
184
|
for (const id of discovered) {
|
|
162
185
|
options.push({ id: `openai/${id}`, label: `Local (${baseUrlHost}): ${id}` });
|
|
163
186
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../src/daemon/models.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,
|
|
1
|
+
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../src/daemon/models.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { randomUUID } from
|
|
1
|
+
import { randomUUID } from "node:crypto";
|
|
2
2
|
const DEFAULT_MAX_RECORDS = 200;
|
|
3
3
|
const DEFAULT_MAX_LINES = 400;
|
|
4
4
|
const DEFAULT_MAX_LINE_LENGTH = 2000;
|
|
@@ -32,7 +32,7 @@ export class ProcessRegistry {
|
|
|
32
32
|
const record = this.records.get(id);
|
|
33
33
|
if (!record)
|
|
34
34
|
continue;
|
|
35
|
-
if (!includeCompleted && record.status !==
|
|
35
|
+
if (!includeCompleted && record.status !== "running")
|
|
36
36
|
continue;
|
|
37
37
|
items.push({
|
|
38
38
|
id: record.id,
|
|
@@ -65,11 +65,11 @@ export class ProcessRegistry {
|
|
|
65
65
|
if (!record)
|
|
66
66
|
return null;
|
|
67
67
|
const tail = clampNumber(opts?.tail ?? 200, 20, this.maxLines);
|
|
68
|
-
const stream = opts?.stream ??
|
|
69
|
-
const lines = stream ===
|
|
70
|
-
? record.stdout.slice(-tail).map((line) => ({ stream:
|
|
71
|
-
: stream ===
|
|
72
|
-
? record.stderr.slice(-tail).map((line) => ({ stream:
|
|
68
|
+
const stream = opts?.stream ?? "merged";
|
|
69
|
+
const lines = stream === "stdout"
|
|
70
|
+
? record.stdout.slice(-tail).map((line) => ({ stream: "stdout", line }))
|
|
71
|
+
: stream === "stderr"
|
|
72
|
+
? record.stderr.slice(-tail).map((line) => ({ stream: "stderr", line }))
|
|
73
73
|
: record.merged.slice(-tail);
|
|
74
74
|
return { ok: true, id: record.id, lines, truncated: record.truncated };
|
|
75
75
|
}
|
|
@@ -84,7 +84,7 @@ export class ProcessRegistry {
|
|
|
84
84
|
runId: info.runId ?? null,
|
|
85
85
|
source: info.source ?? null,
|
|
86
86
|
pid: null,
|
|
87
|
-
status:
|
|
87
|
+
status: "running",
|
|
88
88
|
startedAt: Date.now(),
|
|
89
89
|
endedAt: null,
|
|
90
90
|
exitCode: null,
|
|
@@ -103,16 +103,16 @@ export class ProcessRegistry {
|
|
|
103
103
|
this.order.push(id);
|
|
104
104
|
this.prune();
|
|
105
105
|
const finishOnce = (result) => {
|
|
106
|
-
if (record.status !==
|
|
106
|
+
if (record.status !== "running")
|
|
107
107
|
return;
|
|
108
108
|
record.exitCode = result.exitCode ?? null;
|
|
109
109
|
record.signal = result.signal ?? null;
|
|
110
110
|
record.error = result.error ?? null;
|
|
111
111
|
record.endedAt = Date.now();
|
|
112
112
|
const hasFailure = Boolean(result.error) ||
|
|
113
|
-
(typeof result.exitCode ===
|
|
113
|
+
(typeof result.exitCode === "number" && result.exitCode !== 0) ||
|
|
114
114
|
result.signal != null;
|
|
115
|
-
record.status = hasFailure ?
|
|
115
|
+
record.status = hasFailure ? "error" : "exited";
|
|
116
116
|
};
|
|
117
117
|
return {
|
|
118
118
|
id,
|
|
@@ -130,7 +130,7 @@ export class ProcessRegistry {
|
|
|
130
130
|
record.merged.shift();
|
|
131
131
|
record.truncated = true;
|
|
132
132
|
}
|
|
133
|
-
const target = stream ===
|
|
133
|
+
const target = stream === "stdout" ? record.stdout : record.stderr;
|
|
134
134
|
target.push(cleaned);
|
|
135
135
|
if (target.length > this.maxLines) {
|
|
136
136
|
target.shift();
|
|
@@ -143,7 +143,7 @@ export class ProcessRegistry {
|
|
|
143
143
|
},
|
|
144
144
|
setProgress: (progress, detail) => {
|
|
145
145
|
record.progressPercent =
|
|
146
|
-
typeof progress ===
|
|
146
|
+
typeof progress === "number" && Number.isFinite(progress)
|
|
147
147
|
? Math.max(0, Math.min(100, Math.round(progress)))
|
|
148
148
|
: null;
|
|
149
149
|
record.progressDetail = detail ?? null;
|
|
@@ -162,7 +162,7 @@ export class ProcessRegistry {
|
|
|
162
162
|
const record = this.records.get(id);
|
|
163
163
|
if (!record)
|
|
164
164
|
continue;
|
|
165
|
-
if (record.status ===
|
|
165
|
+
if (record.status === "running")
|
|
166
166
|
continue;
|
|
167
167
|
if (record.endedAt && now - record.endedAt > this.retentionMs) {
|
|
168
168
|
this.records.delete(id);
|
|
@@ -184,7 +184,7 @@ export function buildProcessLogsResult(registry, id, opts) {
|
|
|
184
184
|
function normalizeLine(line, maxLength) {
|
|
185
185
|
const trimmed = line.trim();
|
|
186
186
|
if (!trimmed)
|
|
187
|
-
return
|
|
187
|
+
return "";
|
|
188
188
|
if (trimmed.length <= maxLength)
|
|
189
189
|
return trimmed;
|
|
190
190
|
return `${trimmed.slice(0, maxLength)}…`;
|