@ouro.bot/cli 0.1.0-alpha.8 → 0.1.0-alpha.9

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

@@ -35,6 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureDaemonRunning = ensureDaemonRunning;
 exports.parseOuroCommand = parseOuroCommand;
+exports.discoverExistingCredentials = discoverExistingCredentials;
 exports.createDefaultOuroCliDeps = createDefaultOuroCliDeps;
 exports.runOuroCli = runOuroCli;
 const child_process_1 = require("child_process");
@@ -458,7 +459,61 @@ async function defaultLinkFriendIdentity(command) {
     });
     return `linked ${command.provider}:${command.externalId} to ${command.friendId}`;
 }
-/* v8 ignore next 49 -- integration: interactive terminal specialist session @preserve */
+function discoverExistingCredentials(secretsRoot) {
+    const found = [];
+    let entries;
+    try {
+        entries = fs.readdirSync(secretsRoot, { withFileTypes: true });
+    }
+    catch {
+        return found;
+    }
+    for (const entry of entries) {
+        if (!entry.isDirectory())
+            continue;
+        const secretsPath = path.join(secretsRoot, entry.name, "secrets.json");
+        let raw;
+        try {
+            raw = fs.readFileSync(secretsPath, "utf-8");
+        }
+        catch {
+            continue;
+        }
+        let parsed;
+        try {
+            parsed = JSON.parse(raw);
+        }
+        catch {
+            continue;
+        }
+        if (!parsed.providers)
+            continue;
+        for (const [provName, provConfig] of Object.entries(parsed.providers)) {
+            if (provName === "anthropic" && provConfig.setupToken) {
+                found.push({ agentName: entry.name, provider: "anthropic", credentials: { setupToken: provConfig.setupToken } });
+            }
+            else if (provName === "openai-codex" && provConfig.oauthAccessToken) {
+                found.push({ agentName: entry.name, provider: "openai-codex", credentials: { oauthAccessToken: provConfig.oauthAccessToken } });
+            }
+            else if (provName === "minimax" && provConfig.apiKey) {
+                found.push({ agentName: entry.name, provider: "minimax", credentials: { apiKey: provConfig.apiKey } });
+            }
+            else if (provName === "azure" && provConfig.apiKey && provConfig.endpoint && provConfig.deployment) {
+                found.push({ agentName: entry.name, provider: "azure", credentials: { apiKey: provConfig.apiKey, endpoint: provConfig.endpoint, deployment: provConfig.deployment } });
+            }
+        }
+    }
+    // Deduplicate by provider+credential value (keep first seen)
+    const seen = new Set();
+    return found.filter((cred) => {
+        const key = `${cred.provider}:${JSON.stringify(cred.credentials)}`;
+        if (seen.has(key))
+            return false;
+        seen.add(key);
+        return true;
+    });
+}
+/* v8 ignore next 79 -- integration: interactive terminal specialist session @preserve */
 async function defaultRunAdoptionSpecialist() {
     const readline = await Promise.resolve().then(() => __importStar(require("readline/promises")));
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
@@ -467,31 +522,72 @@ async function defaultRunAdoptionSpecialist() {
         return answer.trim();
     };
     try {
-        process.stdout.write("\nwelcome to ouro. let's get you set up.\n");
-        process.stdout.write("i need an API key to power our conversation.\n\n");
-        const providerRaw = await prompt("provider (anthropic/azure/minimax/openai-codex): ");
-        if (!isAgentProvider(providerRaw)) {
-            process.stdout.write("unknown provider. run `ouro hatch` to try again.\n");
-            return null;
-        }
-        const credentials = {};
-        if (providerRaw === "anthropic")
-            credentials.setupToken = await prompt("API key: ");
-        if (providerRaw === "openai-codex")
-            credentials.oauthAccessToken = await prompt("OAuth token: ");
-        if (providerRaw === "minimax")
-            credentials.apiKey = await prompt("API key: ");
-        if (providerRaw === "azure") {
-            credentials.apiKey = await prompt("API key: ");
-            credentials.endpoint = await prompt("endpoint: ");
-            credentials.deployment = await prompt("deployment: ");
+        const secretsRoot = path.join(os.homedir(), ".agentsecrets");
+        const discovered = discoverExistingCredentials(secretsRoot);
+        let providerRaw;
+        let credentials = {};
+        if (discovered.length > 0) {
+            process.stdout.write("\nwelcome to ouro. let's get you set up.\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++) {
+                process.stdout.write(`  ${i + 1}. ${unique[i].provider} (from ${unique[i].agentName})\n`);
+            }
+            process.stdout.write("\n");
+            const choice = await prompt("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;
+            }
+            else {
+                const pRaw = await prompt("provider (anthropic/azure/minimax/openai-codex): ");
+                if (!isAgentProvider(pRaw)) {
+                    process.stdout.write("unknown provider. run `ouro hatch` to try again.\n");
+                    rl.close();
+                    return null;
+                }
+                providerRaw = pRaw;
+                if (providerRaw === "anthropic")
+                    credentials.setupToken = await prompt("API key: ");
+                if (providerRaw === "openai-codex")
+                    credentials.oauthAccessToken = await prompt("OAuth token: ");
+                if (providerRaw === "minimax")
+                    credentials.apiKey = await prompt("API key: ");
+                if (providerRaw === "azure") {
+                    credentials.apiKey = await prompt("API key: ");
+                    credentials.endpoint = await prompt("endpoint: ");
+                    credentials.deployment = await prompt("deployment: ");
+                }
+            }
+        }
+        else {
+            process.stdout.write("\nwelcome to ouro. let's get you set up.\n");
+            process.stdout.write("i need an API key to power our conversation.\n\n");
+            const pRaw = await prompt("provider (anthropic/azure/minimax/openai-codex): ");
+            if (!isAgentProvider(pRaw)) {
+                process.stdout.write("unknown provider. run `ouro hatch` to try again.\n");
+                rl.close();
+                return null;
+            }
+            providerRaw = pRaw;
+            if (providerRaw === "anthropic")
+                credentials.setupToken = await prompt("API key: ");
+            if (providerRaw === "openai-codex")
+                credentials.oauthAccessToken = await prompt("OAuth token: ");
+            if (providerRaw === "minimax")
+                credentials.apiKey = await prompt("API key: ");
+            if (providerRaw === "azure") {
+                credentials.apiKey = await prompt("API key: ");
+                credentials.endpoint = await prompt("endpoint: ");
+                credentials.deployment = await prompt("deployment: ");
+            }
         }
         rl.close();
         process.stdout.write("\n");
         // Locate the bundled AdoptionSpecialist.ouro shipped with the npm package
         const bundleSourceDir = path.resolve(__dirname, "..", "..", "..", "AdoptionSpecialist.ouro");
         const bundlesRoot = (0, identity_1.getAgentBundlesRoot)();
-        const secretsRoot = path.join(os.homedir(), ".agentsecrets");
         return await (0, specialist_orchestrator_1.runAdoptionSpecialist)({
             bundleSourceDir,
             bundlesRoot,

package/package.json

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