npm - clawdlets - Versions diffs - 0.1.1 → 0.2.0 - Mend

clawdlets 0.1.1 → 0.2.0

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.

Files changed (88) hide show

package/dist/commands/secrets/init.js CHANGED Viewed

@@ -11,8 +11,7 @@ import { upsertSopsCreationRule } from "@clawdlets/core/lib/sops-config";
 import { sopsDecryptYamlFile, sopsEncryptYamlToFile } from "@clawdlets/core/lib/sops";
 import { getHostAgeKeySopsCreationRulePathRegex, getHostSecretsSopsCreationRulePathRegex } from "@clawdlets/core/lib/sops-rules";
 import { sanitizeOperatorId } from "@clawdlets/core/lib/identifiers";
-import { buildFleetEnvSecretsPlan } from "@clawdlets/core/lib/fleet-env-secrets";
-import { getRecommendedSecretNameForEnvVar } from "@clawdlets/core/lib/llm-provider-env";
+import { buildFleetSecretsPlan } from "@clawdlets/core/lib/fleet-secrets";
 import { buildSecretsInitTemplate, isPlaceholderSecretValue, listSecretsInitPlaceholders, parseSecretsInitJson, resolveSecretsInitFromJsonArg, validateSecretsInitNonInteractive } from "@clawdlets/core/lib/secrets-init";
 import { readYamlScalarFromMapping } from "@clawdlets/core/lib/yaml-scalar";
 import { getHostEncryptedAgeKeyFile, getHostExtraFilesKeyPath, getHostExtraFilesSecretsDir, getHostSecretsDir, getLocalOperatorAgeKeyPath } from "@clawdlets/core/repo-layout";
