@ouro.bot/cli 0.1.0-alpha.14 → 0.1.0-alpha.140

package/dist/senses/trust-gate.js

@@ -39,6 +39,9 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const identity_1 = require("../heart/identity");
 const runtime_1 = require("../nerves/runtime");
+const types_1 = require("../mind/friends/types");
+const pending_1 = require("../mind/pending");
+// Canned reply; eventually agents should compose their own first-contact message
 exports.STRANGER_AUTO_REPLY = "I'm sorry, I'm not allowed to talk to strangers";
 function buildExternalKey(provider, externalId, tenantId) {
     return `${provider}:${tenantId ?? ""}:${externalId}`;
@@ -77,16 +80,107 @@ function appendPrimaryNotification(bundleRoot, provider, externalId, tenantId, n
     fs.mkdirSync(inboxDir, { recursive: true });
     fs.appendFileSync(notificationsPath, `${JSON.stringify(payload)}\n`, "utf8");
 }
+function writeInnerPendingNotice(bundleRoot, noticeContent, nowIso) {
+    const innerPendingDir = path.join(bundleRoot, "state", "pending", pending_1.INNER_DIALOG_PENDING.friendId, pending_1.INNER_DIALOG_PENDING.channel, pending_1.INNER_DIALOG_PENDING.key);
+    const fileName = `${Date.now()}-${Math.random().toString(36).slice(2, 8)}.json`;
+    const filePath = path.join(innerPendingDir, fileName);
+    const payload = {
+        from: "instinct",
+        content: noticeContent,
+        timestamp: Date.now(),
+        at: nowIso,
+    };
+    fs.mkdirSync(innerPendingDir, { recursive: true });
+    fs.writeFileSync(filePath, JSON.stringify(payload), "utf-8");
+}
 function enforceTrustGate(input) {
+    const { senseType } = input;
+    // Local (CLI) and internal (inner dialog) — always allow
+    if (senseType === "local" || senseType === "internal") {
+        return { allowed: true };
+    }
+    // Closed senses (Teams) — org already gates access, allow all trust levels
+    if (senseType === "closed") {
+        return { allowed: true };
+    }
+    // Open senses (BlueBubbles/iMessage) — enforce trust rules
     const trustLevel = input.friend.trustLevel ?? "friend";
-    if (trustLevel !== "stranger") {
+    // Family and friend — always allow on open
+    if ((0, types_1.isTrustedLevel)(trustLevel)) {
         return { allowed: true };
     }
     const bundleRoot = input.bundleRoot ?? (0, identity_1.getAgentRoot)();
-    const repliesPath = path.join(bundleRoot, "stranger-replies.json");
     const nowIso = (input.now ?? (() => new Date()))().toISOString();
+    // Acquaintance rules
+    if (trustLevel === "acquaintance") {
+        return handleAcquaintance(input, bundleRoot, nowIso);
+    }
+    // Stranger rules (trustLevel === "stranger")
+    return handleStranger(input, bundleRoot, nowIso);
+}
+function handleAcquaintance(input, bundleRoot, nowIso) {
+    const { isGroupChat, groupHasFamilyMember, hasExistingGroupWithFamily } = input;
+    // Group chat with family member present — allow
+    if (isGroupChat && groupHasFamilyMember) {
+        return { allowed: true };
+    }
+    let result;
+    let noticeDetail;
+    if (isGroupChat) {
+        // Group chat without family member — reject silently
+        result = { allowed: false, reason: "acquaintance_group_no_family" };
+        noticeDetail = `acquaintance "${input.friend.name}" messaged in a group chat without a family member present`;
+    }
+    else if (hasExistingGroupWithFamily) {
+        // 1:1 but shares a group with family — redirect
+        result = {
+            allowed: false,
+            reason: "acquaintance_1on1_has_group",
+            autoReply: "Hey! Reach me in our group chat instead.",
+        };
+        noticeDetail = `acquaintance "${input.friend.name}" DMed me directly — redirected to our group chat`;
+    }
+    else {
+        // 1:1, no shared group with family — redirect to any group
+        result = {
+            allowed: false,
+            reason: "acquaintance_1on1_no_group",
+            autoReply: "Hey! Reach me in a group chat instead.",
+        };
+        noticeDetail = `acquaintance "${input.friend.name}" DMed me directly — asked to reach me in a group chat`;
+    }
+    (0, runtime_1.emitNervesEvent)({
+        level: "warn",
+        component: "senses",
+        event: "senses.trust_gate",
+        message: "acquaintance message blocked",
+        meta: {
+            channel: input.channel,
+            provider: input.provider,
+            reason: result.reason,
+        },
+    });
+    try {
+        writeInnerPendingNotice(bundleRoot, noticeDetail, nowIso);
+    }
+    catch (error) {
+        (0, runtime_1.emitNervesEvent)({
+            level: "error",
+            component: "senses",
+            event: "senses.trust_gate_error",
+            message: "failed to write inner pending notice",
+            meta: {
+                reason: error instanceof Error ? error.message : String(error),
+            },
+        });
+    }
+    return result;
+}
+function handleStranger(input, bundleRoot, nowIso) {
+    const repliesPath = path.join(bundleRoot, "stranger-replies.json");
     const externalKey = buildExternalKey(input.provider, input.externalId, input.tenantId);
     const state = loadRepliesState(repliesPath);
+    // Subsequent contact — silent drop
     if (state[externalKey]) {
         (0, runtime_1.emitNervesEvent)({
             level: "warn",
@@ -103,6 +197,7 @@ function enforceTrustGate(input) {
             reason: "stranger_silent_drop",
         };
     }
+    // First contact — auto-reply, persist state, notify agent
     state[externalKey] = nowIso;
     try {
         persistRepliesState(repliesPath, state);
@@ -132,6 +227,21 @@ function enforceTrustGate(input) {
             },
         });
     }
+    const noticeDetail = `stranger "${input.friend.name}" tried to reach me via ${input.channel}. Auto-replied once.`;
+    try {
+        writeInnerPendingNotice(bundleRoot, noticeDetail, nowIso);
+    }
+    catch (error) {
+        (0, runtime_1.emitNervesEvent)({
+            level: "error",
+            component: "senses",
+            event: "senses.trust_gate_error",
+            message: "failed to write inner pending notice",
+            meta: {
+                reason: error instanceof Error ? error.message : String(error),
+            },
+        });
+    }
     (0, runtime_1.emitNervesEvent)({
         level: "warn",
         component: "senses",

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@ouro.bot/cli",
-  "version": "0.1.0-alpha.14",
+  "version": "0.1.0-alpha.140",
   "main": "dist/heart/daemon/ouro-entry.js",
   "bin": {
+    "cli": "dist/heart/daemon/ouro-bot-entry.js",
     "ouro": "dist/heart/daemon/ouro-entry.js",
     "ouro.bot": "dist/heart/daemon/ouro-bot-entry.js"
   },
@@ -10,14 +11,17 @@
     "dist/",
     "AdoptionSpecialist.ouro/",
     "subagents/",
-    "assets/"
+    "skills/",
+    "assets/",
+    "changelog.json"
   ],
   "exports": {
     ".": "./dist/heart/daemon/daemon-cli.js",
     "./runOuroCli": "./dist/heart/daemon/daemon-cli.js"
   },
   "scripts": {
-    "dev": "tsc && node dist/senses/cli-entry.js --agent ouroboros",
+    "dev": "tsc && node dist/heart/daemon/ouro-bot-entry.js dev",
+    "cli": "tsc && node dist/senses/cli-entry.js",
     "daemon": "tsc && node dist/heart/daemon/daemon-entry.js",
     "ouro": "tsc && node dist/heart/daemon/ouro-entry.js",
     "teams": "tsc && node dist/senses/teams-entry.js --agent ouroboros",
@@ -31,15 +35,19 @@
   },
   "dependencies": {
     "@anthropic-ai/sdk": "^0.78.0",
+    "@azure/identity": "^4.13.0",
     "@microsoft/teams.apps": "^2.0.5",
     "@microsoft/teams.dev": "^2.0.5",
-    "openai": "^6.27.0"
+    "fast-glob": "^3.3.3",
+    "openai": "^6.27.0",
+    "semver": "^7.7.4"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/ouroborosbot/ouroboros"
   },
   "devDependencies": {
+    "@types/semver": "^7.7.1",
     "@vitest/coverage-v8": "^4.0.18",
     "eslint": "^10.0.2",
     "typescript": "^5.7.0",

package/skills/configure-dev-tools.md

@@ -0,0 +1,109 @@
+# Configure Dev Tools for MCP Agent Bridge
+
+Set up your development tools (Claude Code, Codex) to communicate with Ouroboros agents via MCP (Model Context Protocol). This enables bidirectional structured communication between dev tools and running agents.
+
+## Claude Code Setup
+
+Add an MCP server entry to your Claude Code settings at `~/.claude/settings.json`:
+
+```json
+{
+  "mcpServers": {
+    "ouro": {
+      "command": "ouro",
+      "args": ["mcp-serve", "--agent", "<agent-name>"]
+    }
+  }
+}
+```
+
+Replace `<agent-name>` with the name of the agent you want to connect to (e.g., `slugger`).
+
+### Per-project configuration
+
+You can also add the MCP entry to a project-level `.claude/settings.json` to scope it to a specific workspace.
+
+## Codex Setup
+
+Add the MCP server using the Codex CLI:
+
+```bash
+codex mcp add ouro -- ouro mcp-serve --agent <agent-name>
+```
+
+### Spawned session injection
+
+When the agent spawns Codex for coding tasks, MCP configuration is injected automatically via the `-c` flag:
+
+```bash
+codex -c '{"mcp_servers":{"ouro":{"command":"ouro","args":["mcp-serve","--agent","<agent-name>"]}}}' ...
+```
+
+You do not need to configure this manually -- the harness handles it.
+
+## Verification
+
+After configuration, verify the connection:
+
+1. **Check daemon is running**: The agent daemon must be active. Start it with `ouro daemon --agent <agent-name>` if needed.
+2. **Test from Claude Code**: Ask Claude Code to use the `status` tool to check the agent's state.
+3. **Test from Codex**: Run `codex exec "Use the ouro status tool to check the agent"`.
+
+## Available MCP Tools
+
+Once connected, the following tools are available:
+
+- **ask** -- Ask the agent a question (uses memory and context)
+- **status** -- Get agent's current status and activity
+- **catchup** -- Get recent activity summary
+- **delegate** -- Request the agent to handle a task
+- **get_context** -- Get agent's current working context
+- **search_memory** -- Search agent's memory for specific topics
+- **get_task** -- Get details of the agent's current task
+- **check_scope** -- Verify if something is in scope for current work
+- **request_decision** -- Ask agent to make a decision about something
+- **check_guidance** -- Get guidance on how to approach something
+- **report_progress** -- Report progress on delegated work
+- **report_blocker** -- Report a blocker on delegated work
+- **report_complete** -- Report completion of delegated work
+
+## Hybrid Model
+
+The MCP bridge creates a hybrid collaboration model:
+
+- **Dev tool** (Claude Code / Codex) handles code editing, file operations, and tool execution
+- **Agent** (Ouroboros) provides context, memory, task awareness, and decision-making
+- **Communication** flows both directions via MCP tool calls
+
+This means the dev tool can ask the agent for guidance mid-task, and the agent can monitor progress through structured reports.
+
+## Troubleshooting
+
+### "Daemon not running" error
+The agent daemon must be active before the MCP server can forward requests. Start it with:
+```bash
+ouro daemon --agent <agent-name>
+```
+
+### MCP server not appearing in tool list
+- Verify the `ouro` command is available in your PATH (install via `npm install -g @ouro.bot/cli`)
+- Check that the settings file is valid JSON
+- Restart your dev tool after changing MCP configuration
+
+### Connection timeouts
+The MCP server connects to the daemon via Unix socket. If the socket file is stale:
+1. Stop the daemon: `ouro daemon stop --agent <agent-name>`
+2. Restart: `ouro daemon --agent <agent-name>`
+
+### Friend identity
+By default, the MCP server identifies as the local user. To use a specific friend identity:
+```json
+{
+  "mcpServers": {
+    "ouro": {
+      "command": "ouro",
+      "args": ["mcp-serve", "--agent", "<agent-name>", "--friend", "<friend-id>"]
+    }
+  }
+}
+```

package/subagents/README.md

@@ -1,73 +1,7 @@
-# Sub-agents
+# Workflow Skills (Moved)
 
-These are source-of-truth workflow definitions (`work-planner`, `work-doer`, `work-merger`) for planning, execution, and merge. They can be consumed either as Claude sub-agents (`.md` files with YAML frontmatter) or as Codex-style skills (`SKILL.md`).
+The workflow skills (`work-planner`, `work-doer`, `work-merger`) have moved to the shared skills repository:
 
-## Installation
+**https://github.com/ouroborosbot/ouroboros-skills**
 
-### Claude Code (sub-agents)
-
-Copy or symlink these files into Claude's sub-agent directory:
-
-```bash
-# Claude Code
-cp subagents/*.md ~/.claude/agents/
-# or
-ln -s "$(pwd)"/subagents/*.md ~/.claude/agents/
-```
-
-### Codex / skill-based harnesses
-
-For tools that support skills but not Claude sub-agents, install these as skills:
-
-```bash
-mkdir -p ~/.codex/skills/work-planner ~/.codex/skills/work-doer ~/.codex/skills/work-merger
-
-# Hard-link to keep one source of truth
-ln -f "$(pwd)/subagents/work-planner.md" ~/.codex/skills/work-planner/SKILL.md
-ln -f "$(pwd)/subagents/work-doer.md" ~/.codex/skills/work-doer/SKILL.md
-ln -f "$(pwd)/subagents/work-merger.md" ~/.codex/skills/work-merger/SKILL.md
-```
-
-**Important:** Hard-links break when editors save by replacing the file (new inode). After editing any `subagents/*.md` file, re-run the `ln -f` command for that file to restore the link. You can verify with `stat -f '%i'` — both files should share the same inode.
-
-Optional UI metadata:
-
-```bash
-mkdir -p ~/.codex/skills/work-planner/agents ~/.codex/skills/work-doer/agents ~/.codex/skills/work-merger/agents
-cat > ~/.codex/skills/work-planner/agents/openai.yaml << 'EOF'
-interface:
-  display_name: "Work Planner"
-  short_description: "Create and gate planning/doing task docs"
-  default_prompt: "Use $work-planner to create or update a planning doc, then stop at NEEDS_REVIEW."
-EOF
-cat > ~/.codex/skills/work-doer/agents/openai.yaml << 'EOF'
-interface:
-  display_name: "Work Doer"
-  short_description: "Execute approved doing docs with strict TDD"
-  default_prompt: "Use $work-doer to execute an approved doing doc unit by unit."
-EOF
-cat > ~/.codex/skills/work-merger/agents/openai.yaml << 'EOF'
-interface:
-  display_name: "Work Merger"
-  short_description: "Merge feature branch into main via PR after work-doer completes"
-  default_prompt: "Use $work-merger to merge the current feature branch into main."
-EOF
-```
-
-Restart the harness after install so new skills are discovered.
-
-## Available sub-agents
-
-| File | Purpose |
-|------|---------|
-| `work-planner.md` | Interactive task planner. Generates planning docs through conversation, then converts to doing docs after human approval. |
-| `work-doer.md` | Task executor. Reads a doing doc and works through each unit sequentially with strict TDD. |
-| `work-merger.md` | Sync-and-merge agent. Merges feature branch into main via PR after work-doer completes. Handles conflicts, CI failures, and race conditions. |
-
-## Workflow
-
-1. Human describes a task
-2. Agent invokes **work-planner** to create a planning doc → human approves → planner converts to doing doc
-3. Agent invokes **work-doer** to execute the doing doc unit by unit
-4. Each unit is committed independently with progress tracked in the doing doc
-5. Agent invokes **work-merger** to merge the feature branch into main via PR (fetch, merge, resolve conflicts, CI gate, merge PR, cleanup)
+To install or update these skills, use the **skill-management** skill from that repo. It covers browsing available skills, installing them into your agent's local skills directory, and keeping them up to date.

package/dist/heart/daemon/subagent-installer.js

@@ -1,134 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.installSubagentsForAvailableCli = installSubagentsForAvailableCli;
-const fs = __importStar(require("fs"));
-const os = __importStar(require("os"));
-const path = __importStar(require("path"));
-const child_process_1 = require("child_process");
-const runtime_1 = require("../../nerves/runtime");
-function detectCliBinary(binary) {
-    const result = (0, child_process_1.spawnSync)("which", [binary], { encoding: "utf-8" });
-    if (result.status !== 0)
-        return null;
-    const resolved = result.stdout.trim();
-    return resolved.length > 0 ? resolved : null;
-}
-function listSubagentSources(subagentsDir) {
-    if (!fs.existsSync(subagentsDir))
-        return [];
-    return fs.readdirSync(subagentsDir)
-        .filter((name) => name.endsWith(".md"))
-        .filter((name) => name !== "README.md")
-        .map((name) => path.join(subagentsDir, name))
-        .sort((a, b) => a.localeCompare(b));
-}
-function pathExists(target) {
-    try {
-        fs.lstatSync(target);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-function ensureSymlink(source, target) {
-    fs.mkdirSync(path.dirname(target), { recursive: true });
-    if (pathExists(target)) {
-        const stats = fs.lstatSync(target);
-        if (stats.isSymbolicLink()) {
-            const linkedPath = fs.readlinkSync(target);
-            if (linkedPath === source)
-                return false;
-        }
-        fs.unlinkSync(target);
-    }
-    fs.symlinkSync(source, target);
-    return true;
-}
-async function installSubagentsForAvailableCli(options = {}) {
-    const repoRoot = options.repoRoot ?? path.resolve(__dirname, "..", "..", "..");
-    const homeDir = options.homeDir ?? os.homedir();
-    const which = options.which ?? detectCliBinary;
-    const subagentsDir = path.join(repoRoot, "subagents");
-    const sources = listSubagentSources(subagentsDir);
-    const notes = [];
-    (0, runtime_1.emitNervesEvent)({
-        component: "daemon",
-        event: "daemon.subagent_install_start",
-        message: "starting subagent auto-install",
-        meta: { sources: sources.length },
-    });
-    if (sources.length === 0) {
-        notes.push(`no subagent files found at ${subagentsDir}`);
-        return { claudeInstalled: 0, codexInstalled: 0, notes };
-    }
-    let claudeInstalled = 0;
-    let codexInstalled = 0;
-    const claudePath = which("claude");
-    if (!claudePath) {
-        notes.push("claude CLI not found; skipping subagent install");
-    }
-    else {
-        const claudeAgentsDir = path.join(homeDir, ".claude", "agents");
-        for (const source of sources) {
-            const target = path.join(claudeAgentsDir, path.basename(source));
-            if (ensureSymlink(source, target)) {
-                claudeInstalled += 1;
-            }
-        }
-    }
-    const codexPath = which("codex");
-    if (!codexPath) {
-        notes.push("codex CLI not found; skipping subagent install");
-    }
-    else {
-        const codexSkillsDir = path.join(homeDir, ".codex", "skills");
-        for (const source of sources) {
-            const skillName = path.basename(source, ".md");
-            const target = path.join(codexSkillsDir, skillName, "SKILL.md");
-            if (ensureSymlink(source, target)) {
-                codexInstalled += 1;
-            }
-        }
-    }
-    (0, runtime_1.emitNervesEvent)({
-        component: "daemon",
-        event: "daemon.subagent_install_end",
-        message: "completed subagent auto-install",
-        meta: { claudeInstalled, codexInstalled, notes: notes.length },
-    });
-    return { claudeInstalled, codexInstalled, notes };
-}