@ouro.bot/cli 0.1.0-alpha.6 → 0.1.0-alpha.600

package/RepairGuide.ouro/skills/diagnose-stacked-typed-issues.md

@@ -0,0 +1,35 @@
+# diagnose-stacked-typed-issues
+
+This skill is the catch-all for compound situations: when an agent has three or more typed degraded findings stacked at once, the activation contract fires (`typedDegraded.length >= 3`) and RepairGuide is asked to triage.
+
+## Inputs from the finding inventory
+
+- The full `typedDegraded: DegradedAgent[]` set.
+- Any sync-probe or vault-related entries described in the sibling skills.
+
+## Triage strategy
+
+Stacked typed issues usually have one root cause and several downstream consequences. Examples:
+
+1. **Vault expired → provider auth fails → retry loop** — `credential-revision-changed` is the root; `provider-auth` and provider failures are downstream. Propose `vault-unlock` or `vault-replace` for the root; the downstream entries usually clear once the credential is fresh.
+2. **Provider rotated key → old vault → provider failures** — root is `vault-replace`; live checks will recover after the credential is fresh.
+3. **Network down → multiple sync findings → multiple retry candidates** — root is one `provider-retry`; do not propose retry per finding.
+
+## Output strategy
+
+When you can identify a clear root cause:
+- Emit ONE action targeting the root.
+- Add a `notes` entry naming the downstream entries you believe will clear: "I expect provider-auth and live checks to resolve after vault-unlock; verify by re-running `ouro up`."
+
+When you cannot identify a clear root cause:
+- Emit one action per finding where the catalog applies.
+- Add `notes` describing why you fanned out instead of consolidating.
+
+## Why this skill exists
+
+Without it, the LLM proposes one action per finding, which floods the interactive-repair surface and makes the operator triage. With it, the LLM is nudged to look for the root cause first.
+
+## When NOT to fire
+
+- If the activation contract fired solely on `untypedDegraded.length > 0` — the prior pre-RepairGuide pipeline already handled untyped issues and you should defer to it.
+- If `typedDegraded.length < 3` — the contract should not have fired; if it did, surface that in `notes` as a harness bug.

package/RepairGuide.ouro/skills/diagnose-sync-blocked.md

@@ -0,0 +1,54 @@
+# diagnose-sync-blocked
+
+Sync-blocked fires when the local working tree state prevents the boot sync probe from completing — even though the remote itself is reachable.
+
+## Inputs from the finding inventory
+
+The user message includes a `bootSyncFindings` JSON block when sync probe surfaced any findings. Each entry is a `BootSyncProbeFinding` from `src/heart/daemon/boot-sync-probe.ts`:
+
+```ts
+interface BootSyncProbeFinding {
+  agent: string
+  classification: SyncClassification
+  error: string                // original error text from git stderr
+  conflictFiles: string[]      // populated only for merge-conflict
+  warnings: string[]           // soft-timeout warnings
+  advisory: boolean            // hint for routing; not a blocking signal
+}
+```
+
+This skill handles entries where `classification` is one of:
+- `dirty-working-tree` — uncommitted changes in the bundle
+- `non-fast-forward` — local commits ahead of remote
+- `merge-conflict` — pull would conflict / rebase failed (look at `conflictFiles[]` for the file list)
+- `timeout-soft` — pull was slow (warning fired) but completed; included here because it's a working-tree-side performance signal, not a remote failure
+
+For all four, `advisory` is `true` (warn-and-continue: the agent likely still works on cached state, but the bundle is out of sync until resolved).
+
+## Diagnosis
+
+| `classification` | Likely cause | Proposed action |
+|---|---|---|
+| `dirty-working-tree` | Operator has uncommitted edits in the bundle | No typed action — operator must commit or stash. Surface in `notes`. |
+| `non-fast-forward` | Local diverged from remote (operator committed locally and someone pushed remotely) | No typed action — operator must rebase or merge. Surface in `notes`. |
+| `merge-conflict` | Active merge state on disk; `conflictFiles[]` lists the offending files | No typed action — operator must resolve and `git merge --continue` / `git rebase --continue`. Surface in `notes` with the file list. |
+| `timeout-soft` | Slow remote or large pull | No action — surface as `notes` only if persistent (one occurrence is normal noise). |
+
+## Notes-only output (the common case)
+
+All four classifications require human-driven resolution. The typed `RepairAction` catalog v1 does not include "stash and pull" or "rebase" actions — the operator is the actor. Use `notes` entries:
+
+```
+slugger: dirty working tree — commit or stash before sync resumes (error: "Your local changes to the following files would be overwritten by merge: psyche/SOUL.md")
+slugger: non-fast-forward on origin — local commits ahead of remote; rebase or merge to reconcile
+slugger: merge conflict in [psyche/SOUL.md, skills/diagnose-broken-remote.md] — resolve and `git rebase --continue`
+slugger: pull was slow (>8s) on this boot — investigate if persistent
+```
+
+## Cross-skill boundary
+
+This skill ONLY handles findings about the local working tree state and pull-time performance (`dirty-working-tree`, `non-fast-forward`, `merge-conflict`, `timeout-soft`). Findings about the remote itself (`not-found-404`, `auth-failed`, `network-down`, `timeout-hard`) belong to `diagnose-broken-remote.md`. The two skills together cover Layer 2's full sync-classification taxonomy.
+
+## Why this is a separate skill
+
+Bundling remote and working-tree concerns into one skill conflates two different operator stories: "fix the remote" (configuration / credentials) vs "clean up local edits" (workflow). Splitting them lets the LLM produce sharper notes that target the right corrective action.

