prompsit-cli 26.227.2006 → 26.228.1650
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/dist/api/auth-session.js +7 -1
- package/dist/api/auth-session.js.map +1 -1
- package/dist/api/errors.js +1 -1
- package/dist/api/errors.js.map +1 -1
- package/dist/api/resources/auth.js +1 -1
- package/dist/api/resources/auth.js.map +1 -1
- package/dist/api/resources/data.js +1 -1
- package/dist/api/resources/data.js.map +1 -1
- package/dist/api/resources/discovery.js +1 -1
- package/dist/api/resources/discovery.js.map +1 -1
- package/dist/api/resources/evaluation.d.ts.map +1 -1
- package/dist/api/resources/evaluation.js +3 -2
- package/dist/api/resources/evaluation.js.map +1 -1
- package/dist/api/resources/health.js +1 -1
- package/dist/api/resources/health.js.map +1 -1
- package/dist/api/resources/jobs.js +1 -1
- package/dist/api/resources/jobs.js.map +1 -1
- package/dist/api/resources/languages.js +1 -1
- package/dist/api/resources/languages.js.map +1 -1
- package/dist/api/resources/translation.js +1 -1
- package/dist/api/resources/translation.js.map +1 -1
- package/dist/api/sse-client.js +1 -1
- package/dist/api/sse-client.js.map +1 -1
- package/dist/api/sse-models.js +1 -1
- package/dist/api/sse-models.js.map +1 -1
- package/dist/api/translator-adapter.d.ts +3 -0
- package/dist/api/translator-adapter.d.ts.map +1 -0
- package/dist/api/translator-adapter.js +12 -0
- package/dist/api/translator-adapter.js.map +1 -0
- package/dist/api/transport.js +1 -1
- package/dist/api/transport.js.map +1 -1
- package/dist/commands/auth.js +7 -1
- package/dist/commands/auth.js.map +1 -1
- package/dist/commands/batch-processor.d.ts.map +1 -1
- package/dist/commands/batch-processor.js +41 -30
- package/dist/commands/batch-processor.js.map +1 -1
- package/dist/commands/config/language.js +1 -1
- package/dist/commands/config/language.js.map +1 -1
- package/dist/commands/config/reset.d.ts.map +1 -1
- package/dist/commands/config/reset.js +2 -3
- package/dist/commands/config/reset.js.map +1 -1
- package/dist/commands/config/shared.d.ts +0 -1
- package/dist/commands/config/shared.d.ts.map +1 -1
- package/dist/commands/config/shared.js +1 -14
- package/dist/commands/config/shared.js.map +1 -1
- package/dist/commands/config/show.d.ts.map +1 -1
- package/dist/commands/config/show.js +2 -1
- package/dist/commands/config/show.js.map +1 -1
- package/dist/commands/data.d.ts.map +1 -1
- package/dist/commands/data.js +47 -51
- package/dist/commands/data.js.map +1 -1
- package/dist/commands/evaluate.js +7 -12
- package/dist/commands/evaluate.js.map +1 -1
- package/dist/commands/job-tracking.d.ts +1 -0
- package/dist/commands/job-tracking.d.ts.map +1 -1
- package/dist/commands/job-tracking.js +18 -10
- package/dist/commands/job-tracking.js.map +1 -1
- package/dist/commands/progress-animator.d.ts.map +1 -1
- package/dist/commands/progress-animator.js +5 -3
- package/dist/commands/progress-animator.js.map +1 -1
- package/dist/commands/translate.js +28 -24
- package/dist/commands/translate.js.map +1 -1
- package/dist/config/constants.d.ts +2 -2
- package/dist/config/constants.js +2 -2
- package/dist/config/constants.js.map +1 -1
- package/dist/config/credentials.d.ts +10 -7
- package/dist/config/credentials.d.ts.map +1 -1
- package/dist/config/credentials.js +5 -9
- package/dist/config/credentials.js.map +1 -1
- package/dist/config/file-utils.d.ts +2 -0
- package/dist/config/file-utils.d.ts.map +1 -1
- package/dist/config/file-utils.js +6 -1
- package/dist/config/file-utils.js.map +1 -1
- package/dist/config/index.d.ts +2 -1
- package/dist/config/index.d.ts.map +1 -1
- package/dist/config/index.js +2 -1
- package/dist/config/index.js.map +1 -1
- package/dist/config/settings.d.ts.map +1 -1
- package/dist/config/settings.js +12 -34
- package/dist/config/settings.js.map +1 -1
- package/dist/config/toml-io.d.ts +5 -0
- package/dist/config/toml-io.d.ts.map +1 -1
- package/dist/config/toml-io.js +15 -0
- package/dist/config/toml-io.js.map +1 -1
- package/dist/errors/catalog.d.ts +0 -6
- package/dist/errors/catalog.d.ts.map +1 -1
- package/dist/errors/contracts.js +1 -1
- package/dist/errors/contracts.js.map +1 -1
- package/dist/i18n/cache.d.ts.map +1 -1
- package/dist/i18n/cache.js +16 -0
- package/dist/i18n/cache.js.map +1 -1
- package/dist/i18n/catalog.d.ts +6 -0
- package/dist/i18n/catalog.d.ts.map +1 -1
- package/dist/i18n/catalog.js +7 -0
- package/dist/i18n/catalog.js.map +1 -1
- package/dist/i18n/translator.d.ts +2 -6
- package/dist/i18n/translator.d.ts.map +1 -1
- package/dist/i18n/translator.js.map +1 -1
- package/dist/logging/external-transport.d.ts +12 -0
- package/dist/logging/external-transport.d.ts.map +1 -0
- package/dist/logging/external-transport.js +59 -0
- package/dist/logging/external-transport.js.map +1 -0
- package/dist/logging/loki-handler.js +1 -1
- package/dist/logging/loki-handler.js.map +1 -1
- package/dist/logging/setup.js +1 -1
- package/dist/logging/setup.js.map +1 -1
- package/dist/output/tables/evaluation.js +1 -1
- package/dist/output/tables/evaluation.js.map +1 -1
- package/dist/output/tables/health-status.js +1 -1
- package/dist/output/tables/health-status.js.map +1 -1
- package/dist/program.js +1 -1
- package/dist/program.js.map +1 -1
- package/dist/repl/controller.js +1 -1
- package/dist/repl/controller.js.map +1 -1
- package/dist/repl/examples.js +1 -1
- package/dist/repl/examples.js.map +1 -1
- package/dist/repl/executor.d.ts.map +1 -1
- package/dist/repl/executor.js +65 -59
- package/dist/repl/executor.js.map +1 -1
- package/dist/repl/history/command-history.d.ts +1 -1
- package/dist/repl/history/command-history.d.ts.map +1 -1
- package/dist/repl/history/command-history.js +8 -11
- package/dist/repl/history/command-history.js.map +1 -1
- package/dist/repl/history/output-store.d.ts.map +1 -1
- package/dist/repl/history/output-store.js +3 -2
- package/dist/repl/history/output-store.js.map +1 -1
- package/dist/repl/loop.js +1 -1
- package/dist/repl/loop.js.map +1 -1
- package/dist/repl/registry.d.ts.map +1 -1
- package/dist/repl/registry.js +8 -0
- package/dist/repl/registry.js.map +1 -1
- package/dist/runtime/file-args.d.ts +18 -0
- package/dist/runtime/file-args.d.ts.map +1 -1
- package/dist/runtime/file-args.js +22 -0
- package/dist/runtime/file-args.js.map +1 -1
- package/dist/runtime/progress-adapters.d.ts +1 -1
- package/dist/runtime/progress-adapters.d.ts.map +1 -1
- package/dist/runtime/progress-sink.d.ts +7 -0
- package/dist/runtime/progress-sink.d.ts.map +1 -0
- package/dist/runtime/progress-sink.js +2 -0
- package/dist/runtime/progress-sink.js.map +1 -0
- package/dist/shared/constants.d.ts +87 -0
- package/dist/shared/constants.d.ts.map +1 -0
- package/dist/shared/constants.js +103 -0
- package/dist/shared/constants.js.map +1 -0
- package/dist/shared/version.d.ts +3 -0
- package/dist/shared/version.d.ts.map +1 -0
- package/dist/shared/version.js +110 -0
- package/dist/shared/version.js.map +1 -0
- package/dist/tui/settings-screen.d.ts.map +1 -1
- package/dist/tui/settings-screen.js +41 -42
- package/dist/tui/settings-screen.js.map +1 -1
- package/package.json +1 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reset.js","sourceRoot":"","sources":["../../../src/commands/config/reset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"reset.js","sourceRoot":"","sources":["../../../src/commands/config/reset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACtF,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,CAAC,EAAE,MAAM,qBAAqB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,MAAM,UAAU,mBAAmB,CAAC,aAAsB;IACxD,aAAa;SACV,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,0CAA0C,CAAC;SACvD,MAAM,CAAC,aAAa,EAAE,0BAA0B,CAAC;SACjD,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACrB,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACxC,WAAW,CAAC,SAAS,CAAC,kBAAkB,EAAE,+CAA+C,CAAC,CAAC;YAC3F,OAAO;QACT,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAChB,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAC,CAAC;YACtE,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC;gBAC3C,OAAO;YACT,CAAC;QACH,CAAC;QAED,gBAAgB,EAAE,CAAC;QACnB,WAAW,EAAE,CAAC;QACd,cAAc,EAAE,CAAC;QACjB,cAAc,EAAE,CAAC;QAEjB,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -4,7 +4,6 @@ export type ConfigValueSource = "env" | "file" | "default";
|
|
|
4
4
|
* Apply API URL change side-effects and show a unified user warning/success.
|
|
5
5
|
*/
|
|
6
6
|
export declare function applyApiUrlChangeAndNotify(resolvedUrl?: string): void;
|
|
7
|
-
export declare function readRawToml(): Record<string, unknown> | null;
|
|
8
7
|
export declare function detectSource(section: string, field: string, tomlData: Record<string, unknown> | null, envData: Record<string, unknown>): ConfigValueSource;
|
|
9
8
|
export declare function ensureValidConfigKey(key: string): boolean;
|
|
10
9
|
export declare function isApiPreset(value: string): value is keyof typeof API_URL_PRESETS;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../src/commands/config/shared.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../src/commands/config/shared.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAmC,MAAM,uBAAuB,CAAC;AAOzF,MAAM,MAAM,iBAAiB,GAAG,KAAK,GAAG,MAAM,GAAG,SAAS,CAAC;AAO3D;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAMrE;AAED,wBAAgB,YAAY,CAC1B,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,EACxC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B,iBAAiB,CAYnB;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAWzD;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,MAAM,OAAO,eAAe,CAEhF"}
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
import
|
|
2
|
-
import * as smolToml from "smol-toml";
|
|
3
|
-
import { API_URL_PRESETS, clearTokens, getConfigFile, getValidConfigKeys, } from "../../config/index.js";
|
|
1
|
+
import { API_URL_PRESETS, clearTokens, getValidConfigKeys } from "../../config/index.js";
|
|
4
2
|
import { resetApiClient } from "../../api/client.js";
|
|
5
3
|
import { ErrorCode } from "../../errors/codes.js";
|
|
6
4
|
import { t } from "../../i18n/index.js";
|
|
@@ -20,17 +18,6 @@ export function applyApiUrlChangeAndNotify(resolvedUrl) {
|
|
|
20
18
|
terminal.success(t("config.api_url.set_to", { url: resolvedUrl }));
|
|
21
19
|
}
|
|
22
20
|
}
|
|
23
|
-
export function readRawToml() {
|
|
24
|
-
const configPath = getConfigFile();
|
|
25
|
-
if (!fs.existsSync(configPath))
|
|
26
|
-
return null;
|
|
27
|
-
try {
|
|
28
|
-
return smolToml.parse(fs.readFileSync(configPath, "utf8"));
|
|
29
|
-
}
|
|
30
|
-
catch {
|
|
31
|
-
return null;
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
21
|
export function detectSource(section, field, tomlData, envData) {
|
|
35
22
|
const envSection = envData[section];
|
|
36
23
|
if (envSection && typeof envSection === "object" && field in envSection) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../src/commands/config/shared.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../src/commands/config/shared.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AACzF,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,CAAC,EAAE,MAAM,qBAAqB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAIlD,SAAS,iBAAiB;IACxB,WAAW,EAAE,CAAC;IACd,cAAc,EAAE,CAAC;AACnB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,0BAA0B,CAAC,WAAoB;IAC7D,iBAAiB,EAAE,CAAC;IACpB,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAC,CAAC;IAC9C,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QAC9B,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,uBAAuB,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;IACrE,CAAC;AACH,CAAC;AAED,MAAM,UAAU,YAAY,CAC1B,OAAe,EACf,KAAa,EACb,QAAwC,EACxC,OAAgC;IAEhC,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACpC,IAAI,UAAU,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,KAAK,IAAI,UAAU,EAAE,CAAC;QACxE,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,WAAW,GAAG,QAAQ,EAAE,CAAC,OAAO,CAAC,CAAC;IACxC,IAAI,WAAW,IAAI,OAAO,WAAW,KAAK,QAAQ,IAAI,KAAK,IAAI,WAAW,EAAE,CAAC;QAC3E,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,GAAW;IAC9C,MAAM,SAAS,GAAG,kBAAkB,EAAE,CAAC;IACvC,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,WAAW,CACT,SAAS,CAAC,cAAc,EACxB,GAAG,CAAC,CAAC,oBAAoB,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC,mBAAmB,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACvF,CAAC;IACF,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,KAAa;IACvC,OAAO,KAAK,IAAI,eAAe,CAAC;AAClC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"show.d.ts","sourceRoot":"","sources":["../../../src/commands/config/show.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"show.d.ts","sourceRoot":"","sources":["../../../src/commands/config/show.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAWtD,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,OAAO,GAAG,IAAI,CA4B/D"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { Command } from "@commander-js/extra-typings";
|
|
2
2
|
import { buildCliKeyMap, getConfigValue, getEnvOverridesSnapshot, getValidConfigKeys, } from "../../config/index.js";
|
|
3
3
|
import { terminal } from "../../output/index.js";
|
|
4
|
-
import { detectSource
|
|
4
|
+
import { detectSource } from "./shared.js";
|
|
5
|
+
import { readRawToml } from "../../config/index.js";
|
|
5
6
|
export function registerConfigShow(configCommand) {
|
|
6
7
|
configCommand
|
|
7
8
|
.command("show")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"show.js","sourceRoot":"","sources":["../../../src/commands/config/show.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EACL,cAAc,EACd,cAAc,EACd,uBAAuB,EACvB,kBAAkB,GACnB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"show.js","sourceRoot":"","sources":["../../../src/commands/config/show.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EACL,cAAc,EACd,cAAc,EACd,uBAAuB,EACvB,kBAAkB,GACnB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,MAAM,UAAU,kBAAkB,CAAC,aAAsB;IACvD,aAAa;SACV,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,+CAA+C,CAAC;SAC5D,MAAM,CAAC,GAAG,EAAE;QACX,MAAM,IAAI,GAAG,kBAAkB,EAAE,CAAC;QAClC,MAAM,MAAM,GAAG,cAAc,EAAE,CAAC;QAChC,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;QAC/B,MAAM,OAAO,GAAG,uBAAuB,EAAE,CAAC;QAE1C,QAAQ,CAAC,KAAK,CAAC;YACb,OAAO,EAAE;gBACP,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAE;gBACxE,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAE;gBAC5E,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE;aAC5D;YACD,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;gBACrB,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;gBAClC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;gBACrC,OAAO;oBACL,GAAG;oBACH,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;oBACpB,MAAM,EAAE,YAAY,CAAC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC;iBACxD,CAAC;YACJ,CAAC,CAAC;YACF,YAAY,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC;SACzC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../src/commands/data.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../src/commands/data.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAwBtD;;;;;GAKG;AACH,eAAO,MAAM,WAAW,qBAGH,CAAC"}
|
package/dist/commands/data.js
CHANGED
|
@@ -10,11 +10,11 @@ import { runBatch } from "./batch-processor.js";
|
|
|
10
10
|
import { t } from "../i18n/index.js";
|
|
11
11
|
import { terminal, createDataFormatsTableModel, createAnnotateOptionsTableModel, } from "../output/index.js";
|
|
12
12
|
import { toDataFormatInfoVMList, toAnnotateOptionsVM } from "./mappers.js";
|
|
13
|
-
import { LANG_CODE_REGEX } from "../constants.js";
|
|
13
|
+
import { LANG_CODE_REGEX } from "../shared/constants.js";
|
|
14
14
|
import { getLogger } from "../logging/index.js";
|
|
15
15
|
import { ErrorCode } from "../errors/codes.js";
|
|
16
16
|
import { failCommand, handleCommandError } from "./error-handler.js";
|
|
17
|
-
import {
|
|
17
|
+
import { tryExpandFileArgs, tryMatchDirectoryPairs, resolveOutputPaths, } from "../runtime/file-args.js";
|
|
18
18
|
import { getCurrentAbortSignal } from "../runtime/request-context.js";
|
|
19
19
|
const log = getLogger(import.meta.url);
|
|
20
20
|
/**
|
|
@@ -51,28 +51,23 @@ dataCommand
|
|
|
51
51
|
return;
|
|
52
52
|
}
|
|
53
53
|
if (inputFiles.length === 0) {
|
|
54
|
-
failCommand(ErrorCode.VALIDATION, "
|
|
54
|
+
failCommand(ErrorCode.VALIDATION, t("validate.missing_argument", { name: "input-files" }));
|
|
55
55
|
return;
|
|
56
56
|
}
|
|
57
57
|
if (!opts.lang) {
|
|
58
|
-
failCommand(ErrorCode.VALIDATION, "
|
|
58
|
+
failCommand(ErrorCode.VALIDATION, t("validate.missing_option", { option: "-l, --lang <code>" }));
|
|
59
59
|
return;
|
|
60
60
|
}
|
|
61
61
|
if (!LANG_CODE_REGEX.test(opts.lang)) {
|
|
62
62
|
failCommand(ErrorCode.ZOD_VALIDATION, t("data.annotate.invalid_lang"), t("data.annotate.lang_hint"));
|
|
63
63
|
return;
|
|
64
64
|
}
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
catch (error) {
|
|
70
|
-
if (error instanceof FileArgError) {
|
|
71
|
-
failCommand(ErrorCode.VALIDATION, error.message);
|
|
72
|
-
return;
|
|
73
|
-
}
|
|
74
|
-
throw error;
|
|
65
|
+
const expandResult = tryExpandFileArgs(inputFiles);
|
|
66
|
+
if (!expandResult.ok) {
|
|
67
|
+
failCommand(ErrorCode.VALIDATION, expandResult.message);
|
|
68
|
+
return;
|
|
75
69
|
}
|
|
70
|
+
const resolvedFiles = expandResult.files;
|
|
76
71
|
const lang = opts.lang;
|
|
77
72
|
const outputPaths = resolveOutputPaths(resolvedFiles, "_annotated", opts.out, "jsonl.zst");
|
|
78
73
|
const client = getApiClient();
|
|
@@ -150,7 +145,7 @@ dataCommand
|
|
|
150
145
|
return;
|
|
151
146
|
}
|
|
152
147
|
if (sourceFiles.length === 0) {
|
|
153
|
-
failCommand(ErrorCode.VALIDATION, "
|
|
148
|
+
failCommand(ErrorCode.VALIDATION, t("validate.missing_argument", { name: "source-files" }));
|
|
154
149
|
return;
|
|
155
150
|
}
|
|
156
151
|
// Detect directory mode
|
|
@@ -160,7 +155,7 @@ dataCommand
|
|
|
160
155
|
sourceIsDir = statSync(firstResolved).isDirectory();
|
|
161
156
|
}
|
|
162
157
|
catch {
|
|
163
|
-
// Will be caught by
|
|
158
|
+
// Will be caught by tryExpandFileArgs below
|
|
164
159
|
}
|
|
165
160
|
const targetIsDir = opts.target != null &&
|
|
166
161
|
(() => {
|
|
@@ -173,11 +168,11 @@ dataCommand
|
|
|
173
168
|
})();
|
|
174
169
|
// Validate dir/file consistency
|
|
175
170
|
if (sourceIsDir && opts.target && !targetIsDir) {
|
|
176
|
-
failCommand(ErrorCode.VALIDATION, "
|
|
171
|
+
failCommand(ErrorCode.VALIDATION, t("validate.data.score.source_dir_target_file"));
|
|
177
172
|
return;
|
|
178
173
|
}
|
|
179
174
|
if (!sourceIsDir && targetIsDir) {
|
|
180
|
-
failCommand(ErrorCode.VALIDATION, "
|
|
175
|
+
failCommand(ErrorCode.VALIDATION, t("validate.data.score.target_dir_source_file"));
|
|
181
176
|
return;
|
|
182
177
|
}
|
|
183
178
|
const client = getApiClient();
|
|
@@ -186,20 +181,23 @@ dataCommand
|
|
|
186
181
|
log.info("Command started", { command: "data score" });
|
|
187
182
|
// --- Directory parallel mode: match source/target by filename ---
|
|
188
183
|
if (sourceIsDir && targetIsDir && opts.target) {
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
catch (error) {
|
|
194
|
-
if (error instanceof FileArgError) {
|
|
195
|
-
failCommand(ErrorCode.VALIDATION, error.message);
|
|
196
|
-
return;
|
|
197
|
-
}
|
|
198
|
-
throw error;
|
|
184
|
+
const pairResult = tryMatchDirectoryPairs(firstResolved, resolve(opts.target));
|
|
185
|
+
if (!pairResult.ok) {
|
|
186
|
+
failCommand(ErrorCode.VALIDATION, pairResult.message);
|
|
187
|
+
return;
|
|
199
188
|
}
|
|
189
|
+
const pairs = pairResult.pairs;
|
|
200
190
|
const outputPaths = resolveOutputPaths(pairs.map(([src]) => src), "_scored", opts.out, opts.format);
|
|
201
191
|
await (pairs.length === 1
|
|
202
|
-
? scoreSingleFile(
|
|
192
|
+
? scoreSingleFile({
|
|
193
|
+
client,
|
|
194
|
+
sourceFile: pairs[0][0],
|
|
195
|
+
outputPath: outputPaths[0],
|
|
196
|
+
outputFormat: opts.format,
|
|
197
|
+
signal,
|
|
198
|
+
startMs,
|
|
199
|
+
targetFile: pairs[0][1],
|
|
200
|
+
})
|
|
203
201
|
: runBatch({
|
|
204
202
|
items: pairs,
|
|
205
203
|
label: ([src]) => basename(src),
|
|
@@ -228,33 +226,31 @@ dataCommand
|
|
|
228
226
|
return;
|
|
229
227
|
}
|
|
230
228
|
// --- File mode (single or multiple, bitext or parallel) ---
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
catch (error) {
|
|
236
|
-
if (error instanceof FileArgError) {
|
|
237
|
-
failCommand(ErrorCode.VALIDATION, error.message);
|
|
238
|
-
return;
|
|
239
|
-
}
|
|
240
|
-
throw error;
|
|
229
|
+
const fileResult = tryExpandFileArgs(sourceFiles);
|
|
230
|
+
if (!fileResult.ok) {
|
|
231
|
+
failCommand(ErrorCode.VALIDATION, fileResult.message);
|
|
232
|
+
return;
|
|
241
233
|
}
|
|
234
|
+
const resolvedFiles = fileResult.files;
|
|
242
235
|
// Validate target file exists (if provided for non-dir mode)
|
|
243
236
|
if (opts.target) {
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
if (error instanceof FileArgError) {
|
|
249
|
-
failCommand(ErrorCode.VALIDATION, error.message);
|
|
250
|
-
return;
|
|
251
|
-
}
|
|
252
|
-
throw error;
|
|
237
|
+
const targetResult = tryExpandFileArgs([opts.target]);
|
|
238
|
+
if (!targetResult.ok) {
|
|
239
|
+
failCommand(ErrorCode.VALIDATION, targetResult.message);
|
|
240
|
+
return;
|
|
253
241
|
}
|
|
254
242
|
}
|
|
255
243
|
const outputPaths = resolveOutputPaths(resolvedFiles, "_scored", opts.out, opts.format);
|
|
256
244
|
await (resolvedFiles.length === 1
|
|
257
|
-
? scoreSingleFile(
|
|
245
|
+
? scoreSingleFile({
|
|
246
|
+
client,
|
|
247
|
+
sourceFile: resolvedFiles[0],
|
|
248
|
+
outputPath: outputPaths[0],
|
|
249
|
+
outputFormat: opts.format,
|
|
250
|
+
signal,
|
|
251
|
+
startMs,
|
|
252
|
+
targetFile: opts.target,
|
|
253
|
+
})
|
|
258
254
|
: runBatch({
|
|
259
255
|
items: resolvedFiles,
|
|
260
256
|
label: (f) => basename(f),
|
|
@@ -280,8 +276,8 @@ dataCommand
|
|
|
280
276
|
duration_ms: String(Date.now() - startMs),
|
|
281
277
|
});
|
|
282
278
|
});
|
|
283
|
-
|
|
284
|
-
|
|
279
|
+
async function scoreSingleFile(opts) {
|
|
280
|
+
const { client, sourceFile, outputPath, outputFormat, signal, startMs, targetFile } = opts;
|
|
285
281
|
try {
|
|
286
282
|
terminal.success(t("data.score.upload_status"));
|
|
287
283
|
const response = await client.data.score({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data.js","sourceRoot":"","sources":["../../src/commands/data.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"data.js","sourceRoot":"","sources":["../../src/commands/data.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ import { t } from "../i18n/index.js";
|
|
|
13
13
|
import { getLogger } from "../logging/index.js";
|
|
14
14
|
import { ErrorCode } from "../errors/codes.js";
|
|
15
15
|
import { failCommand, handleCommandError } from "./error-handler.js";
|
|
16
|
-
import {
|
|
16
|
+
import { tryExpandFileArgs, resolveOutputPaths } from "../runtime/file-args.js";
|
|
17
17
|
const log = getLogger(import.meta.url);
|
|
18
18
|
/** Accepted metric names (case-insensitive). */
|
|
19
19
|
const VALID_METRICS = new Set(["bleu", "chrf", "metricx", "comet"]);
|
|
@@ -198,23 +198,18 @@ evaluateCommand
|
|
|
198
198
|
return;
|
|
199
199
|
}
|
|
200
200
|
if (files.length === 0) {
|
|
201
|
-
failCommand(ErrorCode.VALIDATION, "
|
|
201
|
+
failCommand(ErrorCode.VALIDATION, t("validate.missing_argument", { name: "files" }));
|
|
202
202
|
return;
|
|
203
203
|
}
|
|
204
204
|
const metricList = parseAndValidateMetrics(opts.metrics);
|
|
205
205
|
if (!metricList)
|
|
206
206
|
return;
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
catch (error) {
|
|
212
|
-
if (error instanceof FileArgError) {
|
|
213
|
-
failCommand(ErrorCode.VALIDATION, error.message);
|
|
214
|
-
return;
|
|
215
|
-
}
|
|
216
|
-
throw error;
|
|
207
|
+
const expandResult = tryExpandFileArgs(files);
|
|
208
|
+
if (!expandResult.ok) {
|
|
209
|
+
failCommand(ErrorCode.VALIDATION, expandResult.message);
|
|
210
|
+
return;
|
|
217
211
|
}
|
|
212
|
+
const resolvedFiles = expandResult.files;
|
|
218
213
|
const outputPaths = resolveOutputPaths(resolvedFiles, "_scored", opts.out, opts.outputFormat);
|
|
219
214
|
const client = getApiClient();
|
|
220
215
|
const startMs = Date.now();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evaluate.js","sourceRoot":"","sources":["../../src/commands/evaluate.ts"],"names":[],"mappings":"AAAA,wFAAwF;AACxF,kFAAkF;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EACL,QAAQ,EACR,0BAA0B,EAC1B,yBAAyB,GAC1B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAC5E,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,CAAC,EAAE,MAAM,kBAAkB,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"evaluate.js","sourceRoot":"","sources":["../../src/commands/evaluate.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,6 +55,7 @@ export interface TrackJobOptions {
|
|
|
55
55
|
* @param jobId - Job ID to track
|
|
56
56
|
* @param options - Tracking configuration
|
|
57
57
|
* @throws JobError if job failed or was cancelled
|
|
58
|
+
* @throws CancelledError if aborted via AbortSignal (Ctrl+C)
|
|
58
59
|
*/
|
|
59
60
|
export declare function trackJob(client: APIClient, jobId: string, options?: TrackJobOptions): Promise<void>;
|
|
60
61
|
//# sourceMappingURL=job-tracking.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job-tracking.d.ts","sourceRoot":"","sources":["../../src/commands/job-tracking.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"job-tracking.d.ts","sourceRoot":"","sources":["../../src/commands/job-tracking.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAkBlD,+DAA+D;AAC/D,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,SAAK,GAAG,MAAM,CAIhE;AAID,yCAAyC;AACzC,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,QAAQ,GAAG,WAAW,CAAC;IAClD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,YAAY,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,2DAA2D;AAC3D,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC;CAC/F;AAID;;;GAGG;AACH,qBAAa,UAAW,YAAW,UAAU;IAC3C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAY;gBAEvB,MAAM,EAAE,SAAS;IAIvB,KAAK,CACT,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,UAAU,EACtB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;CAkC7B;AAID;;;GAGG;AACH,qBAAa,cAAe,YAAW,UAAU;IAC/C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAY;IACnC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;gBAE1B,MAAM,EAAE,SAAS,EAAE,YAAY,GAAE,MAA8B;IAKrE,KAAK,CACT,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,UAAU,EACtB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;CAgD7B;AAID,qCAAqC;AACrC,MAAM,WAAW,eAAe;IAC9B,kDAAkD;IAClD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,8EAA8E;IAC9E,QAAQ,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,SAAS,CAAC;IACtC,wDAAwD;IACxD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,uFAAuF;IACvF,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,uFAAuF;IACvF,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,2EAA2E;IAC3E,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED;;;;;;;;GAQG;AACH,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,SAAS,EACjB,KAAK,EAAE,MAAM,EACb,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,IAAI,CAAC,CA4Ff"}
|
|
@@ -5,10 +5,10 @@
|
|
|
5
5
|
// Display: ora spinner with progress percentage and step text.
|
|
6
6
|
import ora, {} from "ora";
|
|
7
7
|
import { SSEClient } from "../api/sse-client.js";
|
|
8
|
-
import { JobError, RateLimitError } from "../errors/contracts.js";
|
|
8
|
+
import { CancelledError, JobError, RateLimitError } from "../errors/contracts.js";
|
|
9
9
|
import { t } from "../i18n/index.js";
|
|
10
10
|
import { terminal } from "../output/terminal.js";
|
|
11
|
-
import { DEFAULT_POLL_INTERVAL, Endpoint, JobStatus, MAX_POLL_INTERVAL } from "../constants.js";
|
|
11
|
+
import { DEFAULT_POLL_INTERVAL, Endpoint, JobStatus, MAX_POLL_INTERVAL, } from "../shared/constants.js";
|
|
12
12
|
import { getProgressContext } from "../runtime/progress-context.js";
|
|
13
13
|
import { getCurrentAbortSignal } from "../runtime/request-context.js";
|
|
14
14
|
import { getLogger } from "../logging/index.js";
|
|
@@ -131,6 +131,7 @@ export class PollingTracker {
|
|
|
131
131
|
* @param jobId - Job ID to track
|
|
132
132
|
* @param options - Tracking configuration
|
|
133
133
|
* @throws JobError if job failed or was cancelled
|
|
134
|
+
* @throws CancelledError if aborted via AbortSignal (Ctrl+C)
|
|
134
135
|
*/
|
|
135
136
|
export async function trackJob(client, jobId, options = {}) {
|
|
136
137
|
const { description = "Processing", strategy = getSettings().cli.job_tracking_strategy, pollInterval = DEFAULT_POLL_INTERVAL, signal: externalSignal, silent = false, onProgress: externalOnProgress, } = options;
|
|
@@ -161,12 +162,18 @@ export async function trackJob(client, jobId, options = {}) {
|
|
|
161
162
|
// Strategy dispatch
|
|
162
163
|
if (strategy === "sse") {
|
|
163
164
|
result = await new SSETracker(client).track(jobId, onProgress, signal);
|
|
165
|
+
if (signal?.aborted) {
|
|
166
|
+
throw new CancelledError();
|
|
167
|
+
}
|
|
164
168
|
if (result === null) {
|
|
165
169
|
throw new JobError(t("job_tracking.sse_unavailable"));
|
|
166
170
|
}
|
|
167
171
|
}
|
|
168
172
|
else if (strategy === "auto") {
|
|
169
173
|
result = await new SSETracker(client).track(jobId, onProgress, signal);
|
|
174
|
+
if (signal?.aborted) {
|
|
175
|
+
throw new CancelledError();
|
|
176
|
+
}
|
|
170
177
|
if (result === null) {
|
|
171
178
|
log.debug("SSE fallback to polling", { jobId });
|
|
172
179
|
terminal.dim(t("job_tracking.sse_unavailable"));
|
|
@@ -175,19 +182,20 @@ export async function trackJob(client, jobId, options = {}) {
|
|
|
175
182
|
if (strategy === "polling" || result === null) {
|
|
176
183
|
result = await new PollingTracker(client, pollInterval).track(jobId, onProgress, signal);
|
|
177
184
|
}
|
|
178
|
-
|
|
185
|
+
// User cancel (Ctrl+C): catch block handles cleanup + server cancel
|
|
186
|
+
if (signal?.aborted || result === null) {
|
|
187
|
+
throw new CancelledError();
|
|
188
|
+
}
|
|
189
|
+
log.debug("trackJob complete", { jobId, success: String(result.success) });
|
|
179
190
|
// Handle terminal result
|
|
180
|
-
if (result
|
|
191
|
+
if (result.success) {
|
|
181
192
|
animator.complete();
|
|
182
193
|
spinner?.succeed("Complete");
|
|
183
194
|
return;
|
|
184
195
|
}
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
throw new JobError(result.error ?? "Unknown error");
|
|
189
|
-
}
|
|
190
|
-
throw new JobError("Unknown job tracking state");
|
|
196
|
+
animator.stop();
|
|
197
|
+
spinner?.fail();
|
|
198
|
+
throw new JobError(result.error ?? "Unknown error");
|
|
191
199
|
}
|
|
192
200
|
catch (error) {
|
|
193
201
|
// Cleanup animator + spinner on any error (including SIGINT / KeyboardInterrupt)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job-tracking.js","sourceRoot":"","sources":["../../src/commands/job-tracking.ts"],"names":[],"mappings":"AAAA,sDAAsD;AACtD,EAAE;AACF,+FAA+F;AAC/F,4FAA4F;AAC5F,+DAA+D;AAE/D,OAAO,GAAG,EAAE,EAAY,MAAM,KAAK,CAAC;AAEpC,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"job-tracking.js","sourceRoot":"","sources":["../../src/commands/job-tracking.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"progress-animator.d.ts","sourceRoot":"","sources":["../../src/commands/progress-animator.ts"],"names":[],"mappings":"AAIA,8EAA8E;AAC9E,MAAM,MAAM,UAAU,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"progress-animator.d.ts","sourceRoot":"","sources":["../../src/commands/progress-animator.ts"],"names":[],"mappings":"AAIA,8EAA8E;AAC9E,MAAM,MAAM,UAAU,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;AAW3E;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,MAAM,CAAK;IACnB,OAAO,CAAC,IAAI,CAAuB;IACnC,OAAO,CAAC,WAAW,CAAM;IACzB,OAAO,CAAC,KAAK,CAA+C;IAC5D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAa;gBAE5B,UAAU,EAAE,UAAU,EAAE,MAAM,SAAkB;IAO5D,gDAAgD;IAChD,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAQrD,4DAA4D;IAC5D,QAAQ,IAAI,IAAI;IAMhB,mEAAmE;IACnE,IAAI,IAAI,IAAI;IAIZ,OAAO,CAAC,IAAI;IAmBZ,yDAAyD;IACzD,OAAO,CAAC,mBAAmB;IAQ3B,OAAO,CAAC,IAAI;IAQZ,OAAO,CAAC,UAAU;CAMnB"}
|
|
@@ -3,6 +3,8 @@
|
|
|
3
3
|
// Sits between SSE/polling callbacks and downstream progress display (ora / REPL context).
|
|
4
4
|
/** Trickle progress cap — never exceeds this without real "complete" signal. */
|
|
5
5
|
const TRICKLE_CAP = 95;
|
|
6
|
+
/** NProgress-inspired thresholds for diminishing trickle speed. */
|
|
7
|
+
const TRICKLE_THRESHOLDS = { slow: 20, medium: 50, fast: 80 };
|
|
6
8
|
/** Default tick interval in milliseconds. */
|
|
7
9
|
const DEFAULT_TICK_MS = 150;
|
|
8
10
|
/**
|
|
@@ -64,11 +66,11 @@ export class ProgressAnimator {
|
|
|
64
66
|
}
|
|
65
67
|
/** NProgress-inspired diminishing trickle increments. */
|
|
66
68
|
getTrickleIncrement(current) {
|
|
67
|
-
if (current <
|
|
69
|
+
if (current < TRICKLE_THRESHOLDS.slow)
|
|
68
70
|
return 1;
|
|
69
|
-
if (current <
|
|
71
|
+
if (current < TRICKLE_THRESHOLDS.medium)
|
|
70
72
|
return 0.5;
|
|
71
|
-
if (current <
|
|
73
|
+
if (current < TRICKLE_THRESHOLDS.fast)
|
|
72
74
|
return 0.2;
|
|
73
75
|
if (current < TRICKLE_CAP)
|
|
74
76
|
return 0.05;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"progress-animator.js","sourceRoot":"","sources":["../../src/commands/progress-animator.ts"],"names":[],"mappings":"AAAA,sDAAsD;AACtD,8EAA8E;AAC9E,2FAA2F;AAK3F,gFAAgF;AAChF,MAAM,WAAW,GAAG,EAAE,CAAC;AAEvB,6CAA6C;AAC7C,MAAM,eAAe,GAAG,GAAG,CAAC;AAE5B;;;;;;GAMG;AACH,MAAM,OAAO,gBAAgB;IACnB,OAAO,GAAG,CAAC,CAAC;IACZ,MAAM,GAAG,CAAC,CAAC;IACX,IAAI,GAAkB,IAAI,CAAC;IAC3B,WAAW,GAAG,CAAC,CAAC,CAAC;IACjB,KAAK,GAA0C,IAAI,CAAC;IAC3C,UAAU,CAAa;IAExC,YAAY,UAAsB,EAAE,MAAM,GAAG,eAAe;QAC1D,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE;YAC5B,IAAI,CAAC,IAAI,EAAE,CAAC;QACd,CAAC,EAAE,MAAM,CAAC,CAAC;IACb,CAAC;IAED,gDAAgD;IAChD,SAAS,CAAC,OAAe,EAAE,IAAmB;QAC5C,qBAAqB;QACrB,IAAI,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;YAC1B,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC;QACxB,CAAC;QACD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,4DAA4D;IAC5D,QAAQ;QACN,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC;QACnB,IAAI,CAAC,IAAI,EAAE,CAAC;IACd,CAAC;IAED,mEAAmE;IACnE,IAAI;QACF,IAAI,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC;IAEO,IAAI;QACV,IAAI,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;YAC/B,kEAAkE;YAClE,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;YACvC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,GAAG,GAAG,CAAC,CAAC;YACvC,yBAAyB;YACzB,IAAI,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;gBAC/B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC;YAC7B,CAAC;QACH,CAAC;aAAM,CAAC;YACN,uCAAuC;YACvC,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACzD,IAAI,SAAS,KAAK,CAAC;gBAAE,OAAO;YAC5B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,GAAG,SAAS,EAAE,WAAW,CAAC,CAAC;QACjE,CAAC;QAED,IAAI,CAAC,IAAI,EAAE,CAAC;IACd,CAAC;IAED,yDAAyD;IACjD,mBAAmB,CAAC,OAAe;QACzC,IAAI,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"progress-animator.js","sourceRoot":"","sources":["../../src/commands/progress-animator.ts"],"names":[],"mappings":"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"}
|