@@ -92,21 +91,31 @@ export const secretsInit = defineCommand({
         const garnixNetrcPath = garnixPrivateEnabled ? String(garnixPrivate?.netrcPath || "/etc/nix/netrc").trim() : "";
         if (garnixPrivateEnabled && !garnixNetrcSecretName)
             throw new Error("cache.garnix.private.netrcSecret must be set when private cache is enabled");
-        const envPlan = buildFleetEnvSecretsPlan({ config: clawdletsConfig, hostName });
-        if (envPlan.missingEnvSecretMappings.length > 0) {
-            const first = envPlan.missingEnvSecretMappings[0];
-            const rec = getRecommendedSecretNameForEnvVar(first.envVar);
-            throw new Error(`missing envSecrets mapping for ${first.envVar} (bot=${first.bot}); set: clawdlets config set --path fleet.envSecrets.${first.envVar} --value ${rec || "<secret_name>"} (or per-bot override under fleet.bots.${first.bot}.profile.envSecrets.${first.envVar})`);
+        const secretsPlan = buildFleetSecretsPlan({ config: clawdletsConfig, hostName });
+        if (secretsPlan.missingSecretConfig.length > 0) {
+            const first = secretsPlan.missingSecretConfig[0];
+            if (first.kind === "discord") {
+                throw new Error(`missing discordTokenSecret for bot=${first.bot} (set fleet.bots.${first.bot}.profile.discordTokenSecret)`);
+            }
+            throw new Error(`missing modelSecrets entry for provider=${first.provider} (bot=${first.bot}, model=${first.model}); set fleet.modelSecrets.${first.provider}`);
+        }
+        const requiredSecretNames = new Set(secretsPlan.secretNamesRequired);
+        const discordSecretByName = new Map();
+        for (const [bot, secretName] of Object.entries(secretsPlan.discordSecretsByBot)) {
+            if (secretName)
+                discordSecretByName.set(secretName, bot);
         }
-        const requiredEnvSecretNames = new Set(envPlan.secretNamesRequired);
-        const envVarsBySecretName = envPlan.envVarsBySecretName;
+        const discordBotsRequired = bots.filter((b) => {
+            const secretName = secretsPlan.discordSecretsByBot[b] || "";
+            return secretName && requiredSecretNames.has(secretName);
+        });
         const requiredExtraSecretNames = new Set([
-            ...requiredEnvSecretNames,
+            ...requiredSecretNames,
             ...(garnixPrivateEnabled ? [garnixNetrcSecretName] : []),
         ]);
         const templateExtraSecrets = {};
-        for (const secretName of envPlan.secretNamesAll) {
-            templateExtraSecrets[secretName] = requiredEnvSecretNames.has(secretName) ? "<REPLACE_WITH_API_KEY>" : "<OPTIONAL>";
+        for (const secretName of secretsPlan.secretNamesAll) {
+            templateExtraSecrets[secretName] = requiredSecretNames.has(secretName) ? "<REPLACE_WITH_SECRET>" : "<OPTIONAL>";
         }
         if (garnixPrivateEnabled) {
             templateExtraSecrets[garnixNetrcSecretName] = "<REPLACE_WITH_NETRC>";
@@ -124,7 +133,7 @@ export const secretsInit = defineCommand({
                 if (!a.allowPlaceholders) {
                     const raw = fs.readFileSync(defaultSecretsJsonPath, "utf8");
                     const parsed = parseSecretsInitJson(raw);
-                    const placeholders = listSecretsInitPlaceholders({ input: parsed, bots, requiresTailscaleAuthKey });
+                    const placeholders = listSecretsInitPlaceholders({ input: parsed, bots, discordBots: discordBotsRequired, requiresTailscaleAuthKey });
                     if (placeholders.length > 0) {
                         console.error(`error: placeholders found in ${defaultSecretsJsonDisplay} (fill it or pass --allow-placeholders)`);
                         for (const p0 of placeholders)
@@ -135,7 +144,7 @@ export const secretsInit = defineCommand({
                 }
             }
             else {
-                const template = buildSecretsInitTemplate({ bots, requiresTailscaleAuthKey, secrets: templateExtraSecrets });
+                const template = buildSecretsInitTemplate({ bots, discordBots: discordBotsRequired, requiresTailscaleAuthKey, secrets: templateExtraSecrets });
                 if (!a.dryRun) {
                     await ensureDir(path.dirname(defaultSecretsJsonPath));
                     await writeFileAtomic(defaultSecretsJsonPath, `${JSON.stringify(template, null, 2)}\n`, { mode: 0o600 });
@@ -261,14 +270,28 @@ export const secretsInit = defineCommand({
         const flowSecrets = "secrets init";
         const values = { adminPassword: "", adminPasswordHash: "", tailscaleAuthKey: "", secrets: {}, discordTokens: {} };
         if (interactive) {
-            const requiredExtraSecrets = Array.from(requiredExtraSecretNames).sort();
+            const discordSecretNames = new Set(Object.values(secretsPlan.discordSecretsByBot).filter(Boolean));
+            const requiredExtraSecrets = Array.from(requiredExtraSecretNames).filter((s) => !discordSecretNames.has(s)).sort();
+            const discordTokenBots = [];
+            const seenDiscordSecrets = new Set();
+            for (const bot of bots) {
+                const secretName = secretsPlan.discordSecretsByBot[bot] || "";
+                if (!secretName)
+                    continue;
+                if (!requiredSecretNames.has(secretName))
+                    continue;
+                if (seenDiscordSecrets.has(secretName))
+                    continue;
+                seenDiscordSecrets.add(secretName);
+                discordTokenBots.push({ bot, secretName });
+            }
             const allSteps = [
                 { kind: "adminPassword" },
                 ...(requiresTailscaleAuthKey ? [{ kind: "tailscaleAuthKey" }] : []),
                 ...requiredExtraSecrets.map((secretName) => garnixPrivateEnabled && secretName === garnixNetrcSecretName
                     ? { kind: "garnixNetrcFile", secretName, netrcPath: garnixNetrcPath || "/etc/nix/netrc" }
                     : { kind: "secret", secretName }),
-                ...bots.map((b) => ({ kind: "discordToken", bot: b })),
+                ...discordTokenBots.map((b) => ({ kind: "discordToken", bot: b.bot, secretName: b.secretName })),
             ];
             for (let i = 0; i < allSteps.length;) {
                 const step = allSteps[i];
@@ -288,12 +311,10 @@ export const secretsInit = defineCommand({
                     });
                 }
                 else if (step.kind === "secret") {
-                    const envVars = envVarsBySecretName[step.secretName] || [];
-                    const hint = envVars.length > 0 ? ` (env: ${envVars.join(", ")})` : "";
-                    v = await p.password({ message: `Secret value (${step.secretName})${hint} (required by configured models)` });
+                    v = await p.password({ message: `Secret value (${step.secretName}) (required)` });
                 }
                 else {
-                    v = await p.password({ message: `Discord token for ${step.bot} (discord_token_${step.bot}) (optional now, required to run)` });
+                    v = await p.password({ message: `Discord token for ${step.bot} (${step.secretName}) (required)` });
                 }
                 if (p.isCancel(v)) {
                     const nav = await navOnCancel({ flow: flowSecrets, canBack: i > 0 });
@@ -329,8 +350,10 @@ export const secretsInit = defineCommand({
                 }
                 else if (step.kind === "secret")
                     values.secrets[step.secretName] = s;
-                else
+                else {
                     values.discordTokens[step.bot] = s;
+                    values.secrets[step.secretName] = s;
+                }
                 i += 1;
             }
         }
@@ -341,13 +364,12 @@ export const secretsInit = defineCommand({
             values.secrets = input.secrets || {};
             values.discordTokens = input.discordTokens || {};
         }
-        const envSecretsToWrite = envPlan.secretNamesAll;
+        const secretsToWrite = secretsPlan.secretNamesAll;
         const requiredSecrets = Array.from(new Set([
             ...(requiresTailscaleAuthKey ? ["tailscale_auth_key"] : []),
             "admin_password_hash",
             ...(garnixPrivateEnabled ? [garnixNetrcSecretName] : []),
-            ...envSecretsToWrite,
-            ...bots.map((b) => `discord_token_${b}`),
+            ...secretsToWrite,
         ]));
         const isOptionalMarker = (v) => String(v || "").trim() === "<OPTIONAL>";
         const resolvedValues = {};
@@ -376,17 +398,20 @@ export const secretsInit = defineCommand({
                 }
                 continue;
             }
-            if (secretName.startsWith("discord_token_")) {
-                const bot = secretName.slice("discord_token_".length);
-                const vv = values.discordTokens[bot]?.trim() || "";
+            if (discordSecretByName.has(secretName)) {
+                const bot = discordSecretByName.get(secretName) || "";
+                const required = requiredSecretNames.has(secretName);
+                const vv = (bot ? values.discordTokens[bot]?.trim() : "") || values.secrets?.[secretName]?.trim() || "";
                 if (vv)
                     resolvedValues[secretName] = vv;
                 else if (existing)
                     resolvedValues[secretName] = existing;
+                else if (!required)
+                    resolvedValues[secretName] = "<OPTIONAL>";
                 else if (a.allowPlaceholders)
                     resolvedValues[secretName] = "<FILL_ME>";
                 else
-                    throw new Error(`missing discord token for ${bot} (provide it in --from-json.discordTokens or pass --allow-placeholders)`);
+                    throw new Error(`missing discord token for ${bot || secretName} (provide it in --from-json.discordTokens or pass --allow-placeholders)`);
                 continue;
             }
             const vv = values.secrets?.[secretName]?.trim() || "";
@@ -400,12 +425,10 @@ export const secretsInit = defineCommand({
                 continue;
             }
             if (required) {
-                const envVars = envVarsBySecretName[secretName] || [];
-                const envHint = envVars.length > 0 ? ` (env: ${envVars.join(", ")})` : "";
                 if (a.allowPlaceholders)
                     resolvedValues[secretName] = "<FILL_ME>";
                 else
-                    throw new Error(`missing required secret: ${secretName}${envHint} (set it in --from-json.secrets or via interactive prompts)`);
+                    throw new Error(`missing required secret: ${secretName} (set it in --from-json.secrets or via interactive prompts)`);
                 continue;
             }
             resolvedValues[secretName] = "<OPTIONAL>";

package/dist/commands/secrets/init.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/commands/secrets/init.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/commands/secrets/init.ts"],"names":[],"mappings":"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"}

package/dist/commands/secrets/verify.js CHANGED Viewed

@@ -5,7 +5,7 @@ import { defineCommand } from "citty";
 import YAML from "yaml";
 import { sopsDecryptYamlFile } from "@clawdlets/core/lib/sops";
 import { sanitizeOperatorId } from "@clawdlets/core/lib/identifiers";
-import { buildFleetEnvSecretsPlan } from "@clawdlets/core/lib/fleet-env-secrets";
+import { buildFleetSecretsPlan } from "@clawdlets/core/lib/fleet-secrets";
 import { isPlaceholderSecretValue } from "@clawdlets/core/lib/secrets-init";
 import { loadDeployCreds } from "@clawdlets/core/lib/deploy-creds";
 import { getHostSecretsDir, getLocalOperatorAgeKeyPath } from "@clawdlets/core/repo-layout";
@@ -42,14 +42,14 @@ export const secretsVerify = defineCommand({
             getLocalOperatorAgeKeyPath(layout, operatorId);
         const nix = { nixBin: String(deployCreds.values.NIX_BIN || "nix").trim() || "nix", cwd: layout.repoRoot, dryRun: false };
         const localDir = getHostSecretsDir(layout, hostName);
-        const envPlan = buildFleetEnvSecretsPlan({ config, hostName });
-        const requiredEnvSecretNames = new Set(envPlan.secretNamesRequired);
+        const secretsPlan = buildFleetSecretsPlan({ config, hostName });
+        const requiredSecretNames = new Set(secretsPlan.secretNamesRequired);
         const tailnetMode = String(hostCfg.tailnet?.mode || "none");
         const requiredSecrets = Array.from(new Set([
             ...(tailnetMode === "tailscale" ? ["tailscale_auth_key"] : []),
             "admin_password_hash",
         ]));
-        const envSecrets = envPlan.secretNamesAll;
+        const secretNames = secretsPlan.secretNamesAll;
         const optionalSecrets = ["root_password_hash"];
         const results = [];
         if (!fs.existsSync(operatorKeyPath)) {
@@ -99,8 +99,8 @@ export const secretsVerify = defineCommand({
         else {
             for (const s of requiredSecrets)
                 await verifyOne(s, false, false);
-            for (const s of envSecrets)
-                await verifyOne(s, false, !requiredEnvSecretNames.has(s));
+            for (const s of secretNames)
+                await verifyOne(s, false, !requiredSecretNames.has(s));
             for (const s of optionalSecrets)
                 await verifyOne(s, true, true);
         }

package/dist/commands/secrets/verify.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"verify.js","sourceRoot":"","sources":["../../../src/commands/secrets/verify.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,~~wBAAwB~~,EAAE,MAAM,~~uCAAuC~~,CAAC;~~AACjF~~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~~OAAO~~,GAAG,~~wBAAwB~~,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;~~QAC/D~~,MAAM,~~sBAAsB~~,GAAG,IAAI,GAAG,CAAS,~~OAAO~~,CAAC,mBAAmB,CAAC,CAAC;~~QAE5E~~,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,IAAI,MAAM,CAAC,CAAC;QAC5D,MAAM,eAAe,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;YACzC,GAAG,CAAC,WAAW,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC9D,qBAAqB;SACtB,CAAC,CAAC,CAAC;QACJ,MAAM,~~UAAU~~,GAAG,~~OAAO~~,CAAC,cAAc,CAAC;~~QAC1C~~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~~UAAU~~;gBAAE,MAAM,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,~~sBAAsB~~,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;~~YACtF~~,KAAK,MAAM,CAAC,IAAI,eAAe;gBAAE,MAAM,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAClE,CAAC;QAED,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC9E,CAAC;aAAM,CAAC;YACN,KAAK,MAAM,CAAC,IAAI,OAAO;gBAAE,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACtG,CAAC;QAED,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,SAAS,CAAC;YAAE,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;IACxE,CAAC;CACF,CAAC,CAAC"}
1	+ {"version":3,"file":"verify.js","sourceRoot":"","sources":["../../../src/commands/secrets/verify.ts"],"names":[],"mappings":"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"}

package/dist/config/template-source.json CHANGED Viewed

@@ -1,5 +1,5 @@
 {
   "repo": "regenrek/clawdlets-template",
   "path": "templates/default",
-  "ref": "d4f400b5f32065ce750d7b8b653367a7f1d04cb5"
+  "ref": "1b99a1751f6a208a3eb074360cbfc116ca04025d"
 }

package/dist/main.js CHANGED Viewed

@@ -10,7 +10,6 @@ import { host } from "./commands/host.js";
 import { fleet } from "./commands/fleet.js";
 import { image } from "./commands/image.js";
 import { infra } from "./commands/infra.js";
-import { identity } from "./commands/identity.js";
 import { lockdown } from "./commands/lockdown.js";
 import { project } from "./commands/project.js";
 import { secrets } from "./commands/secrets.js";
@@ -30,7 +29,6 @@ const main = defineCommand({
         host,
         fleet,
         image,
-        identity,
         infra,
         lockdown,
         project,

package/dist/main.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC/C,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,~~QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,~~OAAO,EAAE,~~OAAO,EAAE,~~MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE9C,MAAM,IAAI,GAAG,aAAa,CAAC;IACzB,IAAI,EAAE;QACJ,IAAI,EAAE,WAAW;QACjB,WAAW,EAAE,uFAAuF;KACrG;IACD,WAAW,EAAE;QACX,GAAG;QACH,SAAS;QACT,MAAM;QACN,MAAM;QACN,MAAM;QACN,GAAG;QACH,IAAI;QACJ,KAAK;QACL,KAAK;QACL,~~QAAQ;QACR,~~KAAK;QACL,QAAQ;QACR,OAAO;QACP,OAAO;QACP,MAAM;KACP;CACF,CAAC,CAAC;AAEH,CAAC;IACC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAChD,OAAO,CAAC,IAAI,GAAG,CAAC,OAAQ,EAAE,MAAO,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;AACxE,CAAC;AAED,OAAO,CAAC,IAAI,CAAC,CAAC"}
1	+ {"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC/C,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE9C,MAAM,IAAI,GAAG,aAAa,CAAC;IACzB,IAAI,EAAE;QACJ,IAAI,EAAE,WAAW;QACjB,WAAW,EAAE,uFAAuF;KACrG;IACD,WAAW,EAAE;QACX,GAAG;QACH,SAAS;QACT,MAAM;QACN,MAAM;QACN,MAAM;QACN,GAAG;QACH,IAAI;QACJ,KAAK;QACL,KAAK;QACL,KAAK;QACL,QAAQ;QACR,OAAO;QACP,OAAO;QACP,MAAM;KACP;CACF,CAAC,CAAC;AAEH,CAAC;IACC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAChD,OAAO,CAAC,IAAI,GAAG,CAAC,OAAQ,EAAE,MAAO,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;AACxE,CAAC;AAED,OAAO,CAAC,IAAI,CAAC,CAAC"}

package/node_modules/@clawdlets/clf-queue/dist/jobs.d.ts CHANGED Viewed

@@ -2,7 +2,7 @@ import { z } from "zod";
 import { type CattleTask } from "@clawdlets/core/lib/cattle-task";
 import { type ClfJobKind } from "./protocol.js";
 export declare const ClfCattleSpawnPayloadSchema: z.ZodObject<{
-    identity: z.ZodString;
+    persona: z.ZodString;
     task: z.ZodObject<{
         schemaVersion: z.ZodLiteral<1>;
         taskId: z.ZodString;

package/node_modules/@clawdlets/clf-queue/dist/jobs.js CHANGED Viewed

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { CattleTaskSchema } from "@clawdlets/core/lib/cattle-task";
 export const ClfCattleSpawnPayloadSchema = z.object({
-    identity: z.string().trim().min(1),
+    persona: z.string().trim().min(1),
     task: CattleTaskSchema,
     ttl: z.string().trim().optional().default(""),
     image: z.string().trim().optional().default(""),

package/node_modules/@clawdlets/clf-queue/dist/jobs.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"jobs.js","sourceRoot":"","sources":["../src/jobs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,gBAAgB,EAAmB,MAAM,iCAAiC,CAAC;AAGpF,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAC,MAAM,CAAC;IAClD,~~QAAQ~~,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;~~IAClC~~,IAAI,EAAE,gBAAgB;IACtB,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;IAC7C,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;IAC/C,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;IACpD,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;IAClD,YAAY,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IACpC,eAAe,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;CACvD,CAAC,CAAC;AAGH,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,CAAC,MAAM,CAAC;IACjD,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;CAC9C,CAAC,CAAC;AAQH,MAAM,UAAU,kBAAkB,CAAuB,IAAO,EAAE,OAAgB;IAChF,IAAI,IAAI,KAAK,cAAc;QAAE,OAAO,2BAA2B,CAAC,KAAK,CAAC,OAAO,CAA2B,CAAC;IACzG,IAAI,IAAI,KAAK,aAAa;QAAE,OAAO,0BAA0B,CAAC,KAAK,CAAC,OAAO,CAA2B,CAAC;IACvG,0CAA0C;IAC1C,MAAM,IAAI,KAAK,CAAC,yBAAyB,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC3D,CAAC"}
1	+ {"version":3,"file":"jobs.js","sourceRoot":"","sources":["../src/jobs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,gBAAgB,EAAmB,MAAM,iCAAiC,CAAC;AAGpF,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAC,MAAM,CAAC;IAClD,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACjC,IAAI,EAAE,gBAAgB;IACtB,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;IAC7C,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;IAC/C,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;IACpD,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;IAClD,YAAY,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IACpC,eAAe,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;CACvD,CAAC,CAAC;AAGH,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,CAAC,MAAM,CAAC;IACjD,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;CAC9C,CAAC,CAAC;AAQH,MAAM,UAAU,kBAAkB,CAAuB,IAAO,EAAE,OAAgB;IAChF,IAAI,IAAI,KAAK,cAAc;QAAE,OAAO,2BAA2B,CAAC,KAAK,CAAC,OAAO,CAA2B,CAAC;IACzG,IAAI,IAAI,KAAK,aAAa;QAAE,OAAO,0BAA0B,CAAC,KAAK,CAAC,OAAO,CAA2B,CAAC;IACvG,0CAA0C;IAC1C,MAAM,IAAI,KAAK,CAAC,yBAAyB,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC3D,CAAC"}

package/node_modules/@clawdlets/clf-queue/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@clawdlets/clf-queue",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "private": true,
   "type": "module",
   "exports": {
@@ -13,10 +13,11 @@
   "scripts": {
     "build": "tsc -p tsconfig.json",
     "typecheck": "tsc --noEmit -p tsconfig.json",
+    "pretest": "pnpm -C . build",
     "test": "vitest run"
   },
   "dependencies": {
-    "@clawdlets/core": "0.1.1",
+    "@clawdlets/core": "0.2.0",
     "better-sqlite3": "^12.6.2",
     "zod": "^4.3.5"
   },

package/node_modules/@clawdlets/core/dist/doctor/deploy-checks.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"deploy-checks.d.ts","sourceRoot":"","sources":["../../src/doctor/deploy-checks.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;~~AA6BpD~~,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,wBAAsB,eAAe,CAAC,MAAM,EAAE;IAC5C,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,UAAU,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAC3B,IAAI,EAAE,UAAU,CAAC;IACjB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,EAAE,WAAW,GAAG,eAAe,CAAC;CACtC,GAAG,OAAO,CAAC,IAAI,CAAC,~~CA2chB~~"}
1	+ {"version":3,"file":"deploy-checks.d.ts","sourceRoot":"","sources":["../../src/doctor/deploy-checks.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AA4BpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,wBAAsB,eAAe,CAAC,MAAM,EAAE;IAC5C,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,UAAU,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAC3B,IAAI,EAAE,UAAU,CAAC;IACjB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,EAAE,WAAW,GAAG,eAAe,CAAC;CACtC,GAAG,OAAO,CAAC,IAAI,CAAC,CA6chB"}

package/node_modules/@clawdlets/core/dist/doctor/deploy-checks.js CHANGED Viewed

@@ -4,12 +4,11 @@ import YAML from "yaml";
 import { getHostEncryptedAgeKeyFile, getHostExtraFilesDir, getHostExtraFilesKeyPath, getHostRemoteSecretsDir, getHostSecretsDir, } from "../repo-layout.js";
 import { getHostAgeKeySopsCreationRulePathRegex, getHostAgeKeySopsCreationRulePathSuffix, getHostSecretsSopsCreationRulePathRegex, getHostSecretsSopsCreationRulePathSuffix } from "../lib/sops-rules.js";
 import { validateHostSecretsYamlFiles } from "../lib/secrets-policy.js";
-import { buildFleetEnvSecretsPlan } from "../lib/fleet-env-secrets.js";
+import { buildFleetSecretsPlan } from "../lib/fleet-secrets.js";
 import { capture } from "../lib/run.js";
 import { looksLikeSshKeyContents, normalizeSshPublicKey } from "../lib/ssh.js";
 import { getSshExposureMode, isPublicSshExposure, loadClawdletsConfig, } from "../lib/clawdlets-config.js";
 import { isPlaceholderSecretValue } from "../lib/secrets-init.js";
-import { getRecommendedSecretNameForEnvVar } from "../lib/llm-provider-env.js";
 import { checkGithubRepoVisibility, tryParseGithubFlakeUri } from "../lib/github.js";
 import { tryGetOriginFlake } from "../lib/git.js";
 import { expandPath } from "../lib/path-expand.js";
@@ -233,41 +232,42 @@ export async function addDeployChecks(params) {
                 }
             }
         }
-        let envPlan = null;
+        let secretsPlan = null;
         try {
             if (clawdletsCfg)
-                envPlan = buildFleetEnvSecretsPlan({ config: clawdletsCfg, hostName: host });
+                secretsPlan = buildFleetSecretsPlan({ config: clawdletsCfg, hostName: host });
         }
         catch (e) {
-            push({ status: "warn", label: "envSecrets plan", detail: String(e?.message || e) });
-            envPlan = null;
+            push({ status: "warn", label: "fleet secrets plan", detail: String(e?.message || e) });
+            secretsPlan = null;
         }
-        if (envPlan && envPlan.missingEnvSecretMappings.length > 0) {
-            for (const m of envPlan.missingEnvSecretMappings.slice(0, 10)) {
-                const rec = getRecommendedSecretNameForEnvVar(m.envVar);
+        if (secretsPlan && secretsPlan.missingSecretConfig.length > 0) {
+            for (const m of secretsPlan.missingSecretConfig.slice(0, 10)) {
+                const detail = m.kind === "discord"
+                    ? `missing for bot=${m.bot} (set fleet.bots.${m.bot}.profile.discordTokenSecret)`
+                    : `missing for bot=${m.bot} (provider=${m.provider}, model=${m.model}); set fleet.modelSecrets.${m.provider}`;
                 push({
                     status: "missing",
-                    label: `envSecrets mapping: ${m.envVar}`,
-                    detail: `missing for bot=${m.bot} (model=${m.model}); set: clawdlets config set --path fleet.envSecrets.${m.envVar} --value ${rec || "<secret_name>"}`,
+                    label: "fleet secrets",
+                    detail,
                 });
             }
-            if (envPlan.missingEnvSecretMappings.length > 10) {
+            if (secretsPlan.missingSecretConfig.length > 10) {
                 push({
                     status: "missing",
-                    label: "envSecrets mapping",
-                    detail: `(+${envPlan.missingEnvSecretMappings.length - 10} more missing mappings)`,
+                    label: "fleet secrets",
+                    detail: `(+${secretsPlan.missingSecretConfig.length - 10} more missing entries)`,
                 });
             }
         }
-        const botsForSecrets = envPlan?.bots?.length ? envPlan.bots : params.fleetBots || [];
-        const envSecretsForHost = envPlan?.secretNamesAll || [];
+        const botsForSecrets = secretsPlan?.bots?.length ? secretsPlan.bots : params.fleetBots || [];
+        const envSecretsForHost = secretsPlan?.secretNamesAll || [];
         if (botsForSecrets.length > 0) {
             const tailnetMode = String(clawdletsHostCfg?.tailnet?.mode || "none");
             const required = Array.from(new Set([
                 ...(tailnetMode === "tailscale" ? ["tailscale_auth_key"] : []),
                 "admin_password_hash",
                 ...envSecretsForHost,
-                ...botsForSecrets.map((b) => `discord_token_${b}`),
             ]));
             for (const secretName of required) {
                 const f = path.join(secretsLocalDir, `${secretName}.yaml`);
@@ -279,11 +279,11 @@ export async function addDeployChecks(params) {
             }
         }
         else {
-            push({ status: "warn", label: "required secrets", detail: "(fleet bots list missing; cannot validate discord_token_<bot> secrets)" });
+            push({ status: "warn", label: "required secrets", detail: "(fleet bots list missing; cannot validate per-bot secrets)" });
         }
-        if (envPlan && envPlan.secretNamesRequired.length > 0 && params.sopsAgeKeyFile && fs.existsSync(params.sopsAgeKeyFile)) {
+        if (secretsPlan && secretsPlan.secretNamesRequired.length > 0 && params.sopsAgeKeyFile && fs.existsSync(params.sopsAgeKeyFile)) {
             const nix = { nixBin: params.nixBin, cwd: params.repoRoot, dryRun: false, env: process.env };
-            for (const secretName of envPlan.secretNamesRequired) {
+            for (const secretName of secretsPlan.secretNamesRequired) {
                 const filePath = path.join(secretsLocalDir, `${secretName}.yaml`);
                 if (!fs.existsSync(filePath))
                     continue;
@@ -311,10 +311,10 @@ export async function addDeployChecks(params) {
                 }
             }
         }
-        else if (envPlan && envPlan.secretNamesRequired.length > 0) {
+        else if (secretsPlan && secretsPlan.secretNamesRequired.length > 0) {
             push({
                 status: "warn",
-                label: "LLM API keys",
+                label: "required secrets",
                 detail: "(set SOPS_AGE_KEY_FILE to verify required key values are not placeholders)",
             });
         }