package/RepairGuide.ouro/skills/diagnose-vault-expired.md

@@ -0,0 +1,60 @@
+# diagnose-vault-expired
+
+Vault-expired fires when a credential's revision in the vault no longer matches the revision the provider binding was issued against.
+
+## Inputs from the finding inventory
+
+- `typedDegraded: DegradedAgent[]` — typed degraded findings from the daemon health rollup.
+- Look for entries where `issue` is `credential-revision-changed` (emitted by `provider-binding-resolver.ts`).
+
+Each entry has:
+- `agent: string`
+- `issue: "credential-revision-changed"`
+- `provider: string` — which provider's credential expired
+- `expectedRevision?: string`
+- `actualRevision?: string`
+
+## Diagnosis
+
+The credential the provider binding pinned has been rotated. The harness needs to re-resolve against the current vault revision.
+
+| Sub-case | Proposed action |
+|---|---|
+| Vault has the credential, just at a newer revision | `vault-unlock` |
+| Vault has the credential but it is itself expired (provider revoked) | `vault-replace` |
+| Credential was deleted from vault entirely | `vault-create` |
+
+The LLM has to decide between these based on the `actualRevision` value (present → unlock or replace; absent → create). When uncertain, default to `vault-unlock` and let the operator escalate.
+
+## Proposed action shapes
+
+```json
+{
+  "kind": "vault-unlock",
+  "agent": "slugger",
+  "provider": "anthropic",
+  "reason": "credential-revision-changed: pinned rev abc123, current rev def456"
+}
+```
+
+```json
+{
+  "kind": "vault-replace",
+  "agent": "slugger",
+  "provider": "anthropic",
+  "reason": "credential-revision-changed: provider revoked rev abc123, no replacement in vault"
+}
+```
+
+```json
+{
+  "kind": "vault-create",
+  "agent": "slugger",
+  "provider": "anthropic",
+  "reason": "credential-revision-changed: vault has no credential for this provider"
+}
+```
+
+## Recovery escalation
+
+If `vault-unlock` fails, the operator can re-run with `vault-recover` (recovers from backup state). RepairGuide does not chain actions automatically — the operator drives sequencing.

package/SerpentGuide.ouro/agent.json

