@ouro.bot/cli 0.1.0-alpha.238 → 0.1.0-alpha.239

package/changelog.json

@@ -1,6 +1,13 @@
 {
   "_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.239",
+      "changes": [
+        "fix(friends): stable local CLI identity \u2014 dropped hostname from external ID (was `username@hostname`, now just `username`). macOS hostname instability (`Mac` vs `Aris-MacBook-Pro.local`) was creating duplicate friend records with separate sessions and trust levels.",
+        "feat(friends): migration fallback \u2014 FriendResolver now searches for old `username@*` format IDs when exact match fails, linking new stable ID to existing friend record."
+      ]
+    },
     {
       "version": "0.1.0-alpha.238",
       "changes": [

package/dist/heart/hatch/hatch-flow.js

@@ -91,7 +91,7 @@ function writeFriendImprint(bundleRoot, humanName, now) {
     fs.mkdirSync(friendsDir, { recursive: true });
     const nowIso = now.toISOString();
     const id = `friend-${(0, config_1.slugify)(humanName) || "friend"}`;
-    const localExternalId = `${os.userInfo().username}@${os.hostname()}`;
+    const localExternalId = os.userInfo().username;
     const record = {
         id,
         name: humanName,

package/dist/mind/friends/resolver.js

@@ -31,6 +31,42 @@ class FriendResolver {
         }
         if (existing)
             return existing;
+        // Migration: local provider previously used "${username}@${hostname}" format.
+        // If no exact match, try finding a friend with old-format external ID.
+        /* v8 ignore start -- one-time migration: hostname→username format, tested manually @preserve */
+        if (this.params.provider === "local" && !this.params.externalId.includes("@")) {
+            try {
+                const all = typeof this.store.listAll === "function" ? await this.store.listAll() : [];
+                const migrationMatch = all.find((f) => f.externalIds.some((eid) => eid.provider === "local" && eid.externalId.startsWith(this.params.externalId + "@")));
+                if (migrationMatch) {
+                    // Link the new external ID format to the existing friend
+                    const now = new Date().toISOString();
+                    migrationMatch.externalIds.push({
+                        provider: this.params.provider,
+                        externalId: this.params.externalId,
+                        linkedAt: now,
+                    });
+                    migrationMatch.updatedAt = now;
+                    try {
+                        await this.store.put(migrationMatch.id, migrationMatch);
+                    }
+                    catch {
+                        // best-effort persist
+                    }
+                    (0, runtime_1.emitNervesEvent)({
+                        component: "friends",
+                        event: "friends.local_id_migrated",
+                        message: `migrated local friend identity from hostname format to username-only`,
+                        meta: { friendId: migrationMatch.id, newExternalId: this.params.externalId },
+                    });
+                    return migrationMatch;
+                }
+            }
+            catch {
+                // fall through to create new
+            }
+        }
+        /* v8 ignore stop */
         // First encounter -- create new FriendRecord
         const now = new Date().toISOString();
         const externalId = {

package/dist/repertoire/bitwarden-store.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BitwardenCredentialStore = void 0;
 const node_child_process_1 = require("node:child_process");
 const runtime_1 = require("../nerves/runtime");
+const bw_installer_1 = require("./bw-installer");
 // ---------------------------------------------------------------------------
 // bw CLI wrapper
 // ---------------------------------------------------------------------------
@@ -76,6 +77,8 @@ class BitwardenCredentialStore {
      * Retries transient failures (network/timeout) up to MAX_RETRIES with exponential backoff.
      */
     async login() {
+        // Ensure bw CLI is installed before any bw commands
+        await (0, bw_installer_1.ensureBwCli)();
         let lastError;
         for (let attempt = 0; attempt < MAX_RETRIES; attempt++) {
             try {

package/dist/repertoire/bw-installer.js

@@ -0,0 +1,79 @@
+"use strict";
+/**
+ * Lazy bw CLI installer — auto-installs the Bitwarden CLI when not present.
+ *
+ * Mirrors the whisper-cpp pattern in senses/bluebubbles/media.ts:
+ * check PATH first, install via npm if missing, emit nerves event.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureBwCli = ensureBwCli;
+const node_child_process_1 = require("node:child_process");
+const runtime_1 = require("../nerves/runtime");
+const INSTALL_TIMEOUT_MS = 120_000;
+const WHICH_TIMEOUT_MS = 5_000;
+function execFileAsync(cmd, args, timeout) {
+    return new Promise((resolve, reject) => {
+        (0, node_child_process_1.execFile)(cmd, args, { timeout }, (err, stdout) => {
+            if (err) {
+                reject(err);
+                return;
+            }
+            resolve(stdout);
+        });
+    });
+}
+/**
+ * Ensure the `bw` CLI is available, installing it via npm if needed.
+ * Returns the path to the `bw` binary.
+ */
+async function ensureBwCli() {
+    // 1. Check if bw is already in PATH
+    try {
+        const existing = (await execFileAsync("which", ["bw"], WHICH_TIMEOUT_MS)).trim();
+        if (existing) {
+            return existing;
+        }
+    }
+    catch {
+        // Not found — fall through to install
+    }
+    // 2. Install via npm
+    (0, runtime_1.emitNervesEvent)({
+        event: "repertoire.bw_cli_install_start",
+        component: "repertoire",
+        message: "bw CLI not found, installing via npm",
+        meta: {},
+    });
+    try {
+        await execFileAsync("npm", ["install", "-g", "@bitwarden/cli"], INSTALL_TIMEOUT_MS);
+    }
+    catch (err) {
+        /* v8 ignore next -- execFileCb always throws Error instances @preserve */
+        const reason = err instanceof Error ? err.message : String(err);
+        (0, runtime_1.emitNervesEvent)({
+            level: "error",
+            event: "repertoire.bw_cli_install_fail",
+            component: "repertoire",
+            message: "failed to install bw CLI via npm",
+            meta: { reason },
+        });
+        throw new Error(`failed to install bw CLI via npm: ${reason}`);
+    }
+    // 3. Verify installation and return path
+    try {
+        const installed = (await execFileAsync("which", ["bw"], WHICH_TIMEOUT_MS)).trim();
+        if (installed) {
+            (0, runtime_1.emitNervesEvent)({
+                event: "repertoire.bw_cli_install_end",
+                component: "repertoire",
+                message: "bw CLI installed successfully",
+                meta: { path: installed },
+            });
+            return installed;
+        }
+    }
+    catch {
+        // Fall through to error
+    }
+    throw new Error("bw CLI installed via npm but binary not found in PATH");
+}

package/dist/repertoire/credential-access.js

@@ -45,6 +45,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AacCredentialStore = exports.BuiltInCredentialStore = void 0;
 exports.domainToSlug = domainToSlug;
+exports.ensureVaultDefaults = ensureVaultDefaults;
 exports.getCredentialStore = getCredentialStore;
 exports.resetCredentialStore = resetCredentialStore;
 const crypto = __importStar(require("node:crypto"));
@@ -415,6 +416,37 @@ exports.AacCredentialStore = AacCredentialStore;
 // Singleton + auto-detection
 // ---------------------------------------------------------------------------
 let _store = null;
+/**
+ * Auto-add vault defaults to agent.json when no vault section exists.
+ * Returns the vault config (either existing or freshly written defaults).
+ */
+function ensureVaultDefaults(agentName, agentRoot, existingVault) {
+    if (existingVault) {
+        return existingVault;
+    }
+    const configPath = path.join(agentRoot, "agent.json");
+    let raw;
+    try {
+        raw = JSON.parse(fs.readFileSync(configPath, "utf-8"));
+    }
+    catch {
+        // agent.json unreadable — cannot auto-configure
+        return undefined;
+    }
+    const defaults = {
+        email: `${agentName}@ouro.bot`,
+        serverUrl: "https://vault.ouro.bot",
+    };
+    raw.vault = defaults;
+    fs.writeFileSync(configPath, JSON.stringify(raw, null, 2) + "\n", "utf-8");
+    (0, runtime_1.emitNervesEvent)({
+        event: "repertoire.vault_defaults_auto_configured",
+        component: "repertoire",
+        message: "auto-configured vault defaults in agent.json",
+        meta: { agentName, email: defaults.email, serverUrl: defaults.serverUrl },
+    });
+    return defaults;
+}
 /**
  * Get the credential store singleton.
  *
@@ -433,16 +465,19 @@ function getCredentialStore() {
         // Dynamic import to avoid circular dependency at module level
         const identity = require("../heart/identity");
         agentName = identity.getAgentName();
+        const agentRoot = identity.getAgentRoot(agentName);
         // Try to load vault config from agent.json + secrets.json
         const config = identity.loadAgentConfig?.();
-        const vaultConfig = identity.resolveVaultConfig?.(agentName, config?.vault);
+        // Auto-configure vault defaults if missing
+        const vaultSection = ensureVaultDefaults(agentName, agentRoot, config?.vault);
+        const vaultConfig = identity.resolveVaultConfig?.(agentName, vaultSection);
         const secretsPath = identity.getAgentSecretsPath?.(agentName);
         let vaultSecrets;
         /* v8 ignore start -- requires real agent secrets.json + vault config + bw CLI @preserve */
         if (secretsPath) {
             try {
-                const fs = require("fs");
-                const secrets = JSON.parse(fs.readFileSync(secretsPath, "utf-8"));
+                const fsSync = require("fs");
+                const secrets = JSON.parse(fsSync.readFileSync(secretsPath, "utf-8"));
                 vaultSecrets = secrets.vault;
             }
             catch {

package/dist/senses/cli.js

@@ -883,8 +883,7 @@ async function main(agentName, options) {
     const friendsPath = path.join((0, identity_1.getAgentRoot)(), "friends");
     const friendStore = new store_file_1.FileFriendStore(friendsPath);
     const username = os.userInfo().username;
-    const hostname = os.hostname();
-    const localExternalId = `${username}@${hostname}`;
+    const localExternalId = username;
     const resolver = new resolver_1.FriendResolver(friendStore, {
         provider: "local",
         externalId: localExternalId,

package/dist/senses/shared-turn.js

@@ -99,8 +99,7 @@ async function runSenseTurn(options) {
     else {
         // Treat as local user identity (username@hostname pattern)
         const username = os.userInfo().username;
-        const hostname = os.hostname();
-        resolverParams = { provider: "local", externalId: `${username}@${hostname}`, displayName: username, channel };
+        resolverParams = { provider: "local", externalId: username, displayName: username, channel };
     }
     const resolver = new resolver_1.FriendResolver(friendStore, resolverParams);
     // Initialize MCP manager so MCP tools appear as first-class tools in the agent's tool list

package/package.json

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