@ouro.bot/cli 0.1.0-alpha.917 → 0.1.0-alpha.919

package/changelog.json

@@ -1,6 +1,20 @@
 {
   "_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.919",
+      "changes": [
+        "Shepherd now sends the agent's owner a short Teams message for every coding-agent return it judges, saying what it did and why; set senses.shepherd.notify to needs-me or off to hear less.",
+        "Link a new account, such as Teams, to yourself by sending your agent a one-time code from it, and merge duplicate friend records with ouro friend dedupe.",
+        "Your agent can now type an instruction or press a key in one of your coding agents' terminals when you ask it to, so you can steer them from your phone."
+      ]
+    },
+    {
+      "version": "0.1.0-alpha.918",
+      "changes": [
+        "The model table now lists today's Claude 5.5 and GPT 5.5 through 6.1 models with their reasoning levels and image support, new agents default to Claude Opus 5.5, retired 4.6, GPT-5.4 and GPT-5.3 Codex entries are gone, and Claude through GitHub Copilot no longer fails every turn with a tool_choice error."
+      ]
+    },
     {
       "version": "0.1.0-alpha.917",
       "changes": [

package/deploy/unraid/sanctuary.ouro/bundle-meta.json

@@ -1,5 +1,5 @@
 {
-  "runtimeVersion": "0.1.0-alpha.917",
+  "runtimeVersion": "0.1.0-alpha.919",
   "bundleSchemaVersion": 3,
   "lastUpdated": "2026-09-03T00:00:00.000Z"
 }

package/deploy/unraid/sanctuary.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <Container version="2">
   <Name>ouro-butler</Name>
-  <Repository>ghcr.io/ourostack/ouroboros-butler:0.1.0-alpha.917</Repository>
+  <Repository>ghcr.io/ourostack/ouroboros-butler:0.1.0-alpha.919</Repository>
   <Registry>https://github.com/ourostack/ouroboros/pkgs/container/ouroboros-butler</Registry>
   <Network>host</Network>
   <Shell>sh</Shell>

package/dist/heart/config-registry.js

@@ -123,7 +123,7 @@ const registryData = [
         path: "humanFacing.model",
         tier: "self",
         description: "Model name for human-facing interactions.",
-        default: "claude-opus-4-6",
+        default: "claude-opus-5-5",
         effects: "Changes the specific model used for human-facing conversations.",
         topics: ["model", "provider", "llm", "human"],
         validate: validateString,
@@ -141,7 +141,7 @@ const registryData = [
         path: "agentFacing.model",
         tier: "self",
         description: "Model name for agent-facing interactions.",
-        default: "claude-opus-4-6",
+        default: "claude-opus-5-5",
         effects: "Changes the specific model used for private agent-facing turns and agent-to-agent communication.",
         topics: ["model", "provider", "llm", "agent", "inner-lane"],
         validate: validateString,

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

@@ -62,6 +62,8 @@ const semver = __importStar(require("semver"));
 const identity_1 = require("../identity");
 const runtime_1 = require("../../nerves/runtime");
 const friends_1 = require("@ouro.bot/friends");
+const friend_merge_1 = require("../../mind/friend-merge");
+const friend_link_codes_1 = require("../../mind/friend-link-codes");
 const runtime_metadata_1 = require("./runtime-metadata");
 const runtime_mode_1 = require("./runtime-mode");
 const platform_1 = require("../platform");
@@ -506,6 +508,9 @@ function agentResolutionFailureMode(command) {
         case "friend.show":
         case "friend.create":
         case "friend.update":
+        case "friend.linkCode":
+        case "friend.merge":
+        case "friend.dedupe":
         case "habit.list":
         case "habit.create":
         case "habit.runs":
@@ -6145,7 +6150,30 @@ async function performSystemSetup(deps) {
     await registerOuroBundleTypeNonBlocking(deps);
 }
 // ── Friend command execution ──
-async function executeFriendCommand(command, store) {
+async function executeFriendCommand(command, store, paths) {
+    if (command.kind === "friend.linkCode")
+        return executeFriendLinkCode(command, store, paths.agentRoot);
+    if (command.kind === "friend.merge") {
+        const result = await (0, friend_merge_1.mergeFriends)({
+            store,
+            friendsDir: paths.friendsDir,
+            targetId: command.targetId,
+            sourceIds: command.sourceIds,
+            actor: "cli:friend-merge",
+            reason: "owner merged records from the CLI",
+            dryRun: !command.apply,
+        });
+        if (!result.ok)
+            return `error: ${result.message}`;
+        return renderFriendMerge(result.target, result.retired.map((retired) => retired.friendId), result.preservedNoteKeys, result.addedExternalIds, result.dryRun);
+    }
+    if (command.kind === "friend.dedupe") {
+        const result = await (0, friend_merge_1.dedupeFriends)({ store, friendsDir: paths.friendsDir, actor: "cli:friend-dedupe", dryRun: !command.apply });
+        if (result.groups.length === 0)
+            return "no duplicate friend records found";
+        const blocks = result.groups.map((group) => renderFriendMerge(group.canonical, group.duplicateIds, group.preservedNoteKeys, group.addedExternalIds, result.dryRun));
+        return [...blocks, ...(result.dryRun ? ["", "dry run: nothing changed. Re-run with --apply to merge."] : [])].join("\n");
+    }
     if (command.kind === "friend.list") {
         const listAll = store.listAll;
         if (!listAll)
@@ -6229,6 +6257,50 @@ async function executeFriendCommand(command, store) {
         return `identity not linked: ${command.provider}:${command.externalId}`;
     return `unlinked ${command.provider}:${command.externalId} from ${command.friendId}`;
 }
+function renderFriendMerge(target, retiredIds, preservedNoteKeys, addedExternalIds, dryRun) {
+    const verb = dryRun ? "would merge" : "merged";
+    const lines = [`${verb} ${retiredIds.length} record(s) into ${target.id} (${target.name}, ${target.trustLevel})`];
+    for (const id of retiredIds)
+        lines.push(`  ${dryRun ? "would retire" : "retired"} ${id}`);
+    for (const externalId of addedExternalIds)
+        lines.push(`  ${dryRun ? "would link" : "linked"} ${externalId.provider}:${externalId.externalId}${externalId.tenantId ? ` (tenant ${externalId.tenantId})` : ""}`);
+    if (preservedNoteKeys.length > 0)
+        lines.push(`  kept conflicting notes as: ${preservedNoteKeys.join(", ")}`);
+    return lines.join("\n");
+}
+async function executeFriendLinkCode(command, store, agentRoot) {
+    let friend;
+    if (command.friendId) {
+        friend = await store.get(command.friendId);
+        if (!friend || friend.id !== command.friendId)
+            return `friend not found: ${command.friendId}`;
+    }
+    else {
+        // The person at this terminal owns the agent: their family record carries a local identity for this OS user.
+        const owner = (0, friends_1.machineOwnerUsername)();
+        const all = store.listAll ? await store.listAll() : [];
+        const candidates = all.filter((record) => record.trustLevel === "family"
+            && record.externalIds.some((externalId) => (0, friends_1.isLocalMachineOwnerIdentity)(externalId.provider, externalId.externalId, owner)));
+        if (candidates.length === 0)
+            return "error: no family record names this machine's owner. Pass --friend <friend-id>.";
+        if (candidates.length > 1)
+            return `error: ${candidates.length} family records name this machine's owner. Run \`ouro friend dedupe --apply\` first, or pass --friend <friend-id>.`;
+        friend = candidates[0];
+    }
+    const issued = (0, friend_link_codes_1.issueLinkCode)({
+        agentRoot,
+        friend,
+        ...(command.channel ? { channel: command.channel } : {}),
+        ...(command.ttlMinutes ? { ttlMs: command.ttlMinutes * 60 * 1000 } : {}),
+        issuedBy: "cli",
+    });
+    const minutes = Math.round((Date.parse(issued.expiresAt) - Date.now()) / 60000);
+    const where = issued.channel ? `from your ${issued.channel} account` : "from the account you want to link";
+    return [
+        `link code for ${friend.name} (${friend.trustLevel}): ${issued.code}`,
+        `Send exactly this code to ${path.basename(agentRoot, ".ouro")} ${where}, in a 1:1 chat, within ${minutes} minutes. It works once.`,
+    ].join("\n");
+}
 async function executeA2AClientCommand(command, deps) {
     const { loadOrMintA2AIdentityFile } = await Promise.resolve().then(() => __importStar(require("../../a2a/identity")));
     /* v8 ignore next -- production CLI keeps the client key under the home dir; tests pass an explicit file @preserve */
@@ -8107,19 +8179,16 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
     }
     // ── friend subcommands (local, no daemon socket needed) ──
     if (command.kind === "friend.list" || command.kind === "friend.show" || command.kind === "friend.create" ||
-        command.kind === "friend.update" || command.kind === "friend.link" || command.kind === "friend.unlink") {
-        /* v8 ignore start -- production default: requires full identity setup @preserve */
-        let store = deps.friendStore;
-        if (!store) {
-            // Derive agent-scoped friends dir from --agent flag or link/unlink's agent field
-            const agentName = ("agent" in command && command.agent) ? command.agent : undefined;
-            const friendsDir = agentName
-                ? path.join(deps.bundlesRoot ?? (0, identity_1.getAgentBundlesRoot)(), `${agentName}.ouro`, "friends")
-                : path.join(deps.bundlesRoot ?? (0, identity_1.getAgentBundlesRoot)(), "friends");
-            store = new friends_1.FileFriendStore(friendsDir);
-        }
-        /* v8 ignore stop */
-        const message = await executeFriendCommand(command, store);
+        command.kind === "friend.update" || command.kind === "friend.link" || command.kind === "friend.unlink" ||
+        command.kind === "friend.linkCode" || command.kind === "friend.merge" || command.kind === "friend.dedupe") {
+        // Derive agent-scoped friends dir from --agent flag or link/unlink's agent field
+        const agentName = ("agent" in command && command.agent) ? command.agent : undefined;
+        const bundlesRoot = deps.bundlesRoot ?? /* v8 ignore next -- production default @preserve */ (0, identity_1.getAgentBundlesRoot)();
+        const agentRoot = agentName ? path.join(bundlesRoot, `${agentName}.ouro`) : bundlesRoot;
+        const friendsDir = path.join(agentRoot, "friends");
+        /* v8 ignore next -- production default: requires full identity setup @preserve */
+        const store = deps.friendStore ?? new friends_1.FileFriendStore(friendsDir);
+        const message = await executeFriendCommand(command, store, { agentRoot, friendsDir });
         deps.writeStdout(message);
         return message;
     }

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

@@ -240,9 +240,9 @@ exports.COMMAND_REGISTRY = {
     friend: {
         category: "Friends",
         description: "Manage agent friends and identity links",
-        usage: "ouro friend <subcommand> [--agent <name>]",
-        example: "ouro friend list",
-        subcommands: ["list", "show", "create", "update", "link", "unlink"],
+        usage: "ouro friend <subcommand> [--agent <name>]  (link --channel <channel> issues a one-time code; merge/dedupe preview unless --apply)",
+        example: "ouro friend link --agent ouroboros --channel teams",
+        subcommands: ["list", "show", "create", "update", "link", "unlink", "merge", "dedupe"],
     },
     link: {
         category: "Friends",

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

@@ -1631,12 +1631,76 @@ function parseFriendCommand(args) {
             ...(agent ? { agent } : {}),
         };
     }
-    if (sub === "link")
-        return parseLinkCommand(rest, "friend.link");
+    if (sub === "link") {
+        // Without an explicit identity, `link` issues a code the person sends from the new account.
+        if (!rest.includes("--provider") && !rest.includes("--external-id") && (agent || rest[0]?.startsWith("--"))) {
+            return parseFriendLinkCodeCommand(rest, agent);
+        }
+        return parseLinkCommand(agent ? [agent, ...rest] : rest, "friend.link");
+    }
     if (sub === "unlink")
-        return parseLinkCommand(rest, "friend.unlink");
+        return parseLinkCommand(agent ? [agent, ...rest] : rest, "friend.unlink");
+    if (sub === "merge") {
+        const usage = "Usage: ouro friend merge --into <friend-id> <friend-id>... [--agent <name>] [--apply]";
+        let targetId;
+        let apply = false;
+        const sourceIds = [];
+        for (let i = 0; i < rest.length; i += 1) {
+            const token = rest[i];
+            if (token === "--into") {
+                targetId = rest[i + 1];
+                i += 1;
+            }
+            else if (token === "--apply") {
+                apply = true;
+            }
+            else if (token.startsWith("--")) {
+                throw new Error(usage);
+            }
+            else {
+                sourceIds.push(token);
+            }
+        }
+        if (!targetId || sourceIds.length === 0)
+            throw new Error(usage);
+        return { kind: "friend.merge", targetId, sourceIds, apply, ...(agent ? { agent } : {}) };
+    }
+    if (sub === "dedupe") {
+        const usage = "Usage: ouro friend dedupe [--agent <name>] [--apply]";
+        if (rest.some((token) => token !== "--apply"))
+            throw new Error(usage);
+        return { kind: "friend.dedupe", apply: rest.includes("--apply"), ...(agent ? { agent } : {}) };
+    }
     throw new Error(`Usage\n${usage()}`);
 }
+const FRIEND_LINK_CODE_USAGE = "Usage: ouro friend link --agent <name> [--channel <teams|bluebubbles|telegram|mail|voice|mcp|cli>] [--friend <friend-id>] [--ttl-minutes <n>]";
+const LINK_CODE_CHANNELS = ["cli", "teams", "bluebubbles", "mail", "voice", "a2a", "mcp", "telegram"];
+function parseFriendLinkCodeCommand(rest, agent) {
+    let friendId;
+    let channel;
+    let ttlMinutes;
+    for (let i = 0; i < rest.length; i += 2) {
+        const token = rest[i];
+        const value = rest[i + 1];
+        if (!value)
+            throw new Error(FRIEND_LINK_CODE_USAGE);
+        if (token === "--friend")
+            friendId = value;
+        else if (token === "--channel" && LINK_CODE_CHANNELS.includes(value))
+            channel = value;
+        else if (token === "--ttl-minutes" && /^[1-9][0-9]*$/.test(value))
+            ttlMinutes = Number(value);
+        else
+            throw new Error(FRIEND_LINK_CODE_USAGE);
+    }
+    return {
+        kind: "friend.linkCode",
+        ...(agent ? { agent } : {}),
+        ...(friendId ? { friendId } : {}),
+        ...(channel ? { channel } : {}),
+        ...(ttlMinutes ? { ttlMinutes } : {}),
+    };
+}
 function parseA2ACommand(args) {
     const { agent, rest: cleaned } = extractAgentFlag(args);
     const [sub, ...rest] = cleaned;

package/dist/heart/identity.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HARNESS_CANONICAL_REPO_URL = exports.DEFAULT_AGENT_SENSES = exports.LEGACY_VAULT_SERVER_URL_ALIASES = exports.DEFAULT_VAULT_SERVER_URL = exports.DEFAULT_AGENT_PHRASES = exports.DEFAULT_AGENT_CONTEXT = exports.PROVIDER_CREDENTIALS = exports.normalizeHabitPaidTurnsPerDay = void 0;
+exports.HARNESS_CANONICAL_REPO_URL = exports.DEFAULT_AGENT_SENSES = exports.LEGACY_VAULT_SERVER_URL_ALIASES = exports.DEFAULT_VAULT_SERVER_URL = exports.DEFAULT_AGENT_PHRASES = exports.DEFAULT_AGENT_CONTEXT = exports.SHEPHERD_NOTICE_POLICIES = exports.PROVIDER_CREDENTIALS = exports.normalizeHabitPaidTurnsPerDay = void 0;
 exports.normalizeVaultServerUrl = normalizeVaultServerUrl;
 exports.getVaultServerUrlCandidates = getVaultServerUrlCandidates;
 exports.defaultStableVaultEmail = defaultStableVaultEmail;
@@ -75,6 +75,7 @@ exports.PROVIDER_CREDENTIALS = {
     "openai-compatible": { required: ["apiKey", "baseUrl"], envVars: {}, promptLabels: { apiKey: "Z.ai API key", baseUrl: "Z.ai canonical base URL" } },
     "openai-compatible-gemini": { required: ["apiKey", "baseUrl"], envVars: {}, promptLabels: { apiKey: "Gemini API key", baseUrl: "Gemini canonical base URL" } },
 };
+exports.SHEPHERD_NOTICE_POLICIES = ["every", "needs-me", "off"];
 exports.DEFAULT_AGENT_CONTEXT = {
     maxTokens: 80000,
     contextMargin: 20,
@@ -215,6 +216,21 @@ function normalizeSenses(value, configFile) {
             defaults[senseName] = { enabled, hostUsername: hostUsername.trim() };
             continue;
         }
+        const notify = rawSense.notify;
+        if (senseName === "shepherd" && notify !== undefined) {
+            if (!exports.SHEPHERD_NOTICE_POLICIES.includes(notify)) {
+                (0, runtime_1.emitNervesEvent)({
+                    level: "error",
+                    event: "config_identity.error",
+                    component: "config/identity",
+                    message: "agent config has invalid Shepherd notice policy",
+                    meta: { path: configFile, sense: senseName },
+                });
+                throw new Error(`agent.json at ${configFile}: senses.shepherd.notify must be one of ${exports.SHEPHERD_NOTICE_POLICIES.join(", ")}.`);
+            }
+            defaults[senseName] = { enabled, notify: notify };
+            continue;
+        }
         defaults[senseName] = { enabled };
     }
     return defaults;
@@ -223,8 +239,8 @@ function buildDefaultAgentTemplate(_agentName) {
     return {
         version: 2,
         enabled: true,
-        humanFacing: { provider: "anthropic", model: "claude-opus-4-6" },
-        agentFacing: { provider: "anthropic", model: "claude-opus-4-6" },
+        humanFacing: { provider: "anthropic", model: "claude-opus-5-5" },
+        agentFacing: { provider: "anthropic", model: "claude-opus-5-5" },
         context: { ...exports.DEFAULT_AGENT_CONTEXT },
         habitPaidTurnsPerDay: autonomy_budget_1.DEFAULT_HABIT_PAID_TURNS_PER_DAY,
         senses: {

package/dist/heart/model-capabilities.js

@@ -3,39 +3,95 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MODEL_CAPABILITIES = void 0;
 exports.getModelCapabilities = getModelCapabilities;
 const runtime_1 = require("../nerves/runtime");
+// Copilot rows (dot-named ids) mirror GitHub Copilot's /models endpoint as of
+// 2026-10-12. Direct Anthropic rows (dash-named ids) copy their Copilot twins.
 exports.MODEL_CAPABILITIES = {
-    "claude-opus-4-6": {
-        reasoningEffort: ["low", "medium", "high", "max"],
+    "claude-opus-5.5": {
+        reasoningEffort: ["low", "medium", "high", "xhigh", "max"],
+        maxOutputTokens: 128000,
+        vision: true,
+    },
+    "claude-sonnet-5.5": {
+        reasoningEffort: ["low", "medium", "high", "xhigh", "max"],
+        maxOutputTokens: 128000,
+        vision: true,
+    },
+    "claude-haiku-5.5": {
+        reasoningEffort: ["low", "medium", "high", "xhigh", "max"],
+        maxOutputTokens: 128000,
+        vision: true,
+    },
+    "claude-opus-5-5": {
+        reasoningEffort: ["low", "medium", "high", "xhigh", "max"],
+        thinkingFormat: "anthropic",
+        maxOutputTokens: 128000,
+        vision: true,
+    },
+    "claude-sonnet-5-5": {
+        reasoningEffort: ["low", "medium", "high", "xhigh", "max"],
         thinkingFormat: "anthropic",
         maxOutputTokens: 128000,
         vision: true,
     },
-    "claude-sonnet-4-6": {
-        reasoningEffort: ["low", "medium", "high"],
+    "claude-haiku-5-5": {
+        reasoningEffort: ["low", "medium", "high", "xhigh", "max"],
         thinkingFormat: "anthropic",
-        maxOutputTokens: 64000,
+        maxOutputTokens: 128000,
+        vision: true,
+    },
+    "gpt-6.1-sol": {
+        reasoningEffort: ["none", "low", "medium", "high", "xhigh", "max"],
+        phase: true,
+        maxOutputTokens: 128000,
+        vision: true,
+    },
+    "gpt-6-sol": {
+        reasoningEffort: ["none", "low", "medium", "high", "xhigh", "max"],
+        phase: true,
+        maxOutputTokens: 128000,
+        vision: true,
+    },
+    "gpt-6-luna": {
+        reasoningEffort: ["none", "low", "medium", "high", "xhigh", "max"],
+        phase: true,
+        maxOutputTokens: 128000,
+        vision: true,
+    },
+    "gpt-6-astra": {
+        reasoningEffort: ["low", "medium", "high", "xhigh", "max"],
+        phase: true,
+        maxOutputTokens: 128000,
         vision: true,
     },
-    "claude-opus-4.6": {
-        reasoningEffort: ["low", "medium", "high", "max"],
+    "gpt-5.6-sol": {
+        reasoningEffort: ["none", "low", "medium", "high", "xhigh", "max"],
+        phase: true,
+        maxOutputTokens: 128000,
+        vision: true,
+    },
+    "gpt-5.6-sol-fast": {
+        reasoningEffort: ["none", "low", "medium", "high", "xhigh", "max"],
+        phase: true,
         maxOutputTokens: 128000,
         vision: true,
     },
-    "claude-sonnet-4.6": {
-        reasoningEffort: ["low", "medium", "high"],
-        maxOutputTokens: 64000,
+    "gpt-5.6-luna": {
+        reasoningEffort: ["none", "low", "medium", "high", "xhigh", "max"],
+        phase: true,
+        maxOutputTokens: 128000,
         vision: true,
     },
-    "gpt-5.4": {
-        reasoningEffort: ["low", "medium", "high"],
+    "gpt-5.6-terra": {
+        reasoningEffort: ["none", "low", "medium", "high", "xhigh", "max"],
         phase: true,
-        maxOutputTokens: 100000,
+        maxOutputTokens: 128000,
         vision: true,
     },
-    "gpt-5.3-codex": {
-        reasoningEffort: ["low", "medium", "high"],
+    "gpt-5.5": {
+        reasoningEffort: ["none", "low", "medium", "high", "xhigh"],
         phase: true,
-        maxOutputTokens: 100000,
+        maxOutputTokens: 128000,
+        vision: true,
     },
     "MiniMax-Text-01": {
         vision: true,

package/dist/heart/provider-models.js

@@ -9,11 +9,11 @@ exports.resolveModelForProviderDisplay = resolveModelForProviderDisplay;
 exports.getProviderModelMismatchMessage = getProviderModelMismatchMessage;
 const runtime_1 = require("../nerves/runtime");
 exports.DEFAULT_PROVIDER_MODELS = {
-    anthropic: "claude-opus-4-6",
+    anthropic: "claude-opus-5-5",
     azure: "gpt-4o-mini",
     minimax: "MiniMax-M3",
-    "openai-codex": "gpt-5.4",
-    "github-copilot": "claude-sonnet-4.6",
+    "openai-codex": "gpt-5.5",
+    "github-copilot": "claude-opus-5.5",
     "openai-compatible": "glm-5.3-flash",
     "openai-compatible-gemini": "gemini-3.6-flash",
 };

package/dist/heart/providers/github-copilot.js

@@ -63,8 +63,11 @@ function createGithubCopilotProviderRuntime(model, config = (0, config_1.getGith
                     params.model = this.model;
                 if (request.traceId)
                     params.metadata = { trace_id: request.traceId };
+                // Copilot's Claude models think adaptively, and thinking only accepts
+                // tool_choice "auto" or "none"; "required" fails every turn with a 400.
+                // The engine already retries a turn that ends without a tool call.
                 if (request.toolChoiceRequired)
-                    params.tool_choice = "required";
+                    params.tool_choice = "auto";
                 try {
                     return await (0, streaming_1.streamChatCompletion)(this.client, params, request.callbacks, request.signal, request.eagerSettleStreaming);
                 }