@camstack/addon-training 0.1.21 → 0.1.23

package/dist/orchestrator/training.addon.mjs

@@ -1,4 +1,4 @@
-import { a as addonPagesSourceCapability, i as TrainingResultSchema, l as BaseAddon, n as TrainingJobSchema, o as parseTrainingEventLine, r as TrainingJobSpecSchema, s as trainingCapability, t as TRAINING_JOB_SCHEMA } from "../dist-BSYBh1ZO.mjs";
+import { a as addonPagesSourceCapability, i as TrainingResultSchema, l as BaseAddon, n as TrainingJobSchema, o as parseTrainingEventLine, r as TrainingJobSpecSchema, s as trainingCapability, t as TRAINING_JOB_SCHEMA } from "../dist-CVDWIKl7.mjs";
 import path from "node:path";
 import { createHash } from "node:crypto";
 import { createReadStream } from "node:fs";
@@ -30,6 +30,13 @@ function providerPort(api) {
 				addonId
 			});
 		},
+		updateEntry: async (i) => {
+			const addonId = await addonForEntry(i.entryId);
+			return p.updateEntry.mutate({
+				...i,
+				addonId
+			});
+		},
 		deleteEntry: async (i) => {
 			const addonId = await addonForEntry(i.entryId);
 			return p.deleteEntry.mutate({

package/dist/{player-overlays-BR2_H0wZ.mjs → player-overlays-BFAqW2L1.mjs}

@@ -1,10 +1,10 @@
-import { S as e, _ as t, l as n, u as r } from "./_virtual_mf___mfe_internal__addon_training_page__loadShare__react__loadShare__.js-DeDbF7NI.mjs";
-import { b as i, y as a } from "./responsive-emJo3EdF.mjs";
-import { n as o, r as s, t as c } from "./_virtual_mf___mfe_internal__addon_training_page__loadShare__react_mf_1_jsx_mf_2_runtime__loadShare__.js-DnrbBvrw.mjs";
-var l = i("chevron-down", [["path", {
+import { b as e, g as t, l as n, u as r } from "./_virtual_mf___mfe_internal__addon_training_page__loadShare__react__loadShare__.js-BT_wL8s3.mjs";
+import { v as i, y as a } from "./responsive-BBlQWFFi.mjs";
+import { n as o, r as s, t as c } from "./_virtual_mf___mfe_internal__addon_training_page__loadShare__react_mf_1_jsx_mf_2_runtime__loadShare__.js-DDBEvLdo.mjs";
+var l = a("chevron-down", [["path", {
 	d: "m6 9 6 6 6-6",
 	key: "qrunsl"
-}]]), u = i("chevron-right", [["path", {
+}]]), u = a("chevron-right", [["path", {
 	d: "m9 18 6-6-6-6",
 	key: "mthhwq"
 }]]);
@@ -32,35 +32,13 @@ function d({ title: e, icon: n, headerRight: r, collapsible: i = !1, defaultOpen
 		}) : null]
 	});
 }
-function f({ label: e, icon: t, children: n, footer: r }) {
-	return /* @__PURE__ */ s("div", {
-		className: "min-w-0 rounded-lg border border-border bg-surface p-2 sm:p-2.5",
-		children: [
-			/* @__PURE__ */ s("div", {
-				className: "mb-0.5 flex min-w-0 items-center gap-1.5 text-[10px] uppercase tracking-wider text-foreground-subtle",
-				children: [t, /* @__PURE__ */ o("span", {
-					className: "min-w-0 truncate",
-					children: e
-				})]
-			}),
-			/* @__PURE__ */ o("div", {
-				className: "truncate text-lg font-semibold leading-tight text-foreground",
-				children: n
-			}),
-			r == null ? null : /* @__PURE__ */ o("div", {
-				className: "mt-0.5 truncate text-[10px] text-foreground-subtle",
-				children: r
-			})
-		]
-	});
-}
-e(), a("camstack:player-overlays-state", null);
-var p = a("camstack:player-overlays-actions", null);
-function m(e) {
-	let t = n(p);
+e(), i("camstack:player-overlays-state", null);
+var f = i("camstack:player-overlays-actions", null);
+function p(e) {
+	let t = n(f);
 	r(() => {
 		if (!(!t || !e)) return t.setLayer(e), () => t.removeLayer(e.id);
 	}, [t, e]);
 }
 //#endregion
-export { l as a, u as i, f as n, d as r, m as t };
+export { l as i, d as n, u as r, p as t };

package/dist/providers/modal/training-modal.addon.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_dist = require("../../dist-BCLkrWJc.js");
+const require_dist = require("../../dist-DwF1P1v7.js");
 let node_path = require("node:path");
 node_path = require_dist.__toESM(node_path, 1);
 let node_crypto = require("node:crypto");
@@ -11,14 +11,43 @@ let timers_promises = require("timers/promises");
 let node_console = require("node:console");
 let node_os = require("node:os");
 let node_stream = require("node:stream");
-//#region src/providers/modal/modal-entries.ts
+//#region src/providers/modal/entry-secret-view.ts
 /**
-* Modal provider entries — one credentials + defaults row per operator
-* account. Pure helpers so the store is unit-tested without BaseAddon.
+* Build the {@link SecretFieldView} the Providers edit form needs for an
+* entry's token secret.
 *
-* A pre-multi-entry config (flat tokenId/tokenSecret on the addon) migrates
-* to a single entry named {@link DEFAULT_MODAL_ENTRY_NAME}.
+* `readStoredGlobalKey` / `this.config` answer VALUES (D798), never markers —
+* so `toSecretFieldView(plaintext)` alone yields an inline view (`$secret:
+* null`) and `SecretFieldControl` cannot reveal. When the secret is set we
+* prefer the deterministic keychain ref (`ctx.secrets.ref`) so the eye can
+* call `keychain-admin.reveal` (D789).
 */
+/** View for one entry row, or `null` when nothing is stored. */
+function entryTokenSecretView(tokenSecret, secrets, entryId) {
+	if (require_dist.isSecretMarker(tokenSecret)) return require_dist.toSecretFieldView(tokenSecret);
+	const plain = typeof tokenSecret === "string" ? tokenSecret.trim() : "";
+	if (plain === "") return null;
+	if (secrets === void 0) return require_dist.toSecretFieldView(plain);
+	return {
+		$secret: secrets.ref(require_dist.globalSecretScope(), require_dist.arrayItemFieldPath("entries", entryId, "tokenSecret")),
+		v: 1,
+		set: true
+	};
+}
+/** View for the legacy flat `tokenSecret` (pre-multi-entry Default). */
+function flatTokenSecretView(tokenSecret, secrets) {
+	if (require_dist.isSecretMarker(tokenSecret)) return require_dist.toSecretFieldView(tokenSecret);
+	const plain = typeof tokenSecret === "string" ? tokenSecret.trim() : "";
+	if (plain === "") return null;
+	if (secrets === void 0) return require_dist.toSecretFieldView(plain);
+	return {
+		$secret: secrets.ref(require_dist.globalSecretScope(), "tokenSecret"),
+		v: 1,
+		set: true
+	};
+}
+//#endregion
+//#region src/providers/modal/modal-entries.ts
 var MODAL_TYPE_ID = "modal";
 var DEFAULT_MODAL_ENTRY_NAME = "Default";
 var MODAL_ICON_ASSET = "assets/training-modal/icon.svg";
@@ -29,22 +58,44 @@ var DEFAULT_GRACE = 24;
 function legacyConfigured(config) {
 	return (config.tokenId ?? "").trim() !== "" || (config.tokenSecret ?? "").trim() !== "";
 }
+/**
+* Keychain / secretStatePaths may omit an empty `tokenSecret` from a stored
+* row (writing `''` is KEEP, not "store empty"). Readers must never see
+* `undefined` and then call `.trim()`.
+*/
+function secretAsString(value) {
+	return typeof value === "string" ? value : "";
+}
+function normalizeModalEntry(entry) {
+	return {
+		id: entry.id,
+		name: entry.name ?? "Default",
+		tokenId: entry.tokenId ?? "",
+		tokenSecret: secretAsString(entry.tokenSecret),
+		environment: entry.environment ?? "",
+		gpuType: entry.gpuType ?? DEFAULT_GPU,
+		region: entry.region ?? "",
+		costCapUsd: entry.costCapUsd ?? DEFAULT_COST,
+		maxRuntimeHours: entry.maxRuntimeHours ?? DEFAULT_HOURS,
+		failedDatasetGraceHours: entry.failedDatasetGraceHours ?? DEFAULT_GRACE
+	};
+}
 /** Entries the operator sees — synthesises Default from legacy flat fields. */
 function effectiveModalEntries(config) {
-	if (config.entries.length > 0) return config.entries;
+	if (config.entries.length > 0) return config.entries.map((e) => normalizeModalEntry(e));
 	if (!legacyConfigured(config)) return [];
-	return [{
+	return [normalizeModalEntry({
 		id: "legacy-default",
 		name: DEFAULT_MODAL_ENTRY_NAME,
-		tokenId: config.tokenId ?? "",
-		tokenSecret: config.tokenSecret ?? "",
-		environment: config.environment ?? "",
-		gpuType: config.gpuType ?? DEFAULT_GPU,
-		region: config.region ?? "",
-		costCapUsd: config.costCapUsd ?? DEFAULT_COST,
-		maxRuntimeHours: config.maxRuntimeHours ?? DEFAULT_HOURS,
-		failedDatasetGraceHours: config.failedDatasetGraceHours ?? DEFAULT_GRACE
-	}];
+		tokenId: config.tokenId,
+		tokenSecret: config.tokenSecret,
+		environment: config.environment,
+		gpuType: config.gpuType,
+		region: config.region,
+		costCapUsd: config.costCapUsd,
+		maxRuntimeHours: config.maxRuntimeHours,
+		failedDatasetGraceHours: config.failedDatasetGraceHours
+	})];
 }
 function findModalEntry(config, entryId) {
 	return effectiveModalEntries(config).find((e) => e.id === entryId) ?? null;
@@ -128,6 +179,43 @@ function deleteModalEntry(config, entryId) {
 		}
 	};
 }
+function updateModalEntry(config, entryId, patch) {
+	const current = [...effectiveModalEntries(config)];
+	const index = current.findIndex((e) => e.id === entryId);
+	if (index < 0) return {
+		ok: false,
+		reason: "unknown-entry"
+	};
+	const prev = current[index];
+	const secret = patch.tokenSecret !== void 0 && patch.tokenSecret !== "" ? patch.tokenSecret : prev.tokenSecret;
+	current[index] = {
+		id: prev.id,
+		name: patch.name !== void 0 ? patch.name : prev.name,
+		tokenId: patch.tokenId !== void 0 ? patch.tokenId : prev.tokenId,
+		tokenSecret: secret,
+		environment: patch.environment !== void 0 ? patch.environment : prev.environment,
+		gpuType: patch.gpuType !== void 0 ? patch.gpuType : prev.gpuType,
+		region: patch.region !== void 0 ? patch.region : prev.region,
+		costCapUsd: patch.costCapUsd !== void 0 ? patch.costCapUsd : prev.costCapUsd,
+		maxRuntimeHours: patch.maxRuntimeHours !== void 0 ? patch.maxRuntimeHours : prev.maxRuntimeHours,
+		failedDatasetGraceHours: patch.failedDatasetGraceHours !== void 0 ? patch.failedDatasetGraceHours : prev.failedDatasetGraceHours
+	};
+	return {
+		ok: true,
+		entryId,
+		config: {
+			entries: current,
+			tokenId: "",
+			tokenSecret: "",
+			environment: config.environment ?? "",
+			gpuType: config.gpuType ?? DEFAULT_GPU,
+			region: config.region ?? "",
+			costCapUsd: config.costCapUsd ?? DEFAULT_COST,
+			maxRuntimeHours: config.maxRuntimeHours ?? DEFAULT_HOURS,
+			failedDatasetGraceHours: config.failedDatasetGraceHours ?? DEFAULT_GRACE
+		}
+	};
+}
 /**
 * Mint a stable id for every persisted entry that lacks one. Operator-typed
 * empty ids (legacy settings UI) must never stay empty — createEntry always
@@ -344,7 +432,10 @@ var ModalTrainingProvider = class {
 	constructor(deps) {
 		this.deps = deps;
 	}
-	describe = async () => this.deps.listEntries().map((entry) => this.descriptorOf(entry));
+	describe = async () => {
+		const views = await this.deps.secretViews();
+		return this.deps.listEntries().map((entry) => this.descriptorOf(entry, views.get(entry.id) ?? null));
+	};
 	describeTypes = async () => [{
 		typeId: MODAL_TYPE_ID,
 		label: "Modal",
@@ -359,6 +450,21 @@ var ModalTrainingProvider = class {
 		configured: this.entryConfigured(entry)
 	}));
 	createEntry = async (input) => this.deps.createEntry(input);
+	updateEntry = async (input) => {
+		const secret = input.tokenSecret === void 0 ? {} : require_dist.isSecretClear(input.tokenSecret) ? { clearTokenSecret: true } : input.tokenSecret === "" ? {} : { tokenSecret: input.tokenSecret };
+		await this.deps.updateEntry(input.entryId, {
+			name: input.name,
+			...input.tokenId !== void 0 ? { tokenId: input.tokenId } : {},
+			...secret,
+			...input.environment !== void 0 ? { environment: input.environment } : {},
+			...input.gpuType !== void 0 ? { gpuType: input.gpuType } : {},
+			...input.region !== void 0 ? { region: input.region } : {},
+			...input.costCapUsd !== void 0 ? { costCapUsd: input.costCapUsd } : {},
+			...input.maxRuntimeSec !== void 0 ? { maxRuntimeHours: input.maxRuntimeSec / 3600 } : {},
+			...input.failedDatasetGraceHours !== void 0 ? { failedDatasetGraceHours: input.failedDatasetGraceHours } : {}
+		});
+		return { ok: true };
+	};
 	deleteEntry = async (input) => {
 		await this.deps.deleteEntry(input.entryId);
 		return { ok: true };
@@ -636,9 +742,12 @@ var ModalTrainingProvider = class {
 		}))];
 	};
 	entryConfigured(entry) {
-		return entry.tokenId.trim() !== "" && entry.tokenSecret.trim() !== "";
+		const secret = typeof entry.tokenSecret === "string" ? entry.tokenSecret : "";
+		return (entry.tokenId ?? "").trim() !== "" && secret.trim() !== "";
 	}
-	descriptorOf(entry) {
+	descriptorOf(entry, tokenSecretView) {
+		const tokenId = entry.tokenId ?? "";
+		const environment = entry.environment ?? "";
 		return {
 			addonId: this.deps.addonId,
 			entryId: entry.id,
@@ -655,12 +764,16 @@ var ModalTrainingProvider = class {
 			dataResidencyNote: "Modal keeps the frames on a Volume of your workspace for the length of the job; the training container sees them only while it runs.",
 			configured: this.entryConfigured(entry),
 			defaults: {
-				gpuType: entry.gpuType,
-				region: entry.region,
-				costCapUsd: entry.costCapUsd,
-				maxRuntimeSec: Math.round(entry.maxRuntimeHours * 3600),
-				failedDatasetGraceHours: entry.failedDatasetGraceHours
-			}
+				gpuType: entry.gpuType ?? "L4",
+				region: entry.region ?? "",
+				costCapUsd: entry.costCapUsd ?? 5,
+				maxRuntimeSec: Math.round((entry.maxRuntimeHours ?? 4) * 3600),
+				failedDatasetGraceHours: entry.failedDatasetGraceHours ?? 24
+			},
+			tokenId,
+			environment,
+			hasTokenSecret: tokenSecretView !== null,
+			tokenSecretView
 		};
 	}
 	requireGateway(entryId) {
@@ -88513,6 +88626,12 @@ async function fetchText(url) {
 var TrainingModalAddon = class extends require_dist.BaseAddon {
 	ledgerState = null;
 	gateways = /* @__PURE__ */ new Map();
+	/**
+	* Entry secrets live on `entries[id].tokenSecret` (and legacy flat
+	* `tokenSecret`). Declared here — not via an editable-array form — so the
+	* Training → Providers page is the only UI that edits entries.
+	*/
+	secretStatePaths = ["entries[id].tokenSecret", "tokenSecret"];
 	constructor() {
 		super({
 			entries: [],
@@ -88528,9 +88647,15 @@ var TrainingModalAddon = class extends require_dist.BaseAddon {
 	}
 	async onInitialize() {
 		let next = this.config;
-		if (next.entries.length === 0) next = migrateLegacyModalConfig(next, () => (0, node_crypto.randomUUID)());
+		let migratedLegacy = false;
+		if (next.entries.length === 0) {
+			const migrated = migrateLegacyModalConfig(next, () => (0, node_crypto.randomUUID)());
+			migratedLegacy = migrated !== next;
+			next = migrated;
+		}
 		next = ensureModalEntryIds(next, () => (0, node_crypto.randomUUID)());
 		if (next !== this.config) await this.updateGlobalSettings(next);
+		if (migratedLegacy) await this.clearSecrets(["tokenSecret"]);
 		this.ledgerState = this.state(LEDGER_KEY, LedgerSchema, {});
 		const peer = this.ctx.peerBytes;
 		if (peer === void 0) throw new Error("training-modal needs the peer-bytes facility");
@@ -88545,12 +88670,28 @@ var TrainingModalAddon = class extends require_dist.BaseAddon {
 				await this.updateGlobalSettings(result.config);
 				return { entryId: result.entryId };
 			},
+			updateEntry: async (entryId, patch) => {
+				const { clearTokenSecret, ...rest } = patch;
+				const result = updateModalEntry(this.config, entryId, rest);
+				if (!result.ok) throw new Error(`cannot update entry: ${result.reason}`);
+				if (clearTokenSecret === true) await this.updateGlobalSettings({
+					...result.config,
+					entries: result.config.entries.map((entry) => entry.id === entryId ? {
+						...entry,
+						tokenSecret: require_dist.SECRET_CLEAR
+					} : entry)
+				});
+				else await this.updateGlobalSettings(result.config);
+				this.closeGateway(entryId);
+			},
 			deleteEntry: async (entryId) => {
 				const result = deleteModalEntry(this.config, entryId);
 				if (!result.ok) throw new Error(`cannot delete entry: ${result.reason}`);
 				await this.updateGlobalSettings(result.config);
+				await this.clearSecrets(["tokenSecret"]);
 				this.closeGateway(entryId);
 			},
+			secretViews: () => this.readEntrySecretViews(),
 			ledger: this.ledger(),
 			peer,
 			fetchText,
@@ -88559,7 +88700,10 @@ var TrainingModalAddon = class extends require_dist.BaseAddon {
 		});
 		this.ctx.logger.info("Modal training provider ready", { meta: {
 			entries: effectiveModalEntries(this.config).length,
-			configured: effectiveModalEntries(this.config).some((e) => e.tokenId.trim() !== "" && e.tokenSecret.trim() !== "")
+			configured: effectiveModalEntries(this.config).some((e) => {
+				const secret = typeof e.tokenSecret === "string" ? e.tokenSecret : "";
+				return (e.tokenId ?? "").trim() !== "" && secret.trim() !== "";
+			})
 		} });
 		return { providers: [{
 			capability: require_dist.trainingProviderCapability,
@@ -88577,15 +88721,18 @@ var TrainingModalAddon = class extends require_dist.BaseAddon {
 	gatewayFor(entryId) {
 		const entry = findModalEntry(this.config, entryId);
 		if (entry === null) return null;
-		if (entry.tokenId.trim() === "" || entry.tokenSecret.trim() === "") return null;
-		const key = `${entry.tokenId}\u0000${entry.environment}`;
+		const tokenId = (entry.tokenId ?? "").trim();
+		const tokenSecret = (typeof entry.tokenSecret === "string" ? entry.tokenSecret : "").trim();
+		if (tokenId === "" || tokenSecret === "") return null;
+		const environment = (entry.environment ?? "").trim();
+		const key = `${tokenId}\u0000${environment}`;
 		const cached = this.gateways.get(entryId);
 		if (cached !== void 0 && cached.key === key) return cached.gateway;
 		cached?.gateway.close();
 		const gateway = new ModalSdkGateway({
-			tokenId: entry.tokenId.trim(),
-			tokenSecret: entry.tokenSecret.trim(),
-			environment: entry.environment.trim()
+			tokenId,
+			tokenSecret,
+			environment
 		});
 		this.gateways.set(entryId, {
 			key,
@@ -88599,6 +88746,19 @@ var TrainingModalAddon = class extends require_dist.BaseAddon {
 		cached.gateway.close();
 		this.gateways.delete(entryId);
 	}
+	/**
+	* Keychain views for the Providers edit form. Addon-facing reads answer
+	* VALUES (D798), so we cannot recover markers from `readStoredGlobalKey`.
+	* When a secret is present on the resolved entry we emit the deterministic
+	* keychain ref (`ctx.secrets.ref`) so `SecretFieldControl` can reveal.
+	*/
+	async readEntrySecretViews() {
+		const map = /* @__PURE__ */ new Map();
+		const secrets = this.ctx.secrets;
+		for (const entry of effectiveModalEntries(this.config)) map.set(entry.id, entryTokenSecretView(entry.tokenSecret, secrets, entry.id));
+		map.set("legacy-default", flatTokenSecretView(this.config.tokenSecret, secrets));
+		return map;
+	}
 	ledger() {
 		const state = () => {
 			if (this.ledgerState === null) throw new Error("training-modal ledger not initialised");
@@ -88623,97 +88783,10 @@ var TrainingModalAddon = class extends require_dist.BaseAddon {
 	}
 	globalSettingsSchema() {
 		return this.schema({ sections: [{
-			id: "entries",
+			id: "providers",
 			title: "Modal accounts",
-			description: "Each entry is one Modal workspace token. Create entries from the Training → Providers tab; edit credentials here. Secrets stay in the CamStack keychain.",
-			fields: [{
-				type: "editable-array",
-				key: "entries",
-				label: "Entries",
-				itemIdKey: "id",
-				/** Create only via trainingProvider.createEntry (auto id). */
-				maxRows: 0,
-				emptyMessage: "No Modal entries yet — add one from Training → Providers.",
-				rowTitleTemplate: "{name}",
-				defaultItem: {
-					id: "",
-					name: "Default",
-					tokenId: "",
-					tokenSecret: "",
-					environment: "",
-					gpuType: "L4",
-					region: "",
-					costCapUsd: 5,
-					maxRuntimeHours: 4,
-					failedDatasetGraceHours: 24
-				},
-				itemFields: [
-					{
-						type: "text",
-						key: "name",
-						label: "Name"
-					},
-					{
-						type: "text",
-						key: "tokenId",
-						label: "Token id",
-						placeholder: "ak-…"
-					},
-					{
-						type: "password",
-						key: "tokenSecret",
-						label: "Token secret",
-						showToggle: true
-					},
-					{
-						type: "text",
-						key: "environment",
-						label: "Environment",
-						description: "Leave empty for the workspace default."
-					},
-					{
-						type: "select",
-						key: "gpuType",
-						label: "GPU",
-						options: MODAL_GPUS.map((g) => ({
-							value: g.id,
-							label: `${g.label} — $${g.usdPerHour.toFixed(2)}/h`
-						}))
-					},
-					{
-						type: "select",
-						key: "region",
-						label: "Region",
-						options: MODAL_REGIONS.map((r) => ({
-							value: r.id,
-							label: r.label
-						}))
-					},
-					{
-						type: "number",
-						key: "costCapUsd",
-						label: "Cost cap per job (USD)",
-						min: .5,
-						step: .5
-					},
-					{
-						type: "number",
-						key: "maxRuntimeHours",
-						label: "Maximum runtime (hours)",
-						min: .5,
-						max: 24,
-						step: .5
-					},
-					{
-						type: "number",
-						key: "failedDatasetGraceHours",
-						label: "Keep a failed job’s dataset (hours)",
-						min: 0,
-						max: 168,
-						step: 1
-					}
-				]
-			}]
+			description: "Create and edit Modal workspace entries under Training → Providers. Credentials stay in the CamStack keychain.",
+			fields: []
 		}] });
 	}
 };