@ouro.bot/cli 0.1.0-alpha.60 → 0.1.0-alpha.61

package/README.md

@@ -48,7 +48,7 @@ Other important top-level paths:
 - `AdoptionSpecialist.ouro/`
   Packaged specialist bundle used by `ouro hatch`.
 - `subagents/`
-  Source-of-truth workflow definitions for planner/doer/merger.
+  Workflow skills have moved to [github.com/ouroborosbot/ouroboros-skills](https://github.com/ouroborosbot/ouroboros-skills). Use the skill-management skill for installation and updates.
 - `scripts/teams-sense/`
   Operator scripts for the Teams deployment path.
 - `docs/`

package/changelog.json

@@ -1,6 +1,15 @@
 {
   "_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.61",
+      "changes": [
+        "Workflow skills (work-planner, work-doer, work-merger) migrated to the shared ouroboros-skills repo at github.com/ouroborosbot/ouroboros-skills.",
+        "Removed the subagent-installer. Skills are now installed via the skill-management bootstrap skill or manual download.",
+        "Skills loading simplified from 3-source to 2-source model. Canonical-protocol fallback to subagents/ removed.",
+        "New ensureSkillManagement() auto-installs the skill-management bootstrap skill from the shared repo on ouro up."
+      ]
+    },
     {
       "version": "0.1.0-alpha.60",
       "changes": [

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

@@ -49,7 +49,7 @@ const store_file_1 = require("../../mind/friends/store-file");
 const types_1 = require("../../mind/friends/types");
 const ouro_uti_1 = require("./ouro-uti");
 const ouro_path_installer_1 = require("./ouro-path-installer");
-const subagent_installer_1 = require("./subagent-installer");
+const skill_management_installer_1 = require("./skill-management-installer");
 const hatch_flow_1 = require("./hatch-flow");
 const specialist_orchestrator_1 = require("./specialist-orchestrator");
 const specialist_prompt_1 = require("./specialist-prompt");
@@ -799,11 +799,6 @@ function defaultEnsureDaemonBootPersistence(socketPath) {
         envPath: process.env.PATH,
     });
 }
-async function defaultInstallSubagents() {
-    return (0, subagent_installer_1.installSubagentsForAvailableCli)({
-        repoRoot: (0, identity_1.getRepoRoot)(),
-    });
-}
 async function defaultPromptInput(question) {
     const readline = await Promise.resolve().then(() => __importStar(require("readline/promises")));
     const rl = readline.createInterface({
@@ -1075,7 +1070,6 @@ function createDefaultOuroCliDeps(socketPath = socket_client_1.DEFAULT_DAEMON_SO
         checkSocketAlive: socket_client_1.checkDaemonSocketAlive,
         cleanupStaleSocket: defaultCleanupStaleSocket,
         fallbackPendingMessage: defaultFallbackPendingMessage,
-        installSubagents: defaultInstallSubagents,
         listDiscoveredAgents: defaultListDiscoveredAgents,
         runHatchFlow: hatch_flow_1.runHatchFlow,
         promptInput: defaultPromptInput,
@@ -1084,6 +1078,7 @@ function createDefaultOuroCliDeps(socketPath = socket_client_1.DEFAULT_DAEMON_SO
         registerOuroBundleType: ouro_uti_1.registerOuroBundleUti,
         installOuroCommand: ouro_path_installer_1.installOuroCommand,
         syncGlobalOuroBotWrapper: ouro_bot_global_installer_1.syncGlobalOuroBotWrapper,
+        ensureSkillManagement: skill_management_installer_1.ensureSkillManagement,
         ensureDaemonBootPersistence: defaultEnsureDaemonBootPersistence,
         /* v8 ignore next 3 -- integration: launches interactive CLI session @preserve */
         startChat: async (agentName) => {
@@ -1179,18 +1174,20 @@ async function performSystemSetup(deps) {
             });
         }
     }
-    // Install subagents (claude/codex skills)
-    try {
-        await deps.installSubagents();
-    }
-    catch (error) {
-        (0, runtime_1.emitNervesEvent)({
-            level: "warn",
-            component: "daemon",
-            event: "daemon.subagent_install_error",
-            message: "subagent auto-install failed",
-            meta: { error: error instanceof Error ? error.message : /* v8 ignore next -- defensive: non-Error catch branch @preserve */ String(error) },
-        });
+    // Ensure skill-management skill is available
+    if (deps.ensureSkillManagement) {
+        try {
+            await deps.ensureSkillManagement();
+        }
+        catch (error) {
+            (0, runtime_1.emitNervesEvent)({
+                level: "warn",
+                component: "daemon",
+                event: "daemon.system_setup_skill_management_error",
+                message: "failed to ensure skill-management skill",
+                meta: { error: error instanceof Error ? error.message : /* v8 ignore next -- defensive: non-Error catch branch @preserve */ String(error) },
+            });
+        }
     }
     // Register .ouro bundle type (UTI on macOS)
     await registerOuroBundleTypeNonBlocking(deps);

package/dist/heart/daemon/skill-management-installer.js

@@ -0,0 +1,73 @@
+"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.ensureSkillManagement = ensureSkillManagement;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const identity_1 = require("../identity");
+const runtime_1 = require("../../nerves/runtime");
+const SKILL_MANAGEMENT_URL = "https://raw.githubusercontent.com/ouroborosbot/ouroboros-skills/main/skills/skill-management/SKILL.md";
+async function ensureSkillManagement() {
+    const skillsDir = path.join((0, identity_1.getAgentRoot)(), "skills");
+    const targetPath = path.join(skillsDir, "skill-management.md");
+    if (fs.existsSync(targetPath)) {
+        return;
+    }
+    try {
+        const response = await fetch(SKILL_MANAGEMENT_URL);
+        if (!response.ok) {
+            (0, runtime_1.emitNervesEvent)({
+                level: "warn",
+                component: "daemon",
+                event: "daemon.skill_management_install_error",
+                message: "failed to fetch skill-management from GitHub",
+                meta: { status: response.status, url: SKILL_MANAGEMENT_URL },
+            });
+            return;
+        }
+        const content = await response.text();
+        fs.mkdirSync(skillsDir, { recursive: true });
+        fs.writeFileSync(targetPath, content, "utf-8");
+    }
+    catch (error) {
+        (0, runtime_1.emitNervesEvent)({
+            level: "warn",
+            component: "daemon",
+            event: "daemon.skill_management_install_error",
+            message: "failed to install skill-management skill",
+            meta: { error: error instanceof Error ? error.message : String(error) },
+        });
+    }
+}

package/dist/repertoire/skills.js

@@ -50,10 +50,6 @@ function getSkillsDir() {
 function getProtocolMirrorDir() {
     return path.join(getSkillsDir(), "protocols");
 }
-// Canonical protocol source lives in {repoRoot}/subagents/.
-function getCanonicalProtocolsDir() {
-    return path.join((0, identity_1.getRepoRoot)(), "subagents");
-}
 function listMarkdownBasenames(dir) {
     if (!fs.existsSync(dir))
         return [];
@@ -74,8 +70,7 @@ function listSkills() {
     });
     const baseSkills = listMarkdownBasenames(getSkillsDir());
     const protocolMirrors = listMarkdownBasenames(getProtocolMirrorDir());
-    const canonicalProtocols = listMarkdownBasenames(getCanonicalProtocolsDir());
-    const skills = [...new Set([...baseSkills, ...protocolMirrors, ...canonicalProtocols])].sort();
+    const skills = [...new Set([...baseSkills, ...protocolMirrors])].sort();
     (0, runtime_1.emitNervesEvent)({
         event: "repertoire.load_end",
         component: "repertoire",
@@ -93,7 +88,6 @@ function loadSkill(skillName) {
     });
     const directSkillPath = path.join(getSkillsDir(), `${skillName}.md`);
     const protocolMirrorPath = path.join(getProtocolMirrorDir(), `${skillName}.md`);
-    const canonicalProtocolPath = path.join(getCanonicalProtocolsDir(), `${skillName}.md`);
     let resolvedPath = null;
     // 1) Direct agent skill.
     if (fs.existsSync(directSkillPath)) {
@@ -103,22 +97,6 @@ function loadSkill(skillName) {
     else if (fs.existsSync(protocolMirrorPath)) {
         resolvedPath = protocolMirrorPath;
     }
-    // 3) Canonical protocol fallback.
-    else if (fs.existsSync(canonicalProtocolPath)) {
-        (0, runtime_1.emitNervesEvent)({
-            level: "warn",
-            event: "repertoire.error",
-            component: "repertoire",
-            message: "protocol mirror missing; using canonical fallback",
-            meta: {
-                operation: "loadSkill",
-                skill: skillName,
-                mirrorPath: protocolMirrorPath,
-                canonicalPath: canonicalProtocolPath,
-            },
-        });
-        resolvedPath = canonicalProtocolPath;
-    }
     if (!resolvedPath) {
         (0, runtime_1.emitNervesEvent)({
             level: "error",
@@ -128,13 +106,12 @@ function loadSkill(skillName) {
             meta: {
                 operation: "loadSkill",
                 skill: skillName,
-                checkedPaths: [directSkillPath, protocolMirrorPath, canonicalProtocolPath],
+                checkedPaths: [directSkillPath, protocolMirrorPath],
             },
         });
         throw new Error(`skill '${skillName}' not found in:\n` +
             `- ${directSkillPath}\n` +
-            `- ${protocolMirrorPath}\n` +
-            `- ${canonicalProtocolPath}`);
+            `- ${protocolMirrorPath}`);
     }
     const content = fs.readFileSync(resolvedPath, "utf-8");
     if (!loadedSkills.includes(skillName)) {

package/package.json

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

package/subagents/README.md

@@ -1,86 +1,7 @@
-# Workflow Helpers
+# Workflow Skills (Moved)
 
-These files are the source-of-truth workflow helpers for:
+The workflow skills (`work-planner`, `work-doer`, `work-merger`) have moved to the shared skills repository:
 
-- `work-planner`
-- `work-doer`
-- `work-merger`
+**https://github.com/ouroborosbot/ouroboros-skills**
 
-They are written to stay generic enough for different agent shells, while following this repo’s local rules through `AGENTS.md`.
-
-## What They Do
-
-- `work-planner.md`
-  Creates and refines planning docs, then converts approved plans into doing docs.
-- `work-doer.md`
-  Executes approved doing docs unit by unit with strict validation discipline.
-- `work-merger.md`
-  Syncs with `main`, resolves conflicts, creates the PR, handles CI, and merges.
-
-## Important Repo-Specific Truth
-
-These helpers do not hardcode task-doc paths. They are expected to read project instructions to discover them.
-
-In this repo, that means:
-
-- task docs live in `~/AgentBundles/<agent>.ouro/tasks/one-shots/`
-- not inside the repo
-
-## Installing For Claude Code
-
-```bash
-mkdir -p ~/.claude/agents
-cp subagents/*.md ~/.claude/agents/
-```
-
-## Installing For Codex-Style Skills
-
-```bash
-mkdir -p ~/.agents/skills/work-planner ~/.agents/skills/work-doer ~/.agents/skills/work-merger
-
-# Hard-link to keep one source of truth
-ln -f "$(pwd)/subagents/work-planner.md" ~/.agents/skills/work-planner/SKILL.md
-ln -f "$(pwd)/subagents/work-doer.md" ~/.agents/skills/work-doer/SKILL.md
-ln -f "$(pwd)/subagents/work-merger.md" ~/.agents/skills/work-merger/SKILL.md
-```
-
-**Important:** For Codex/OpenAI skill installs, use the generic `~/.agents/skills` root and use hard links (`ln`, not `ln -s`). Installing the same skill into both `~/.agents/skills` and `~/.codex/skills` can produce duplicate entries in Codex. Symlinked `SKILL.md` files may load but are not advertised reliably by Codex surfaces. 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 ~/.agents/skills/work-planner/agents ~/.agents/skills/work-doer/agents ~/.agents/skills/work-merger/agents
-cat > ~/.agents/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 > ~/.agents/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 > ~/.agents/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
-```
-
-## Keeping Local Skill Copies Fresh
-
-After editing any `subagents/*.md` file, resync your local installed copies.
-
-The repo workflow usually checks this with diffs like:
-
-```bash
-diff -q ~/.agents/skills/work-planner/SKILL.md subagents/work-planner.md
-diff -q ~/.agents/skills/work-doer/SKILL.md subagents/work-doer.md
-```
-
-## Restart Behavior
-
-Some tools only discover new skills on startup. If a shell/app does not see updates immediately, restart that shell/app after syncing.
+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,166 +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 isSameFile(source, target) {
-    try {
-        const sourceStats = fs.statSync(source);
-        const targetStats = fs.statSync(target);
-        return sourceStats.dev === targetStats.dev && sourceStats.ino === targetStats.ino;
-    }
-    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;
-}
-function ensureHardLink(source, target) {
-    fs.mkdirSync(path.dirname(target), { recursive: true });
-    if (pathExists(target)) {
-        const stats = fs.lstatSync(target);
-        if (!stats.isSymbolicLink() && isSameFile(source, target)) {
-            return false;
-        }
-        fs.unlinkSync(target);
-    }
-    fs.linkSync(source, target);
-    return true;
-}
-function hasOpenAiSkillHome(homeDir) {
-    return pathExists(path.join(homeDir, ".codex")) || pathExists(path.join(homeDir, ".agents"));
-}
-function openAiSkillTargets(homeDir, source) {
-    const skillName = path.basename(source, ".md");
-    return [path.join(homeDir, ".agents", "skills", skillName, "SKILL.md")];
-}
-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 && !hasOpenAiSkillHome(homeDir)) {
-        notes.push("codex CLI/config not found; skipping subagent install");
-    }
-    else {
-        for (const source of sources) {
-            let installedForSkill = false;
-            for (const target of openAiSkillTargets(homeDir, source)) {
-                if (ensureHardLink(source, target)) {
-                    installedForSkill = true;
-                }
-            }
-            if (installedForSkill) {
-                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 };
-}