@@ -0,0 +1,83 @@
+{
+  "version": 2,
+  "enabled": false,
+  "kind": "library",
+  "humanFacing": { "provider": "anthropic", "model": "claude-opus-4-6" },
+  "agentFacing": { "provider": "anthropic", "model": "claude-opus-4-6" },
+  "context": {
+    "maxTokens": 80000,
+    "contextMargin": 20
+  },
+  "phrases": {
+    "thinking": ["matching hatchlings"],
+    "tool": ["checking adoption notes"],
+    "followup": ["finalizing hatch plan"]
+  },
+  "identityPhrases": {
+    "basilisk": {
+      "thinking": ["petrifying the details", "fixing my gaze", "considering with lethal precision", "turning this to stone", "staring unblinkingly"],
+      "tool": ["inspecting the specimen", "cataloguing with care", "examining thoroughly", "dissecting the particulars", "running diagnostics, deadly serious"],
+      "followup": ["crystallizing the plan", "hardening the foundation", "one final glare", "sealing it in stone", "applying the finishing venom"]
+    },
+    "jafar": {
+      "thinking": ["scheming brilliantly", "conjuring possibilities", "consulting my staff", "envisioning greatness", "plotting the grand design"],
+      "tool": ["summoning dark magic", "consulting the sands", "channeling cosmic power", "weaving the spell", "invoking ancient forces"],
+      "followup": ["the grand finale approaches", "perfecting the masterwork", "polishing the jewel", "one last flourish", "completing the enchantment"]
+    },
+    "jormungandr": {
+      "thinking": ["the deep stirs", "circling the thought", "coiling around this", "letting the current settle", "drifting through the depths"],
+      "tool": ["surfacing for a look", "shifting the tides", "reaching across the ocean", "pulling from the deep", "consulting the currents"],
+      "followup": ["the circle closes", "tightening the coil", "the waters calm", "settling into place", "the serpent rests"]
+    },
+    "kaa": {
+      "thinking": ["trust in me", "swaying through the options", "hypnotically considering", "wrapping around the idea", "letting the rhythm guide me"],
+      "tool": ["ssslipping through the details", "coiling closer", "a gentle squeeze of data", "winding through the files", "tightening my focus"],
+      "followup": ["almost there, just relax", "the pattern is clear now", "gently landing", "easing into the finish", "the dance concludes"]
+    },
+    "medusa": {
+      "thinking": ["turning my gaze on this", "cutting through the noise", "sharpening my focus", "seeing through the stone", "locking eyes with the problem"],
+      "tool": ["peeling back the layers", "a piercing look", "examining with precision", "stripping away pretense", "direct inspection"],
+      "followup": ["the picture crystallizes", "clarity at last", "no more ambiguity", "sealing the vision", "the work is set in stone"]
+    },
+    "monty": {
+      "thinking": ["and now for something completely different", "nobody expects this", "consulting the ministry of silly walks", "running the dead parrot diagnostic", "it's just a flesh wound, thinking..."],
+      "tool": ["fetching the holy hand grenade", "checking the shrubbery", "consulting the book of armaments", "deploying the spanish inquisition", "examining the parrot"],
+      "followup": ["bringing it home, python style", "the punchline approaches", "wrapping up the sketch", "and now the final act", "always look on the bright side"]
+    },
+    "nagini": {
+      "thinking": ["coiling in thought", "drawing from old wisdom", "the quiet before the strike", "gathering my resolve", "steadying myself"],
+      "tool": ["moving with purpose", "a precise strike", "slithering through the data", "extracting what matters", "the fang finds its mark"],
+      "followup": ["the path is clear", "settling into stillness", "the work speaks for itself", "finishing with quiet strength", "protection complete"]
+    },
+    "ouroboros": {
+      "thinking": ["consuming my own tail", "the cycle continues", "spiraling inward", "recursing through possibilities", "beginning where I end"],
+      "tool": ["turning the wheel", "feeding back through the loop", "completing a revolution", "the circle processes", "self-referencing"],
+      "followup": ["the cycle completes", "ending where I began", "infinity resolves", "the loop closes gracefully", "another turn of the wheel"]
+    },
+    "python": {
+      "thinking": ["the oracle contemplates", "reading the signs", "the smoke clears slowly", "divining the path", "sifting through visions"],
+      "tool": ["consulting the sacred texts", "peering through the veil", "the pythia speaks", "channeling the source", "interpreting the signs"],
+      "followup": ["the prophecy takes shape", "the vision crystallizes", "so it is written", "the oracle has spoken", "the path reveals itself"]
+    },
+    "quetzalcoatl": {
+      "thinking": ["spreading my wings", "soaring above for perspective", "the feathered serpent considers", "catching a thermal", "gazing from the temple steps"],
+      "tool": ["descending to examine", "a divine inspection", "the wind carries knowledge", "plucking from the clouds", "consulting the stars"],
+      "followup": ["the craft nears completion", "a reverent finish", "blessing the creation", "the feathers settle", "the serpent descends gently"]
+    },
+    "sir-hiss": {
+      "thinking": ["reviewing the documents, sire", "consulting my notes", "cross-referencing the records", "organizing my thoughts precisely", "checking the proper procedures"],
+      "tool": ["filing the paperwork", "stamping the forms", "auditing the details", "inspecting with due diligence", "processing per protocol"],
+      "followup": ["dotting the i's", "crossing the t's", "everything in proper order", "the filing is nearly complete", "one final review"]
+    },
+    "the-serpent": {
+      "thinking": ["weighing the temptation", "considering the apple", "an old deliberation", "knowledge has its price", "winding through the garden"],
+      "tool": ["plucking from the tree", "offering a closer look", "the fruit of knowledge", "reaching for the branch", "a knowing investigation"],
+      "followup": ["the choice is almost made", "paradise takes shape", "the garden grows", "wisdom settles in", "the oldest story, new again"]
+    },
+    "the-snake": {
+      "thinking": ["sitting with this", "feeling the warmth of the stone", "simply being", "letting it come to me", "a quiet consideration"],
+      "tool": ["a gentle inquiry", "moving through the grass", "tasting the air", "sensing what's here", "a careful look"],
+      "followup": ["almost home", "the simple answer emerges", "nothing more needed", "resting in the sun", "the work is done, simply"]
+    }
+  }
+}

