@ouro.bot/cli 0.1.0-alpha.372 → 0.1.0-alpha.374

package/changelog.json

@@ -1,6 +1,22 @@
 {
   "_note": "This changelog is maintained as part of the PR/version-bump workflow. Agent-curated, not auto-generated. Agents read this file directly via read_file to understand what changed between versions.",
   "versions": [
+    {
+      "version": "0.1.0-alpha.374",
+      "changes": [
+        "SerpentGuide bootstrap now stays in the credential picker when a selected discovered credential fails ping, letting the human choose another saved source or enter a new key without restarting `ouro hatch`.",
+        "The stale discovered-credential retry path is covered by a focused SerpentGuide bootstrap test that fails the first provider ping and succeeds after manual replacement credentials.",
+        "`@ouro.bot/cli` and the `ouro.bot` wrapper are version-synced for the SerpentGuide credential retry release."
+      ]
+    },
+    {
+      "version": "0.1.0-alpha.373",
+      "changes": [
+        "SerpentGuide bootstrap now discovers provider credentials from unlockable installed agent vaults, so a new hatch can reuse sources such as `minimax from slugger's vault` without creating persistent SerpentGuide credentials.",
+        "SerpentGuide credential options now preserve provenance for installed-agent vault sources and env sources while keeping secret values out of terminal labels.",
+        "`@ouro.bot/cli` and the `ouro.bot` wrapper are version-synced for the SerpentGuide installed-agent credential discovery release."
+      ]
+    },
     {
       "version": "0.1.0-alpha.372",
       "changes": [

package/dist/heart/daemon/cli-defaults.js

@@ -244,13 +244,23 @@ async function defaultRunSerpentGuide() {
     let providerRaw;
     let credentials = {};
     let providerConfig = {};
+    let selectedCredentialPayload = {};
     const tempDir = path.join(os.tmpdir(), `ouro-hatch-${crypto.randomUUID()}`);
     try {
         const discovered = [];
-        const existingBundleCount = (0, specialist_orchestrator_1.listExistingBundles)((0, identity_1.getAgentBundlesRoot)()).length;
+        const existingBundles = (0, specialist_orchestrator_1.listExistingBundles)((0, identity_1.getAgentBundlesRoot)());
+        const existingBundleCount = existingBundles.length;
         const hatchVerb = existingBundleCount > 0 ? "let's hatch a new agent." : "let's hatch your first agent.";
         // Default models per provider (used when entering new credentials)
         const defaultModels = provider_models_1.DEFAULT_PROVIDER_MODELS;
+        const { pingProvider } = await Promise.resolve().then(() => __importStar(require("../provider-ping")));
+        const installedAgentCreds = await (0, provider_discovery_1.discoverInstalledAgentCredentials)(existingBundles);
+        for (const cred of installedAgentCreds) {
+            discovered.push({
+                ...cred,
+                providerConfig: { model: defaultModels[cred.provider], ...cred.providerConfig },
+            });
+        }
         // Scan environment variables for API keys using the shared helper
         const envCreds = (0, provider_discovery_1.scanEnvVarCredentials)(process.env);
         const envDiscovered = [];
@@ -265,26 +275,48 @@ async function defaultRunSerpentGuide() {
             envDiscovered.push({ ...enriched, envVar: firstEnvVar });
             discovered.push(enriched);
         }
-        if (discovered.length > 0) {
-            process.stdout.write(`\n\ud83d\udc0d welcome to ouroboros! ${hatchVerb}\n`);
-            process.stdout.write("i found existing API credentials:\n\n");
-            const unique = [...new Map(discovered.map((d) => [`${d.provider}`, d])).values()];
-            for (let i = 0; i < unique.length; i++) {
-                const model = unique[i].providerConfig.model || unique[i].providerConfig.deployment || "";
-                const modelLabel = model ? `, ${model}` : "";
-                const envMatch = envDiscovered.find((e) => e.provider === unique[i].provider && unique[i].agentName === "env");
-                const sourceLabel = envMatch ? `from env: $${envMatch.envVar}` : `from ${unique[i].agentName}`;
-                process.stdout.write(`  ${i + 1}. ${unique[i].provider}${modelLabel} (${sourceLabel})\n`);
+        let welcomed = false;
+        while (true) {
+            if (!welcomed) {
+                process.stdout.write(`\n\ud83d\udc0d welcome to ouroboros! ${hatchVerb}\n`);
+                welcomed = true;
             }
-            process.stdout.write("\n");
-            const choice = await coldPrompt("use one of these? enter number, or 'new' for a different key: ");
-            const idx = parseInt(choice, 10) - 1;
-            if (idx >= 0 && idx < unique.length) {
-                providerRaw = unique[idx].provider;
-                credentials = unique[idx].credentials;
-                providerConfig = unique[idx].providerConfig;
+            if (discovered.length > 0) {
+                process.stdout.write("i found existing API credentials:\n\n");
+                const credentialOptions = discovered;
+                for (let i = 0; i < credentialOptions.length; i++) {
+                    const model = credentialOptions[i].providerConfig.model || credentialOptions[i].providerConfig.deployment || "";
+                    const modelLabel = model ? `, ${model}` : "";
+                    const envMatch = envDiscovered.find((e) => e.provider === credentialOptions[i].provider && credentialOptions[i].agentName === "env");
+                    const sourceLabel = (0, provider_discovery_1.describeDiscoveredCredentialSource)(credentialOptions[i], envMatch?.envVar);
+                    process.stdout.write(`  ${i + 1}. ${credentialOptions[i].provider}${modelLabel} (${sourceLabel})\n`);
+                }
+                process.stdout.write("\n");
+                const choice = await coldPrompt("use one of these? enter number, or 'new' for a different key, or 'q' to cancel: ");
+                if (["q", "quit", "cancel"].includes(choice.toLowerCase())) {
+                    coldRl.close();
+                    return null;
+                }
+                const idx = parseInt(choice, 10) - 1;
+                if (idx >= 0 && idx < credentialOptions.length) {
+                    providerRaw = credentialOptions[idx].provider;
+                    credentials = credentialOptions[idx].credentials;
+                    providerConfig = credentialOptions[idx].providerConfig;
+                }
+                else {
+                    const pRaw = await coldPrompt("provider (anthropic/azure/minimax/openai-codex/github-copilot): ");
+                    if (!(0, cli_parse_1.isAgentProvider)(pRaw)) {
+                        process.stdout.write("unknown provider. run `ouro hatch` to try again.\n");
+                        coldRl.close();
+                        return null;
+                    }
+                    providerRaw = pRaw;
+                    providerConfig = { model: defaultModels[providerRaw] };
+                    credentials = await (0, auth_flow_1.collectRuntimeAuthCredentials)({ agentName: "SerpentGuide", provider: providerRaw, promptInput: coldPrompt }, {});
+                }
             }
             else {
+                process.stdout.write("i need an API key to power our conversation.\n\n");
                 const pRaw = await coldPrompt("provider (anthropic/azure/minimax/openai-codex/github-copilot): ");
                 if (!(0, cli_parse_1.isAgentProvider)(pRaw)) {
                     process.stdout.write("unknown provider. run `ouro hatch` to try again.\n");
@@ -295,23 +327,21 @@ async function defaultRunSerpentGuide() {
                 providerConfig = { model: defaultModels[providerRaw] };
                 credentials = await (0, auth_flow_1.collectRuntimeAuthCredentials)({ agentName: "SerpentGuide", provider: providerRaw, promptInput: coldPrompt }, {});
             }
-        }
-        else {
-            process.stdout.write(`\n\ud83d\udc0d welcome to ouroboros! ${hatchVerb}\n`);
-            process.stdout.write("i need an API key to power our conversation.\n\n");
-            const pRaw = await coldPrompt("provider (anthropic/azure/minimax/openai-codex/github-copilot): ");
-            if (!(0, cli_parse_1.isAgentProvider)(pRaw)) {
-                process.stdout.write("unknown provider. run `ouro hatch` to try again.\n");
-                coldRl.close();
-                return null;
+            selectedCredentialPayload = { ...providerConfig, ...credentials };
+            const pingResult = await pingProvider(providerRaw, selectedCredentialPayload);
+            if (pingResult.ok) {
+                break;
+            }
+            process.stdout.write(`credentials didn't work (${pingResult.message}). `);
+            if (discovered.length > 0) {
+                process.stdout.write("choose another saved credential or enter 'new'.\n\n");
+            }
+            else {
+                process.stdout.write("let's try again.\n\n");
             }
-            providerRaw = pRaw;
-            providerConfig = { model: defaultModels[providerRaw] };
-            credentials = await (0, auth_flow_1.collectRuntimeAuthCredentials)({ agentName: "SerpentGuide", provider: providerRaw, promptInput: coldPrompt }, {});
         }
         coldRl.close();
         process.stdout.write("\n");
-        const selectedCredentialPayload = { ...providerConfig, ...credentials };
         const split = (0, provider_credentials_1.splitProviderCredentialFields)(providerRaw, selectedCredentialPayload);
         (0, provider_credentials_1.cacheProviderCredentialRecords)("SerpentGuide", [
             (0, provider_credentials_1.createProviderCredentialRecord)({
@@ -347,14 +377,6 @@ async function defaultRunSerpentGuide() {
             agentFacing: { provider: providerRaw, model: resolvedModel },
             phrases,
         });
-        // Ping-verify credentials before entering the serpent guide session
-        const { pingProvider } = await Promise.resolve().then(() => __importStar(require("../provider-ping")));
-        const pingResult = await pingProvider(providerRaw, selectedCredentialPayload);
-        if (!pingResult.ok) {
-            process.stdout.write(`credentials didn't work (${pingResult.message}). run 'ouro hatch' to try again.\n`);
-            return null;
-        }
-        const existingBundles = (0, specialist_orchestrator_1.listExistingBundles)(bundlesRoot);
         const systemPrompt = (0, specialist_prompt_1.buildSpecialistSystemPrompt)(soulText, identity.content, existingBundles, {
             tempDir,
             provider: providerRaw,

package/dist/heart/daemon/provider-discovery.js

@@ -8,6 +8,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.scanEnvVarCredentials = scanEnvVarCredentials;
+exports.discoverInstalledAgentCredentials = discoverInstalledAgentCredentials;
+exports.describeDiscoveredCredentialSource = describeDiscoveredCredentialSource;
 exports.discoverWorkingProvider = discoverWorkingProvider;
 const identity_1 = require("../identity");
 const provider_credentials_1 = require("../provider-credentials");
@@ -45,14 +47,36 @@ function stringifyProviderFields(fields) {
     }
     return result;
 }
-function discoveredFromVaultRecord(record) {
+function discoveredFromVaultRecord(record, agentName = "vault") {
     return {
         provider: record.provider,
-        agentName: "vault",
+        agentName,
         credentials: stringifyProviderFields(record.credentials),
         providerConfig: stringifyProviderFields(record.config),
     };
 }
+async function discoverInstalledAgentCredentials(agentNames) {
+    const discovered = [];
+    for (const agentName of agentNames) {
+        if (agentName === "SerpentGuide")
+            continue;
+        const poolResult = await (0, provider_credentials_1.refreshProviderCredentialPool)(agentName, { preserveCachedOnFailure: true });
+        if (!poolResult.ok)
+            continue;
+        for (const record of Object.values(poolResult.pool.providers)) {
+            if (!record)
+                continue;
+            discovered.push(discoveredFromVaultRecord(record, agentName));
+        }
+    }
+    return discovered;
+}
+function describeDiscoveredCredentialSource(credential, envVar) {
+    if (credential.agentName === "env") {
+        return envVar ? `from env: $${envVar}` : "from env";
+    }
+    return `from ${credential.agentName}'s vault`;
+}
 async function discoverWorkingProvider(deps) {
     const poolResult = await (0, provider_credentials_1.refreshProviderCredentialPool)(deps.agentName);
     if (!poolResult.ok) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ouro.bot/cli",
-  "version": "0.1.0-alpha.372",
+  "version": "0.1.0-alpha.374",
   "main": "dist/heart/daemon/ouro-entry.js",
   "bin": {
     "cli": "dist/heart/daemon/ouro-bot-entry.js",