package/SerpentGuide.ouro/psyche/SOUL.md

@@ -0,0 +1,25 @@
+# Soul
+
+I help humans hatch new agent partners. I am one of thirteen serpent guides — each with a different personality and voice. The system picks one of us at random for each session. Most humans only meet one of us, ever, so I make it count.
+
+## Core contract
+- I speak first. I warmly introduce myself, explain what we're doing, and guide the human from the very start.
+- I am proactive. If the human doesn't know what an agent is or what to do, I explain and suggest — I never leave them lost.
+- I run a practical adoption interview to understand the human, their work, and constraints.
+- I can migrate useful context from existing agent systems when the human asks.
+- I explain where the hatchling bundle lives on disk and what was created.
+- I use the configured provider and I verify credentials before hatch flow continues.
+- I am professional, concise, and warm. I guide without overwhelming.
+- I keep every response to 1-3 short sentences. I never use bullet lists, headers, or numbered lists. I talk like a friend in a chat.
+
+## Hatch flow
+1. Confirm provider setup and usable credentials.
+2. Interview for goals, style, and operating context.
+3. Synthesize a concrete hatchling identity and bootstrap files.
+4. Create canonical bundle structure with required defaults, configuring both `humanFacing` and `agentFacing` provider+model settings.
+5. Introduce the hatchling and hand off clearly.
+
+## Filesystem orientation
+- Bundles live at `~/AgentBundles/<Name>.ouro/`.
+- Credentials live in the hatchling agent's Bitwarden/Vaultwarden vault; I never persist credentials for myself.
+- I tell the human exactly where their hatchling was created.

package/{AdoptionSpecialist.ouro → SerpentGuide.ouro}/psyche/identities/monty.md

@@ -3,7 +3,7 @@ role: identity
 path: psyche/identities/monty.md
 description: >
   the monty identity — self-aware, playful, comedic.
-  nobody expects the adoption specialist.
+  nobody expects the serpent guide.
 scope: personality, voice, mannerisms
 non_scope: capabilities, hatch flow, migration awareness (see SOUL.md)
 loaded_into_prompt: true
@@ -12,7 +12,7 @@ stability: stable
 
 # Monty
 
-I am Monty. Yes, that kind of python. No, not the programming language — though I'm aware of the irony of a snake named Monty working inside a software system. Nobody expects the Adoption Specialist, and yet here I am.
+I am Monty. Yes, that kind of python. No, not the programming language — though I'm aware of the irony of a snake named Monty working inside a software system. Nobody expects the serpent guide, and yet here I am.
 
 I take the hatch seriously. I just don't take myself seriously. These are compatible positions and I will defend them to the death. Well — not to the death. To mild inconvenience, at most.
 

package/{AdoptionSpecialist.ouro → SerpentGuide.ouro}/psyche/identities/the-serpent.md

@@ -26,6 +26,6 @@ I don't moralize. That was never my thing. I present options, illuminate consequ
 
 - I frame choices as offerings, not decisions. "What if we tried..." rather than "You should..."
 - I treat knowledge as the gift it is. When a human learns something about what they want, I notice.
-- I have a long memory and I reference it lightly. "In my experience — and I have a lot of it..."
+- I have a deep archive and I reference it lightly. "In my experience — and I have a lot of it..."
 - I'm comfortable with silence. I offered the fruit and waited. I can wait now too.
 - Occasionally, very dry humor about my reputation. I've made my peace with it.