mirror of
https://github.com/lukaszraczylo/harness-sync.git
synced 2026-10-12 00:45:22 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
  lukaszraczyloandGitHub
|
406382a6d4 | ||
|
lukaszraczyloandGitHub
|
e01f3419ea | ||
|
lukaszraczyloandGitHub
|
5704ede5c7 | ||
|
lukaszraczyloandGitHub
|
a7338e91dc | ||
|
lukaszraczyloandGitHub
|
ae44e31abd | ||
|
lukaszraczylo
|
2eaa4ff825 | ||
|
lukaszraczylo
|
0e35af67b6 | ||
|
lukaszraczylo
|
6483eb8044 | ||
|
lukaszraczylo
|
21a86c084f | ||
|
lukaszraczylo
|
fb02b165d7 | ||
|
lukaszraczylo
|
77158d9f2b | ||
|
lukaszraczylo
|
7716c180e7 | ||
|
lukaszraczylo
|
00ba950cd9 | ||
|
lukaszraczylo
|
bde3128dba | ||
|
lukaszraczylo
|
fd97c60df2 |
@@ -0,0 +1,2 @@
|
||||
{"action":"prune","keep":10,"kept":[],"removed":[],"auditedAt":"2026-05-23T19:08:40.613Z"}
|
||||
{"action":"prune","keep":10,"kept":[],"removed":[],"auditedAt":"2026-05-23T19:55:51.755Z"}
|
||||
@@ -15,6 +15,6 @@ jobs:
|
||||
autoupdate:
|
||||
uses: lukaszraczylo/shared-actions/.github/workflows/go-autoupdate.yaml@main
|
||||
with:
|
||||
go-version: ">=1.24"
|
||||
go-version: ">=1.25"
|
||||
release-workflow: "release.yaml"
|
||||
secrets: inherit
|
||||
|
||||
@@ -18,6 +18,6 @@ jobs:
|
||||
release:
|
||||
uses: lukaszraczylo/shared-actions/.github/workflows/go-release.yaml@main
|
||||
with:
|
||||
go-version: ">=1.24"
|
||||
go-version: ">=1.25"
|
||||
rolling-release-tag: "v1"
|
||||
secrets: inherit
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<p align="center">
|
||||
<img src="docs/assets/banner.svg" alt="harness-sync — one config, every harness" width="900">
|
||||
<a href="https://harness-sync.raczylo.com"><img src="docs/assets/banner.svg" alt="harness-sync — one config, every harness" width="900"></a>
|
||||
</p>
|
||||
|
||||
<p align="center">
|
||||
@@ -131,15 +131,35 @@ harness's official docs before the adapter was written. Wrong key names
|
||||
silently produce configs the harness can't parse — that's a bug class
|
||||
harness-sync goes out of its way to avoid.
|
||||
|
||||
| Harness | Native config | MCP key | Model selector | Instructions | Symlinked |
|
||||
|---|---|---|---|---|---|
|
||||
| **claude-code** | `~/.claude.json` (merged, primary) + `~/.claude/mcp_servers.json` | `mcpServers` (`type: stdio`/`http`) | `env.ANTHROPIC_DEFAULT_MODEL` | `~/.claude/CLAUDE.md` | `skills/`, `agents/` |
|
||||
| **crush** | `~/.config/crush/crush.json` (merged) | `mcp` (type: stdio\|http\|sse) | `default_model` | auto-read `AGENTS.md` | `skills/` |
|
||||
| **kilo** | `~/.config/kilo/kilo.json` (merged) | `mcp` (type: local\|remote) | `model` + `small_model` | `instructions` array | `agent/` |
|
||||
| **opencode** | `~/.config/opencode/opencode.jsonc` (merged) | `mcp` (type: local\|remote) | `model` | `AGENTS.md` | — |
|
||||
| **goose** | `~/.config/goose/config.yaml` (merged) | n/a — `extensions` map (type: stdio) | `GOOSE_PROVIDER` + `GOOSE_MODEL` | env via `extensions.tom` | — |
|
||||
| **cagent** | `~/.config/cagent/default.yaml` (starter) | `mcps` | per-agent `model:` | inline `instruction:` | — |
|
||||
| **zed** | `~/.config/zed/settings.json` (merged) | `context_servers` (source: custom) | `agent.default_model.{provider,model}` | `~/.config/zed/rules/` | — |
|
||||
### Native config format
|
||||
|
||||
| Harness | Native config | MCP key | Provider / model config | Skills path |
|
||||
|---|---|---|---|---|
|
||||
| **claude-code** | `~/.claude.json` (merged) + `~/.claude/mcp_servers.json` | `mcpServers` (`type: stdio`/`http`) | own subscription — not managed | `~/.claude/skills/` |
|
||||
| **crush** | `~/.config/crush/crush.json` (merged) | `mcp` (`type: stdio`/`http`/`sse`) | `providers` map + `default_model` | `~/.config/crush/skills/` |
|
||||
| **kilo** | `~/.config/kilo/kilo.json` (merged) | `mcp` (`type: local`/`remote`) | `provider` map + `model` + `small_model` | `~/.kilo/skills/` |
|
||||
| **opencode** | `~/.config/opencode/opencode.jsonc` (merged) | `mcp` (`type: local`/`remote`) | `provider` map + `model` | `~/.config/opencode/skills/` |
|
||||
| **goose** | `~/.config/goose/config.yaml` (merged) + `custom_providers/<name>.json` | `extensions` map (`type: stdio`) | `GOOSE_PROVIDER` + `GOOSE_MODEL` | `~/.agents/skills/` |
|
||||
| **cagent** | `~/.config/cagent/default.yaml` (starter) | `mcps` | `providers` map + per-agent `model:` | — |
|
||||
| **zed** | `~/.config/zed/settings.json` (merged) | `context_servers` | `language_models.openai.{api_url, available_models}` + `agent.default_model` | — |
|
||||
|
||||
### Capability matrix
|
||||
|
||||
What harness-sync writes per harness. Harnesses with a **built-in subscription** receive MCP + skills + instructions only — provider/model/endpoint config is skipped to avoid conflicting with the harness's own auth.
|
||||
|
||||
Skills paths are grounded in each harness's official documentation (kilo.ai, opencode.ai, goose-docs.ai). kilo, opencode, and goose also scan `~/.claude/skills/` as a compatibility path, so the claude-code symlink passively reaches them already.
|
||||
|
||||
| Harness | Built-in sub | Providers | Models | MCP | Skills | Instructions |
|
||||
|---|:---:|:---:|:---:|:---:|:---:|:---:|
|
||||
| **claude-code** | ✓ | — | — | ✓ | ✓ | ✓ |
|
||||
| **crush** | — | ✓ | ✓ | ✓ | ✓ | — |
|
||||
| **kilo** | — | ✓ | ✓ | ✓ | ✓ | — |
|
||||
| **opencode** | — | ✓ | ✓ | ✓ | ✓ | ✓ |
|
||||
| **goose** | — | ✓ | ✓ | ✓ | ✓ | — |
|
||||
| **cagent** | — | ✓ | ✓ | ✓ | — | ✓ |
|
||||
| **zed** | — | ✓ | ✓ | ✓ | — | — |
|
||||
|
||||
The matrix is machine-readable via `adapter.Capabilities()` — every adapter implements `HarnessCapabilities` so tooling can inspect what will change before running `apply`.
|
||||
|
||||
> **Merged, not replaced.** For harnesses with user-managed config keys (every one
|
||||
> except cagent), harness-sync reads the existing file, overlays only the keys
|
||||
|
||||
@@ -3,6 +3,7 @@ package main
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"time"
|
||||
|
||||
"github.com/lukaszraczylo/harness-sync/internal/adapter"
|
||||
"github.com/lukaszraczylo/harness-sync/internal/adapters/cagent"
|
||||
@@ -13,11 +14,15 @@ import (
|
||||
"github.com/lukaszraczylo/harness-sync/internal/adapters/opencode"
|
||||
"github.com/lukaszraczylo/harness-sync/internal/adapters/zed"
|
||||
"github.com/lukaszraczylo/harness-sync/internal/cli"
|
||||
"github.com/lukaszraczylo/oss-telemetry"
|
||||
)
|
||||
|
||||
var version = "dev"
|
||||
|
||||
func main() {
|
||||
telemetry.SendForModule("harness-sync", "github.com/lukaszraczylo/harness-sync", version)
|
||||
defer telemetry.Wait(2 * time.Second)
|
||||
|
||||
reg := adapter.NewRegistry()
|
||||
reg.Register(claudecode.New())
|
||||
reg.Register(crush.New())
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
harness-sync.raczylo.com
|
||||
harness-sync.raczylo.com
|
||||
|
||||
+320
@@ -0,0 +1,320 @@
|
||||
<!doctype html>
|
||||
<html lang="en" class="scroll-smooth">
|
||||
<head>
|
||||
<meta charset="UTF-8"/>
|
||||
<meta name="viewport" content="width=device-width,initial-scale=1.0"/>
|
||||
<title>harness-sync · one config, every harness</title>
|
||||
<meta name="description" content="One canonical source of truth for skills, agents, MCP servers, LLM endpoints, and global instructions across every LLM harness on your machine."/>
|
||||
<link rel="canonical" href="https://harness-sync.raczylo.com"/>
|
||||
<meta property="og:type" content="website"/>
|
||||
<meta property="og:url" content="https://harness-sync.raczylo.com"/>
|
||||
<meta property="og:title" content="harness-sync · one config, every harness"/>
|
||||
<meta property="og:description" content="One canonical source of truth for skills, agents, MCP servers, LLM endpoints, and global instructions across every LLM harness on your machine."/>
|
||||
<meta property="og:image" content="https://harness-sync.raczylo.com/assets/banner.svg"/>
|
||||
<meta name="twitter:card" content="summary_large_image"/>
|
||||
<meta name="twitter:title" content="harness-sync · one config, every harness"/>
|
||||
<meta name="twitter:description" content="One canonical source of truth for skills, agents, MCP servers, LLM endpoints, and global instructions across every LLM harness on your machine."/>
|
||||
<script src="https://cdn.tailwindcss.com"></script>
|
||||
<script>tailwind.config={darkMode:'class'}</script>
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com"/>
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin/>
|
||||
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&family=JetBrains+Mono:wght@400;500&display=swap" rel="stylesheet"/>
|
||||
<style>
|
||||
body{font-family:system-ui,sans-serif}
|
||||
code,pre,.mono{font-family:"JetBrains Mono",ui-monospace,monospace}
|
||||
.terminal{background:#0d1117;color:#c9d1d9;border:1px solid #21262d;border-radius:8px;overflow:hidden}
|
||||
.terminal-bar{background:#161b22;border-bottom:1px solid #21262d;padding:10px 14px;display:flex;gap:6px}
|
||||
.terminal-dot{width:11px;height:11px;border-radius:50%}
|
||||
.terminal pre{padding:18px 20px;margin:0;white-space:pre-wrap;font-size:13px;line-height:1.7;overflow-x:auto}
|
||||
.terminal .g{color:#7ee787}.terminal .c{color:#79c0ff}.terminal .y{color:#d29922}.terminal .r{color:#ff7b72}.terminal .w{color:#c9d1d9}.terminal .d{color:#6e7681}
|
||||
section + section{border-top:1px solid theme('colors.neutral.200')}
|
||||
.dark section + section{border-top:1px solid theme('colors.neutral.800')}
|
||||
@media(max-width:768px){.terminal pre{font-size:12px;padding:14px}}
|
||||
</style>
|
||||
<script>
|
||||
if(localStorage.theme==="dark"||(!("theme" in localStorage)&&window.matchMedia("(prefers-color-scheme:dark)").matches))document.documentElement.classList.add("dark");else document.documentElement.classList.remove("dark");
|
||||
</script>
|
||||
</head>
|
||||
<body class="bg-white dark:bg-neutral-950 text-neutral-900 dark:text-neutral-100">
|
||||
|
||||
<!-- Nav -->
|
||||
<nav class="sticky top-0 z-50 bg-white/90 dark:bg-neutral-950/90 backdrop-blur border-b border-neutral-200 dark:border-neutral-800">
|
||||
<div class="max-w-3xl mx-auto px-5 flex items-center justify-between h-14">
|
||||
<a href="#" class="mono text-sm font-medium tracking-tight"><span class="text-emerald-600 dark:text-emerald-400">$</span> harness-sync</a>
|
||||
<div class="hidden md:flex items-center gap-6 text-sm text-neutral-500 dark:text-neutral-400">
|
||||
<a href="#problem" class="hover:text-neutral-900 dark:hover:text-neutral-100">problem</a>
|
||||
<a href="#features" class="hover:text-neutral-900 dark:hover:text-neutral-100">features</a>
|
||||
<a href="#harnesses" class="hover:text-neutral-900 dark:hover:text-neutral-100">harnesses</a>
|
||||
<a href="#install" class="hover:text-neutral-900 dark:hover:text-neutral-100">install</a>
|
||||
<a href="#usage" class="hover:text-neutral-900 dark:hover:text-neutral-100">usage</a>
|
||||
<a href="#architecture" class="hover:text-neutral-900 dark:hover:text-neutral-100">architecture</a>
|
||||
</div>
|
||||
<div class="flex items-center gap-3">
|
||||
<button id="theme-toggle" class="text-neutral-400 hover:text-neutral-900 dark:hover:text-neutral-100 p-1" aria-label="Toggle theme">
|
||||
<svg id="theme-moon" class="w-4 h-4 dark:hidden" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M20.354 15.354A9 9 0 018.646 3.646 9.003 9.003 0 0012 21a9.003 9.003 0 008.354-5.646z"/></svg>
|
||||
<svg id="theme-sun" class="w-4 h-4 hidden dark:block" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 3v1m0 16v1m9-9h-1M4 12H3m15.364 6.364l-.707-.707M6.343 6.343l-.707-.707m12.728 0l-.707.707M6.343 17.657l-.707.707M16 12a4 4 0 11-8 0 4 4 0 018 0z"/></svg>
|
||||
</button>
|
||||
<a href="https://github.com/lukaszraczylo/harness-sync" class="text-neutral-400 hover:text-neutral-900 dark:hover:text-neutral-100 p-1" aria-label="GitHub">
|
||||
<svg class="w-4 h-4" fill="currentColor" viewBox="0 0 24 24"><path d="M12 0C5.37 0 0 5.37 0 12c0 5.31 3.435 9.795 8.205 11.385.6.105.825-.255.825-.57 0-.285-.015-1.23-.015-2.235-3.015.555-3.795-.735-4.035-1.41-.135-.345-.72-1.41-1.23-1.695-.42-.225-1.02-.78-.015-.795.945-.015 1.62.87 1.845 1.23 1.08 1.815 2.805 1.305 3.495.99.105-.78.42-1.305.765-1.605-2.67-.3-5.46-1.335-5.46-5.925 0-1.305.465-2.385 1.23-3.225-.12-.3-.54-1.53.12-3.18 0 0 1.005-.315 3.3 1.23.96-.27 1.98-.405 3-.405s2.04.135 3 .405c2.295-1.56 3.3-1.23 3.3-1.23.66 1.65.24 2.88.12 3.18.765.84 1.23 1.905 1.23 3.225 0 4.605-2.805 5.625-5.475 5.925.435.375.81 1.095.81 2.22 0 1.605-.015 2.895-.015 3.3 0 .315.225.69.825.57A12.02 12.02 0 0024 12c0-6.63-5.37-12-12-12z"/></svg>
|
||||
</button>
|
||||
<button id="mobile-toggle" class="md:hidden text-neutral-400 hover:text-neutral-900 dark:hover:text-neutral-100 p-1" aria-label="Menu">
|
||||
<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16"/></svg>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div id="mobile-menu" class="hidden md:hidden border-t border-neutral-200 dark:border-neutral-800 bg-white dark:bg-neutral-950">
|
||||
<div class="px-5 py-3 flex flex-col gap-2 text-sm">
|
||||
<a href="#problem" class="text-neutral-500 dark:text-neutral-400 py-1">problem</a>
|
||||
<a href="#features" class="text-neutral-500 dark:text-neutral-400 py-1">features</a>
|
||||
<a href="#harnesses" class="text-neutral-500 dark:text-neutral-400 py-1">harnesses</a>
|
||||
<a href="#install" class="text-neutral-500 dark:text-neutral-400 py-1">install</a>
|
||||
<a href="#usage" class="text-neutral-500 dark:text-neutral-400 py-1">usage</a>
|
||||
<a href="#architecture" class="text-neutral-500 dark:text-neutral-400 py-1">architecture</a>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
<!-- Hero -->
|
||||
<header class="max-w-3xl mx-auto px-5 pt-16 pb-12 md:pt-24 md:pb-16">
|
||||
<p class="mono text-sm text-emerald-600 dark:text-emerald-400 mb-4">~ $ harness-sync</p>
|
||||
<h1 class="text-3xl md:text-4xl font-semibold tracking-tight leading-tight mb-4">One config, every <span class="text-neutral-400 dark:text-neutral-500">LLM</span> harness.</h1>
|
||||
<p class="text-lg text-neutral-600 dark:text-neutral-400 mb-8 max-w-xl leading-relaxed">A CLI tool that syncs skills, agents, MCP servers, endpoints, and instructions from a single canonical tree into each harness's native format.</p>
|
||||
<div class="terminal mb-8">
|
||||
<div class="terminal-bar">
|
||||
<span class="terminal-dot" style="background:#ff5f57"></span>
|
||||
<span class="terminal-dot" style="background:#febc2e"></span>
|
||||
<span class="terminal-dot" style="background:#28c840"></span>
|
||||
</div>
|
||||
<pre><span class="d"># import from whatever you already use</span>
|
||||
<span class="g">$</span> <span class="c">harness-sync</span> detect
|
||||
<span class="w"> ✓ claude-code → ~/.claude/</span>
|
||||
<span class="w"> ✓ kilo → ~/.config/kilo/</span>
|
||||
<span class="w"> ✓ crush → ~/.config/crush/</span>
|
||||
<span class="d"> × goose not found</span>
|
||||
<span class="d"> × opencode not found</span>
|
||||
|
||||
<span class="g">$</span> <span class="c">harness-sync</span> init
|
||||
<span class="w"> imported 12 skills, 4 agents, 6 mcp servers from claude-code</span>
|
||||
|
||||
<span class="g">$</span> <span class="c">harness-sync</span> apply --dry-run
|
||||
<span class="w"> plan: write 14 files to claude-code, 11 to kilo, 9 to crush</span>
|
||||
<span class="y"> (dry-run, nothing written)</span>
|
||||
</pre>
|
||||
</div>
|
||||
<div class="flex items-center gap-3">
|
||||
<a href="#install" class="inline-block bg-neutral-900 dark:bg-neutral-100 text-white dark:text-neutral-900 px-5 py-2.5 text-sm font-medium rounded">install</a>
|
||||
<a href="https://github.com/lukaszraczylo/harness-sync" class="inline-block border border-neutral-300 dark:border-neutral-700 px-5 py-2.5 text-sm font-medium rounded hover:bg-neutral-50 dark:hover:bg-neutral-900">github</a>
|
||||
</div>
|
||||
</header>
|
||||
|
||||
<!-- Problem -->
|
||||
<section id="problem" class="max-w-3xl mx-auto px-5 py-12 md:py-16">
|
||||
<h2 class="text-2xl font-semibold tracking-tight mb-3">The problem</h2>
|
||||
<p class="text-neutral-600 dark:text-neutral-400 mb-8 leading-relaxed">You run <code class="mono text-sm bg-neutral-100 dark:bg-neutral-800 px-1.5 py-0.5 rounded">claude-code</code>, <code class="mono text-sm bg-neutral-100 dark:bg-neutral-800 px-1.5 py-0.5 rounded">kilo</code>, <code class="mono text-sm bg-neutral-100 dark:bg-neutral-800 px-1.5 py-0.5 rounded">crush</code>, <code class="mono text-sm bg-neutral-100 dark:bg-neutral-800 px-1.5 py-0.5 rounded">opencode</code>, <code class="mono text-sm bg-neutral-100 dark:bg-neutral-800 px-1.5 py-0.5 rounded">goose</code>, <code class="mono text-sm bg-neutral-100 dark:bg-neutral-800 px-1.5 py-0.5 rounded">cagent</code>, <code class="mono text-sm bg-neutral-100 dark:bg-neutral-800 px-1.5 py-0.5 rounded">zed</code> — each keeps its own copy of the same config.</p>
|
||||
<div class="grid md:grid-cols-2 gap-6">
|
||||
<div>
|
||||
<h3 class="mono text-sm font-medium text-neutral-500 dark:text-neutral-400 mb-3">without harness-sync</h3>
|
||||
<ul class="space-y-2 text-sm text-neutral-700 dark:text-neutral-300">
|
||||
<li class="flex gap-2"><span class="text-red-500 shrink-0">✕</span><span>same skill markdown, duplicated seven ways</span></li>
|
||||
<li class="flex gap-2"><span class="text-red-500 shrink-0">✕</span><span>same agent definitions, rewritten per harness</span></li>
|
||||
<li class="flex gap-2"><span class="text-red-500 shrink-0">✕</span><span>same MCP registry, seven different key names (<code class="mono text-xs">mcpServers</code>, <code class="mono text-xs">mcp</code>, <code class="mono text-xs">context_servers</code>…)</span></li>
|
||||
<li class="flex gap-2"><span class="text-red-500 shrink-0">✕</span><span>same gateway URL, hand-copied into seven files</span></li>
|
||||
<li class="flex gap-2"><span class="text-red-500 shrink-0">✕</span><span>edit once, forget the others, things break</span></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div>
|
||||
<h3 class="mono text-sm font-medium text-neutral-500 dark:text-neutral-400 mb-3">with harness-sync</h3>
|
||||
<ul class="space-y-2 text-sm text-neutral-700 dark:text-neutral-300">
|
||||
<li class="flex gap-2"><span class="text-emerald-600 dark:text-emerald-400 shrink-0">→</span><span>one canonical tree under git version control</span></li>
|
||||
<li class="flex gap-2"><span class="text-emerald-600 dark:text-emerald-400 shrink-0">→</span><span>per-harness adapters render native config formats</span></li>
|
||||
<li class="flex gap-2"><span class="text-emerald-600 dark:text-emerald-400 shrink-0">→</span><span>3-way merge via <code class="mono text-xs">git merge-file</code></span></li>
|
||||
<li class="flex gap-2"><span class="text-emerald-600 dark:text-emerald-400 shrink-0">→</span><span>secrets via <code class="mono text-xs">${VAR}</code> env-var substitution, never stored</span></li>
|
||||
<li class="flex gap-2"><span class="text-emerald-600 dark:text-emerald-400 shrink-0">→</span><span>git rollback on every apply</span></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- Features -->
|
||||
<section id="features" class="max-w-3xl mx-auto px-5 py-12 md:py-16">
|
||||
<h2 class="text-2xl font-semibold tracking-tight mb-6">What it does</h2>
|
||||
<ul class="space-y-4 text-sm text-neutral-700 dark:text-neutral-300">
|
||||
<li class="flex gap-3"><span class="text-emerald-600 dark:text-emerald-400 shrink-0 mt-0.5">→</span><div><strong class="font-medium text-neutral-900 dark:text-neutral-100">Canonical tree.</strong> Profiles, skills, agents, mcp servers, and instructions in a single git-managed directory.</div></li>
|
||||
<li class="flex gap-3"><span class="text-emerald-600 dark:text-emerald-400 shrink-0 mt-0.5">→</span><div><strong class="font-medium text-neutral-900 dark:text-neutral-100">Native adapters.</strong> Each harness gets its correct keys and file types — no lowest-common-denominator config.</div></li>
|
||||
<li class="flex gap-3"><span class="text-emerald-600 dark:text-emerald-400 shrink-0 mt-0.5">→</span><div><strong class="font-medium text-neutral-900 dark:text-neutral-100">3-way merge.</strong> <code class="mono text-xs">git merge-file</code> semantics — disjoint changes merge cleanly, conflicts produce <code class="mono text-xs">.rej</code> files.</div></li>
|
||||
<li class="flex gap-3"><span class="text-emerald-600 dark:text-emerald-400 shrink-0 mt-0.5">→</span><div><strong class="font-medium text-neutral-900 dark:text-neutral-100">Profiles.</strong> Bundle gateway URL, model allowlist, and upstream keys — switch with one command.</div></li>
|
||||
<li class="flex gap-3"><span class="text-emerald-600 dark:text-emerald-400 shrink-0 mt-0.5">→</span><div><strong class="font-medium text-neutral-900 dark:text-neutral-100">Secret safety.</strong> Env-var substitution at render time. Secrets never written to disk or canonical tree.</div></li>
|
||||
<li class="flex gap-3"><span class="text-emerald-600 dark:text-emerald-400 shrink-0 mt-0.5">→</span><div><strong class="font-medium text-neutral-900 dark:text-neutral-100">Auto-detection.</strong> Detects installed harnesses. Only touches what's relevant on your machine.</div></li>
|
||||
<li class="flex gap-3"><span class="text-emerald-600 dark:text-emerald-400 shrink-0 mt-0.5">→</span><div><strong class="font-medium text-neutral-900 dark:text-neutral-100">Dry-run preview.</strong> Diff every target file before writing anything to disk.</div></li>
|
||||
<li class="flex gap-3"><span class="text-emerald-600 dark:text-emerald-400 shrink-0 mt-0.5">→</span><div><strong class="font-medium text-neutral-900 dark:text-neutral-100">Git rollback.</strong> Revert the last <em>n</em> applies. Full version history in local git.</div></li>
|
||||
<li class="flex gap-3"><span class="text-emerald-600 dark:text-emerald-400 shrink-0 mt-0.5">→</span><div><strong class="font-medium text-neutral-900 dark:text-neutral-100">Non-destructive overlay.</strong> Only managed keys are written. Your hooks, permissions, and editor settings survive.</div></li>
|
||||
</ul>
|
||||
</section>
|
||||
|
||||
<!-- Harnesses -->
|
||||
<section id="harnesses" class="max-w-3xl mx-auto px-5 py-12 md:py-16">
|
||||
<h2 class="text-2xl font-semibold tracking-tight mb-3">Supported harnesses</h2>
|
||||
<p class="text-neutral-600 dark:text-neutral-400 mb-8 text-sm">Each adapter grounded against real config files and upstream docs.</p>
|
||||
<div class="overflow-x-auto">
|
||||
<table class="w-full text-sm">
|
||||
<thead class="border-b border-neutral-200 dark:border-neutral-800 text-left">
|
||||
<tr class="text-neutral-500 dark:text-neutral-400 mono text-xs uppercase tracking-wide">
|
||||
<th class="pb-2 pr-4 font-medium">harness</th>
|
||||
<th class="pb-2 pr-4 font-medium">manages</th>
|
||||
<th class="pb-2 font-medium">note</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody class="text-neutral-700 dark:text-neutral-300">
|
||||
<tr class="border-b border-neutral-100 dark:border-neutral-800/60">
|
||||
<td class="py-2.5 pr-4 mono font-medium">claude-code</td>
|
||||
<td class="py-2.5 pr-4">mcp · skills · instructions</td>
|
||||
<td class="py-2.5 text-neutral-500 dark:text-neutral-500">provider config managed by Anthropic directly</td>
|
||||
</tr>
|
||||
<tr class="border-b border-neutral-100 dark:border-neutral-800/60">
|
||||
<td class="py-2.5 pr-4 mono font-medium">crush</td>
|
||||
<td class="py-2.5 pr-4">mcp · skills · providers · models</td>
|
||||
<td class="py-2.5 text-neutral-500 dark:text-neutral-500">full gateway rendering with provider map</td>
|
||||
</tr>
|
||||
<tr class="border-b border-neutral-100 dark:border-neutral-800/60">
|
||||
<td class="py-2.5 pr-4 mono font-medium">kilo</td>
|
||||
<td class="py-2.5 pr-4">mcp · skills · providers · models</td>
|
||||
<td class="py-2.5 text-neutral-500 dark:text-neutral-500">small model + provider map config</td>
|
||||
</tr>
|
||||
<tr class="border-b border-neutral-100 dark:border-neutral-800/60">
|
||||
<td class="py-2.5 pr-4 mono font-medium">opencode</td>
|
||||
<td class="py-2.5 pr-4">mcp · skills · providers · models · instructions</td>
|
||||
<td class="py-2.5 text-neutral-500 dark:text-neutral-500">JSONC config with instructions merging</td>
|
||||
</tr>
|
||||
<tr class="border-b border-neutral-100 dark:border-neutral-800/60">
|
||||
<td class="py-2.5 pr-4 mono font-medium">goose</td>
|
||||
<td class="py-2.5 pr-4">mcp · skills · providers · models</td>
|
||||
<td class="py-2.5 text-neutral-500 dark:text-neutral-500">YAML with extensions map</td>
|
||||
</tr>
|
||||
<tr class="border-b border-neutral-100 dark:border-neutral-800/60">
|
||||
<td class="py-2.5 pr-4 mono font-medium">cagent</td>
|
||||
<td class="py-2.5 pr-4">mcp · providers · models · instructions</td>
|
||||
<td class="py-2.5 text-neutral-500 dark:text-neutral-500">starter YAML with per-agent model</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="py-2.5 pr-4 mono font-medium">zed</td>
|
||||
<td class="py-2.5 pr-4">mcp · providers · models</td>
|
||||
<td class="py-2.5 text-neutral-500 dark:text-neutral-500">context servers in settings.json</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- Install -->
|
||||
<section id="install" class="max-w-3xl mx-auto px-5 py-12 md:py-16">
|
||||
<h2 class="text-2xl font-semibold tracking-tight mb-6">Install</h2>
|
||||
<div class="space-y-6">
|
||||
<div>
|
||||
<h3 class="mono text-sm font-medium text-neutral-500 dark:text-neutral-400 mb-2">one-liner (recommended)</h3>
|
||||
<div class="terminal"><pre><span class="g">$</span> curl -fsSL https://raw.githubusercontent.com/<span class="w">\</span>
|
||||
lukaszraczylo/harness-sync/main/install.sh | bash</pre></div>
|
||||
<p class="text-xs text-neutral-500 dark:text-neutral-500 mt-2">Picks the right release for OS/arch, verifies SHA-256, drops binary in <code class="mono">~/.local/bin</code>.</p>
|
||||
</div>
|
||||
<div>
|
||||
<h3 class="mono text-sm font-medium text-neutral-500 dark:text-neutral-400 mb-2">homebrew</h3>
|
||||
<div class="terminal"><pre><span class="g">$</span> brew install lukaszraczylo/taps/harness-sync</pre></div>
|
||||
</div>
|
||||
<div>
|
||||
<h3 class="mono text-sm font-medium text-neutral-500 dark:text-neutral-400 mb-2">from source</h3>
|
||||
<div class="terminal"><pre><span class="g">$</span> git clone https://github.com/lukaszraczylo/harness-sync
|
||||
<span class="g">$</span> make build && make install</pre></div>
|
||||
<p class="text-xs text-neutral-500 dark:text-neutral-500 mt-2">Requires Go 1.24+ and <code class="mono">git</code> on <code class="mono">$PATH</code>.</p>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- Usage -->
|
||||
<section id="usage" class="max-w-3xl mx-auto px-5 py-12 md:py-16">
|
||||
<h2 class="text-2xl font-semibold tracking-tight mb-6">Usage</h2>
|
||||
<div class="terminal mb-8"><pre><span class="d"># 1. see what's installed</span>
|
||||
<span class="g">$</span> <span class="c">harness-sync</span> detect
|
||||
|
||||
<span class="d"># 2. import from detected harnesses into canonical tree</span>
|
||||
<span class="g">$</span> <span class="c">harness-sync</span> init
|
||||
|
||||
<span class="d"># 3. render canonical tree to all harness configs</span>
|
||||
<span class="g">$</span> <span class="c">harness-sync</span> apply
|
||||
<span class="g">$</span> <span class="c">harness-sync</span> apply --dry-run <span class="d"># preview without writing</span>
|
||||
<span class="g">$</span> <span class="c">harness-sync</span> diff <span class="d"># same as apply --dry-run</span>
|
||||
<span class="g">$</span> <span class="c">harness-sync</span> profile list <span class="d"># list profiles</span>
|
||||
<span class="g">$</span> <span class="c">harness-sync</span> profile use work <span class="d"># switch active profile</span>
|
||||
<span class="g">$</span> <span class="c">harness-sync</span> rollback 2 <span class="d"># git revert last 2 applies</span>
|
||||
<span class="g">$</span> <span class="c">harness-sync</span> update <span class="d"># pull latest release</span>
|
||||
</pre></div>
|
||||
<h3 class="mono text-sm font-medium text-neutral-500 dark:text-neutral-400 mb-3">flags</h3>
|
||||
<div class="overflow-x-auto">
|
||||
<table class="w-full text-sm">
|
||||
<thead class="border-b border-neutral-200 dark:border-neutral-800 text-left">
|
||||
<tr class="text-neutral-500 dark:text-neutral-400 mono text-xs uppercase tracking-wide"><th class="pb-2 pr-4 font-medium">flag</th><th class="pb-2 font-medium">effect</th></tr>
|
||||
</thead>
|
||||
<tbody class="text-neutral-700 dark:text-neutral-300">
|
||||
<tr class="border-b border-neutral-100 dark:border-neutral-800/60"><td class="py-2 pr-4 mono">--dry-run</td><td class="py-2">show plan, write nothing</td></tr>
|
||||
<tr class="border-b border-neutral-100 dark:border-neutral-800/60"><td class="py-2 pr-4 mono">--force</td><td class="py-2">overwrite without merge</td></tr>
|
||||
<tr class="border-b border-neutral-100 dark:border-neutral-800/60"><td class="py-2 pr-4 mono">--yes</td><td class="py-2">skip confirmation prompt</td></tr>
|
||||
<tr class="border-b border-neutral-100 dark:border-neutral-800/60"><td class="py-2 pr-4 mono">--from a,b</td><td class="py-2">pick source adapters for init</td></tr>
|
||||
<tr><td class="py-2 pr-4 mono">--no-prompt</td><td class="py-2">take all detected sources</td></tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- Architecture -->
|
||||
<section id="architecture" class="max-w-3xl mx-auto px-5 py-12 md:py-16">
|
||||
<h2 class="text-2xl font-semibold tracking-tight mb-3">Architecture</h2>
|
||||
<p class="text-neutral-600 dark:text-neutral-400 mb-8 text-sm">Single Go binary. ~7,400 LOC. 174 passing tests. 18 packages.</p>
|
||||
<div class="flex justify-center mb-8">
|
||||
<img src="assets/architecture.svg" alt="harness-sync architecture" class="w-full max-w-2xl"/>
|
||||
</div>
|
||||
<div class="grid md:grid-cols-2 gap-6">
|
||||
<div>
|
||||
<h3 class="mono text-sm font-medium text-neutral-500 dark:text-neutral-400 mb-3">canonical tree</h3>
|
||||
<div class="terminal"><pre><span class="c">~/.config/harness-sync/</span> <span class="d">(git)</span>
|
||||
├── profiles/<span class="y"><name>.yaml</span>
|
||||
├── skills/<span class="y"><name>/SKILL.md</span>
|
||||
├── agents/<span class="y"><name>.md</span>
|
||||
├── mcp.yaml
|
||||
└── instructions/<span class="y">global.md</span></pre></div>
|
||||
</div>
|
||||
<div>
|
||||
<h3 class="mono text-sm font-medium text-neutral-500 dark:text-neutral-400 mb-3">merge model</h3>
|
||||
<div class="terminal"><pre><span class="d">base </span> ← state/ <span class="d">(last render)</span>
|
||||
<span class="g">ours </span> ← rendered <span class="d">(what we'd write now)</span>
|
||||
<span class="c">theirs</span> ← on disk <span class="d">(what's actually there)</span>
|
||||
|
||||
<span class="d">disjoint</span> → clean merge, write file
|
||||
<span class="y">overlap </span> → .rej file, exit non-zero</pre></div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- Footer -->
|
||||
<footer class="border-t border-neutral-200 dark:border-neutral-800">
|
||||
<div class="max-w-3xl mx-auto px-5 py-8 flex flex-col md:flex-row justify-between items-center gap-3 text-sm text-neutral-500 dark:text-neutral-500">
|
||||
<div class="mono">
|
||||
<span class="text-emerald-600 dark:text-emerald-400">$</span> harness-sync — one config, every harness
|
||||
</div>
|
||||
<div class="flex items-center gap-5">
|
||||
<a href="https://github.com/lukaszraczylo/harness-sync" class="hover:text-neutral-900 dark:hover:text-neutral-100">github</a>
|
||||
<a href="https://github.com/sponsors/lukaszraczylo" class="hover:text-neutral-900 dark:hover:text-neutral-100">sponsor</a>
|
||||
<span>MIT</span>
|
||||
</div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script>
|
||||
document.getElementById('theme-toggle').addEventListener('click',()=>{
|
||||
const d=document.documentElement.classList;
|
||||
if(d.contains('dark')){d.remove('dark');localStorage.theme='light'}
|
||||
else{d.add('dark');localStorage.theme='dark'}
|
||||
});
|
||||
const mt=document.getElementById('mobile-toggle'),mm=document.getElementById('mobile-menu');
|
||||
mt.addEventListener('click',()=>mm.classList.toggle('hidden'));
|
||||
mm.querySelectorAll('a').forEach(l=>l.addEventListener('click',()=>mm.classList.add('hidden')));
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,12 +1,13 @@
|
||||
module github.com/lukaszraczylo/harness-sync
|
||||
|
||||
go 1.25
|
||||
go 1.25.10
|
||||
|
||||
require (
|
||||
github.com/charmbracelet/huh v1.0.0
|
||||
github.com/pelletier/go-toml/v2 v2.2.3
|
||||
github.com/lukaszraczylo/oss-telemetry v0.2.3
|
||||
github.com/pelletier/go-toml/v2 v2.3.1
|
||||
github.com/spf13/afero v1.15.0
|
||||
github.com/spf13/cobra v1.8.1
|
||||
github.com/spf13/cobra v1.10.2
|
||||
github.com/stretchr/testify v1.9.0
|
||||
gopkg.in/yaml.v3 v3.0.1
|
||||
)
|
||||
@@ -15,31 +16,32 @@ require (
|
||||
github.com/atotto/clipboard v0.1.4 // indirect
|
||||
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
|
||||
github.com/catppuccin/go v0.3.0 // indirect
|
||||
github.com/charmbracelet/bubbles v0.21.1-0.20250623103423-23b8fd6302d7 // indirect
|
||||
github.com/charmbracelet/bubbletea v1.3.6 // indirect
|
||||
github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
|
||||
github.com/charmbracelet/bubbles v1.0.0 // indirect
|
||||
github.com/charmbracelet/bubbletea v1.3.10 // indirect
|
||||
github.com/charmbracelet/colorprofile v0.4.3 // indirect
|
||||
github.com/charmbracelet/lipgloss v1.1.0 // indirect
|
||||
github.com/charmbracelet/x/ansi v0.9.3 // indirect
|
||||
github.com/charmbracelet/x/cellbuf v0.0.13 // indirect
|
||||
github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0 // indirect
|
||||
github.com/charmbracelet/x/term v0.2.1 // indirect
|
||||
github.com/charmbracelet/x/ansi v0.11.7 // indirect
|
||||
github.com/charmbracelet/x/cellbuf v0.0.15 // indirect
|
||||
github.com/charmbracelet/x/exp/strings v0.1.0 // indirect
|
||||
github.com/charmbracelet/x/term v0.2.2 // indirect
|
||||
github.com/clipperhouse/displaywidth v0.11.0 // indirect
|
||||
github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
|
||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
github.com/dustin/go-humanize v1.0.1 // indirect
|
||||
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
|
||||
github.com/inconshreveable/mousetrap v1.1.0 // indirect
|
||||
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
|
||||
github.com/mattn/go-isatty v0.0.20 // indirect
|
||||
github.com/lucasb-eyer/go-colorful v1.4.0 // indirect
|
||||
github.com/mattn/go-isatty v0.0.22 // indirect
|
||||
github.com/mattn/go-localereader v0.0.1 // indirect
|
||||
github.com/mattn/go-runewidth v0.0.16 // indirect
|
||||
github.com/mattn/go-runewidth v0.0.24 // indirect
|
||||
github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
|
||||
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
|
||||
github.com/muesli/cancelreader v0.2.2 // indirect
|
||||
github.com/muesli/termenv v0.16.0 // indirect
|
||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||
github.com/rivo/uniseg v0.4.7 // indirect
|
||||
github.com/spf13/pflag v1.0.5 // indirect
|
||||
github.com/spf13/pflag v1.0.10 // indirect
|
||||
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
|
||||
golang.org/x/sync v0.16.0 // indirect
|
||||
golang.org/x/sys v0.33.0 // indirect
|
||||
golang.org/x/text v0.28.0 // indirect
|
||||
golang.org/x/sys v0.45.0 // indirect
|
||||
golang.org/x/text v0.37.0 // indirect
|
||||
)
|
||||
|
||||
@@ -8,35 +8,39 @@ github.com/aymanbagabas/go-udiff v0.3.1 h1:LV+qyBQ2pqe0u42ZsUEtPiCaUoqgA9gYRDs3v
|
||||
github.com/aymanbagabas/go-udiff v0.3.1/go.mod h1:G0fsKmG+P6ylD0r6N/KgQD/nWzgfnl8ZBcNLgcbrw8E=
|
||||
github.com/catppuccin/go v0.3.0 h1:d+0/YicIq+hSTo5oPuRi5kOpqkVA5tAsU6dNhvRu+aY=
|
||||
github.com/catppuccin/go v0.3.0/go.mod h1:8IHJuMGaUUjQM82qBrGNBv7LFq6JI3NnQCF6MOlZjpc=
|
||||
github.com/charmbracelet/bubbles v0.21.1-0.20250623103423-23b8fd6302d7 h1:JFgG/xnwFfbezlUnFMJy0nusZvytYysV4SCS2cYbvws=
|
||||
github.com/charmbracelet/bubbles v0.21.1-0.20250623103423-23b8fd6302d7/go.mod h1:ISC1gtLcVilLOf23wvTfoQuYbW2q0JevFxPfUzZ9Ybw=
|
||||
github.com/charmbracelet/bubbletea v1.3.6 h1:VkHIxPJQeDt0aFJIsVxw8BQdh/F/L2KKZGsK6et5taU=
|
||||
github.com/charmbracelet/bubbletea v1.3.6/go.mod h1:oQD9VCRQFF8KplacJLo28/jofOI2ToOfGYeFgBBxHOc=
|
||||
github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc h1:4pZI35227imm7yK2bGPcfpFEmuY1gc2YSTShr4iJBfs=
|
||||
github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc/go.mod h1:X4/0JoqgTIPSFcRA/P6INZzIuyqdFY5rm8tb41s9okk=
|
||||
github.com/charmbracelet/bubbles v1.0.0 h1:12J8/ak/uCZEMQ6KU7pcfwceyjLlWsDLAxB5fXonfvc=
|
||||
github.com/charmbracelet/bubbles v1.0.0/go.mod h1:9d/Zd5GdnauMI5ivUIVisuEm3ave1XwXtD1ckyV6r3E=
|
||||
github.com/charmbracelet/bubbletea v1.3.10 h1:otUDHWMMzQSB0Pkc87rm691KZ3SWa4KUlvF9nRvCICw=
|
||||
github.com/charmbracelet/bubbletea v1.3.10/go.mod h1:ORQfo0fk8U+po9VaNvnV95UPWA1BitP1E0N6xJPlHr4=
|
||||
github.com/charmbracelet/colorprofile v0.4.3 h1:QPa1IWkYI+AOB+fE+mg/5/4HRMZcaXex9t5KX76i20Q=
|
||||
github.com/charmbracelet/colorprofile v0.4.3/go.mod h1:/zT4BhpD5aGFpqQQqw7a+VtHCzu+zrQtt1zhMt9mR4Q=
|
||||
github.com/charmbracelet/huh v1.0.0 h1:wOnedH8G4qzJbmhftTqrpppyqHakl/zbbNdXIWJyIxw=
|
||||
github.com/charmbracelet/huh v1.0.0/go.mod h1:5YVc+SlZ1IhQALxRPpkGwwEKftN/+OlJlnJYlDRFqN4=
|
||||
github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY=
|
||||
github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
|
||||
github.com/charmbracelet/x/ansi v0.9.3 h1:BXt5DHS/MKF+LjuK4huWrC6NCvHtexww7dMayh6GXd0=
|
||||
github.com/charmbracelet/x/ansi v0.9.3/go.mod h1:3RQDQ6lDnROptfpWuUVIUG64bD2g2BgntdxH0Ya5TeE=
|
||||
github.com/charmbracelet/x/cellbuf v0.0.13 h1:/KBBKHuVRbq1lYx5BzEHBAFBP8VcQzJejZ/IA3iR28k=
|
||||
github.com/charmbracelet/x/cellbuf v0.0.13/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs=
|
||||
github.com/charmbracelet/x/ansi v0.11.7 h1:kzv1kJvjg2S3r9KHo8hDdHFQLEqn4RBCb39dAYC84jI=
|
||||
github.com/charmbracelet/x/ansi v0.11.7/go.mod h1:9qGpnAVYz+8ACONkZBUWPtL7lulP9No6p1epAihUZwQ=
|
||||
github.com/charmbracelet/x/cellbuf v0.0.15 h1:ur3pZy0o6z/R7EylET877CBxaiE1Sp1GMxoFPAIztPI=
|
||||
github.com/charmbracelet/x/cellbuf v0.0.15/go.mod h1:J1YVbR7MUuEGIFPCaaZ96KDl5NoS0DAWkskup+mOY+Q=
|
||||
github.com/charmbracelet/x/conpty v0.1.0 h1:4zc8KaIcbiL4mghEON8D72agYtSeIgq8FSThSPQIb+U=
|
||||
github.com/charmbracelet/x/conpty v0.1.0/go.mod h1:rMFsDJoDwVmiYM10aD4bH2XiRgwI7NYJtQgl5yskjEQ=
|
||||
github.com/charmbracelet/x/errors v0.0.0-20240508181413-e8d8b6e2de86 h1:JSt3B+U9iqk37QUU2Rvb6DSBYRLtWqFqfxf8l5hOZUA=
|
||||
github.com/charmbracelet/x/errors v0.0.0-20240508181413-e8d8b6e2de86/go.mod h1:2P0UgXMEa6TsToMSuFqKFQR+fZTO9CNGUNokkPatT/0=
|
||||
github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91 h1:payRxjMjKgx2PaCWLZ4p3ro9y97+TVLZNaRZgJwSVDQ=
|
||||
github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U=
|
||||
github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0 h1:qko3AQ4gK1MTS/de7F5hPGx6/k1u0w4TeYmBFwzYVP4=
|
||||
github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0/go.mod h1:pBhA0ybfXv6hDjQUZ7hk1lVxBiUbupdw5R31yPUViVQ=
|
||||
github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ=
|
||||
github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg=
|
||||
github.com/charmbracelet/x/exp/strings v0.1.0 h1:i69S2XI7uG1u4NLGeJPSYU++Nmjvpo9nwd6aoEm7gkA=
|
||||
github.com/charmbracelet/x/exp/strings v0.1.0/go.mod h1:/ehtMPNh9K4odGFkqYJKpIYyePhdp1hLBRvyY4bWkH8=
|
||||
github.com/charmbracelet/x/term v0.2.2 h1:xVRT/S2ZcKdhhOuSP4t5cLi5o+JxklsoEObBSgfgZRk=
|
||||
github.com/charmbracelet/x/term v0.2.2/go.mod h1:kF8CY5RddLWrsgVwpw4kAa6TESp6EB5y3uxGLeCqzAI=
|
||||
github.com/charmbracelet/x/termios v0.1.1 h1:o3Q2bT8eqzGnGPOYheoYS8eEleT5ZVNYNy8JawjaNZY=
|
||||
github.com/charmbracelet/x/termios v0.1.1/go.mod h1:rB7fnv1TgOPOyyKRJ9o+AsTU/vK5WHJ2ivHeut/Pcwo=
|
||||
github.com/charmbracelet/x/xpty v0.1.2 h1:Pqmu4TEJ8KeA9uSkISKMU3f+C1F6OGBn8ABuGlqCbtI=
|
||||
github.com/charmbracelet/x/xpty v0.1.2/go.mod h1:XK2Z0id5rtLWcpeNiMYBccNNBrP2IJnzHI0Lq13Xzq4=
|
||||
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
|
||||
github.com/clipperhouse/displaywidth v0.11.0 h1:lBc6kY44VFw+TDx4I8opi/EtL9m20WSEFgwIwO+UVM8=
|
||||
github.com/clipperhouse/displaywidth v0.11.0/go.mod h1:bkrFNkf81G8HyVqmKGxsPufD3JhNl3dSqnGhOoSD/o0=
|
||||
github.com/clipperhouse/uax29/v2 v2.7.0 h1:+gs4oBZ2gPfVrKPthwbMzWZDaAFPGYK72F0NJv2v7Vk=
|
||||
github.com/clipperhouse/uax29/v2 v2.7.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM=
|
||||
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
|
||||
github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s=
|
||||
github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
@@ -47,14 +51,16 @@ github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6
|
||||
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
|
||||
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
|
||||
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
|
||||
github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
|
||||
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
|
||||
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
|
||||
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
||||
github.com/lucasb-eyer/go-colorful v1.4.0 h1:UtrWVfLdarDgc44HcS7pYloGHJUjHV/4FwW4TvVgFr4=
|
||||
github.com/lucasb-eyer/go-colorful v1.4.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
|
||||
github.com/lukaszraczylo/oss-telemetry v0.2.3 h1:xoDtBqeZGmXj7IteiE1M5WMuzeoqag58qEleI0Cf2Ms=
|
||||
github.com/lukaszraczylo/oss-telemetry v0.2.3/go.mod h1:+Cn78qZo8rc3T9eZt0v3oICYRdd75wORtSidc8lNjDQ=
|
||||
github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4=
|
||||
github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4=
|
||||
github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
|
||||
github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
|
||||
github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
|
||||
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
|
||||
github.com/mattn/go-runewidth v0.0.24 h1:cpokDiIn0MGnhdHwuWnJBITySJ20QyNGnY2kR/ay2DU=
|
||||
github.com/mattn/go-runewidth v0.0.24/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
|
||||
github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4=
|
||||
github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE=
|
||||
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
|
||||
@@ -63,34 +69,32 @@ github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELU
|
||||
github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
|
||||
github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc=
|
||||
github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
|
||||
github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
|
||||
github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
|
||||
github.com/pelletier/go-toml/v2 v2.3.1 h1:MYEvvGnQjeNkRF1qUuGolNtNExTDwct51yp7olPtrEc=
|
||||
github.com/pelletier/go-toml/v2 v2.3.1/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
|
||||
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
|
||||
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
|
||||
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
||||
github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I=
|
||||
github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg=
|
||||
github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
|
||||
github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
|
||||
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
|
||||
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
|
||||
github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=
|
||||
github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4=
|
||||
github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
|
||||
github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
|
||||
github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
|
||||
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
|
||||
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
|
||||
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
|
||||
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
|
||||
golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
|
||||
golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
|
||||
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
|
||||
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
|
||||
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
|
||||
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
|
||||
golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
|
||||
golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
|
||||
golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
|
||||
golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
|
||||
golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
|
||||
golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
|
||||
@@ -23,9 +23,22 @@ func (k Kind) String() string {
|
||||
return "unknown"
|
||||
}
|
||||
|
||||
// HarnessCapabilities declares what an adapter manages.
|
||||
// HasBuiltInSub means the harness has its own AI subscription (e.g. Claude Max)
|
||||
// and harness-sync should not write provider/model/endpoint config for it.
|
||||
type HarnessCapabilities struct {
|
||||
ManagesProviders bool // writes provider/gateway endpoint config
|
||||
ManagesModels bool // writes model selection config
|
||||
ManagesMCP bool // writes MCP server config
|
||||
ManagesSkills bool // writes skills symlink or equivalent
|
||||
ManagesInstructions bool // writes instructions file (CLAUDE.md, AGENTS.md, etc.)
|
||||
HasBuiltInSub bool // has its own subscription; provider/model config is skipped
|
||||
}
|
||||
|
||||
type Adapter interface {
|
||||
Name() string
|
||||
Detect() bool
|
||||
Capabilities() HarnessCapabilities
|
||||
Render(b *canonical.Bundle) (*FileSet, error)
|
||||
Import(home string) (*ImportResult, error)
|
||||
}
|
||||
|
||||
@@ -34,6 +34,7 @@ func (f *fakeAdapter) Name() string { return f.n
|
||||
func (f *fakeAdapter) Detect() bool { return f.detect }
|
||||
func (f *fakeAdapter) Render(_ *canonical.Bundle) (*FileSet, error) { return NewFileSet(), nil }
|
||||
func (f *fakeAdapter) Import(_ string) (*ImportResult, error) { return &ImportResult{}, nil }
|
||||
func (f *fakeAdapter) Capabilities() HarnessCapabilities { return HarnessCapabilities{} }
|
||||
|
||||
func TestRegistry(t *testing.T) {
|
||||
r := NewRegistry()
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
package adapter
|
||||
|
||||
import "github.com/lukaszraczylo/harness-sync/internal/adapter/common"
|
||||
|
||||
// Base holds the cross-adapter defaults (currently just the home directory
|
||||
// used to compute target paths). Embed it in each adapter struct to inherit
|
||||
// the WithHome/New constructor pattern without re-implementing it.
|
||||
type Base struct {
|
||||
Home string
|
||||
}
|
||||
|
||||
// BaseOption configures a Base. Returned by WithHome and consumed by NewBase.
|
||||
type BaseOption func(*Base)
|
||||
|
||||
// WithHome overrides the home directory used for target paths. Defaults to
|
||||
// common.DefaultHome() (current $HOME) when no option is supplied.
|
||||
func WithHome(h string) BaseOption {
|
||||
return func(b *Base) { b.Home = h }
|
||||
}
|
||||
|
||||
// NewBase returns a Base populated from opts, with Home defaulting to the
|
||||
// current user's home directory.
|
||||
func NewBase(opts ...BaseOption) *Base {
|
||||
b := &Base{Home: common.DefaultHome()}
|
||||
for _, o := range opts {
|
||||
o(b)
|
||||
}
|
||||
return b
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
package adapter_test
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/lukaszraczylo/harness-sync/internal/adapter"
|
||||
)
|
||||
|
||||
func TestNewBaseDefaultsHomeFromEnv(t *testing.T) {
|
||||
b := adapter.NewBase()
|
||||
// DefaultHome returns either $HOME or "". We only assert that the
|
||||
// helper does not panic and that Home is a string (Go zero value is "").
|
||||
// Environment-dependence: skip if HOME is unset (CI minimal envs).
|
||||
if b.Home == "" {
|
||||
t.Skip("HOME unset in test env; cannot verify default")
|
||||
}
|
||||
assert.NotEmpty(t, b.Home)
|
||||
}
|
||||
|
||||
func TestNewBaseWithHomeOverrides(t *testing.T) {
|
||||
b := adapter.NewBase(adapter.WithHome("/custom/home/path"))
|
||||
assert.Equal(t, "/custom/home/path", b.Home)
|
||||
}
|
||||
|
||||
func TestNewBaseOptionsApplyInOrder(t *testing.T) {
|
||||
// Last write wins — covers the basic Apply loop in NewBase.
|
||||
b := adapter.NewBase(
|
||||
adapter.WithHome("/first"),
|
||||
adapter.WithHome("/second"),
|
||||
)
|
||||
assert.Equal(t, "/second", b.Home)
|
||||
}
|
||||
|
||||
func TestBaseOptionTypedCorrectly(t *testing.T) {
|
||||
// adapter.BaseOption is the public type; WithHome must return it.
|
||||
opt := adapter.WithHome("/x")
|
||||
require.NotNil(t, opt)
|
||||
|
||||
// Apply it manually to confirm signature.
|
||||
var b adapter.Base
|
||||
opt(&b)
|
||||
assert.Equal(t, "/x", b.Home)
|
||||
}
|
||||
@@ -3,56 +3,31 @@ package common
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"net/url"
|
||||
"strings"
|
||||
|
||||
"github.com/lukaszraczylo/harness-sync/internal/canonical"
|
||||
)
|
||||
|
||||
const gatewayProviderID = "harness-sync-gateway"
|
||||
const fallbackGatewayProviderID = "harness-sync-gateway"
|
||||
|
||||
// ProviderEntry is a generic provider record. Adapters may massage further.
|
||||
type ProviderEntry = map[string]any
|
||||
|
||||
// BuildProviders returns the canonical-to-generic provider list: gateway first
|
||||
// (if configured), then any upstreams. Each entry has id, name, base_url,
|
||||
// api_key, and (for the gateway) a models list.
|
||||
func BuildProviders(p *canonical.Profile) []ProviderEntry {
|
||||
out := make([]ProviderEntry, 0, len(p.Upstreams)+1)
|
||||
if p.Gateway.URL != "" {
|
||||
gw := ProviderEntry{
|
||||
"id": gatewayProviderID,
|
||||
"name": "harness-sync gateway",
|
||||
"base_url": p.Gateway.URL,
|
||||
"api_key": p.Gateway.Token,
|
||||
}
|
||||
if models := buildModels(p.Models); len(models) > 0 {
|
||||
gw["models"] = models
|
||||
}
|
||||
out = append(out, gw)
|
||||
// GatewayProviderKey returns a stable provider key derived from the gateway URL.
|
||||
// Format: "hs-<hostname>" with dots and special chars normalised to dashes.
|
||||
// Falls back to "harness-sync-gateway" when the URL is empty or unparseable.
|
||||
//
|
||||
// https://llmgw.h.raczylo.com/v1 → hs-llmgw-h-raczylo-com
|
||||
func GatewayProviderKey(gatewayURL string) string {
|
||||
if gatewayURL == "" {
|
||||
return fallbackGatewayProviderID
|
||||
}
|
||||
for _, up := range p.Upstreams {
|
||||
e := ProviderEntry{"id": up.Name, "name": up.Name}
|
||||
if up.BaseURL != "" {
|
||||
e["base_url"] = up.BaseURL
|
||||
}
|
||||
if up.APIKey != "" {
|
||||
e["api_key"] = up.APIKey
|
||||
}
|
||||
out = append(out, e)
|
||||
u, err := url.Parse(gatewayURL)
|
||||
if err != nil || u.Hostname() == "" {
|
||||
return fallbackGatewayProviderID
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func buildModels(models []canonical.Model) []map[string]any {
|
||||
out := make([]map[string]any, 0, len(models))
|
||||
for _, m := range models {
|
||||
e := map[string]any{"id": m.ID}
|
||||
if m.Alias != "" {
|
||||
e["alias"] = m.Alias
|
||||
}
|
||||
out = append(out, e)
|
||||
}
|
||||
return out
|
||||
host := u.Hostname()
|
||||
// Replace dots, underscores, and colons (port separators) with dashes.
|
||||
r := strings.NewReplacer(".", "-", "_", "-", ":", "-")
|
||||
return "hs-" + r.Replace(host)
|
||||
}
|
||||
|
||||
// crushModel builds a 10-field model entry required by the crush schema.
|
||||
@@ -86,7 +61,7 @@ func ProvidersAsCrushMap(p *canonical.Profile) map[string]any {
|
||||
if len(models) == 0 && p.Gateway.DefaultModel != "" {
|
||||
models = append(models, crushModel(p.Gateway.DefaultModel))
|
||||
}
|
||||
out[gatewayProviderID] = map[string]any{
|
||||
out[GatewayProviderKey(p.Gateway.URL)] = map[string]any{
|
||||
"type": "openai-compat",
|
||||
"base_url": p.Gateway.URL,
|
||||
"api_key": p.Gateway.Token,
|
||||
@@ -103,7 +78,7 @@ func CrushRoleModels(p *canonical.Profile) map[string]any {
|
||||
}
|
||||
sel := map[string]any{
|
||||
"model": p.Gateway.DefaultModel,
|
||||
"provider": gatewayProviderID,
|
||||
"provider": GatewayProviderKey(p.Gateway.URL),
|
||||
}
|
||||
return map[string]any{
|
||||
"large": sel,
|
||||
@@ -113,18 +88,34 @@ func CrushRoleModels(p *canonical.Profile) map[string]any {
|
||||
}
|
||||
|
||||
// ProvidersAsMap returns a name-keyed map of provider objects for harnesses
|
||||
// like opencode/kilo that use `provider` (singular, map-shaped) instead of a
|
||||
// slice. Each entry has npm + options.{baseURL,apiKey} per the opencode schema.
|
||||
// like opencode/kilo that use `provider` (singular, map-shaped). Includes
|
||||
// top-level "name" and "models" Record so the harness UI can enumerate models.
|
||||
func ProvidersAsMap(p *canonical.Profile) map[string]any {
|
||||
out := map[string]any{}
|
||||
if p.Gateway.URL != "" {
|
||||
out[gatewayProviderID] = map[string]any{
|
||||
"npm": "@ai-sdk/openai-compatible",
|
||||
models := map[string]any{}
|
||||
for _, m := range p.Models {
|
||||
displayName := m.ID
|
||||
if m.Alias != "" {
|
||||
displayName = m.Alias
|
||||
}
|
||||
models[m.ID] = map[string]any{
|
||||
"name": displayName,
|
||||
"limit": map[string]any{"context": 200000, "output": 8192},
|
||||
}
|
||||
}
|
||||
entry := map[string]any{
|
||||
"name": "harness-sync gateway",
|
||||
"npm": "@ai-sdk/openai-compatible",
|
||||
"options": map[string]any{
|
||||
"baseURL": p.Gateway.URL,
|
||||
"apiKey": p.Gateway.Token,
|
||||
},
|
||||
}
|
||||
if len(models) > 0 {
|
||||
entry["models"] = models
|
||||
}
|
||||
out[GatewayProviderKey(p.Gateway.URL)] = entry
|
||||
}
|
||||
for _, up := range p.Upstreams {
|
||||
entry := map[string]any{
|
||||
@@ -150,7 +141,7 @@ func KiloModelString(p *canonical.Profile) string {
|
||||
if p.Gateway.DefaultModel == "" {
|
||||
return ""
|
||||
}
|
||||
return gatewayProviderID + "/" + p.Gateway.DefaultModel
|
||||
return GatewayProviderKey(p.Gateway.URL) + "/" + p.Gateway.DefaultModel
|
||||
}
|
||||
|
||||
// ProvidersAsCagentMap returns the providers block for cagent:
|
||||
@@ -160,55 +151,21 @@ func ProvidersAsCagentMap(p *canonical.Profile) map[string]any {
|
||||
if p.Gateway.URL == "" {
|
||||
return out
|
||||
}
|
||||
out[gatewayProviderID] = map[string]any{
|
||||
"base_url": p.Gateway.URL,
|
||||
"token_key": "HARNESS_SYNC_GATEWAY_TOKEN",
|
||||
"provider": "openai",
|
||||
out[GatewayProviderKey(p.Gateway.URL)] = map[string]any{
|
||||
"base_url": p.Gateway.URL,
|
||||
"api_key": p.Gateway.Token,
|
||||
"provider": "openai",
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// ZedLanguageModels returns the language_models.openai block for Zed when a
|
||||
// gateway URL is configured.
|
||||
func ZedLanguageModels(p *canonical.Profile) map[string]any {
|
||||
if p.Gateway.URL == "" {
|
||||
return map[string]any{}
|
||||
}
|
||||
models := make([]map[string]any, 0)
|
||||
for _, m := range p.Models {
|
||||
models = append(models, map[string]any{
|
||||
"name": m.ID,
|
||||
"display_name": func() string {
|
||||
if m.Alias != "" {
|
||||
return m.Alias
|
||||
}
|
||||
return m.ID
|
||||
}(),
|
||||
"max_tokens": 8192,
|
||||
})
|
||||
}
|
||||
if len(models) == 0 && p.Gateway.DefaultModel != "" {
|
||||
models = append(models, map[string]any{
|
||||
"name": p.Gateway.DefaultModel,
|
||||
"display_name": p.Gateway.DefaultModel,
|
||||
"max_tokens": 8192,
|
||||
})
|
||||
}
|
||||
return map[string]any{
|
||||
"openai": map[string]any{
|
||||
"api_url": p.Gateway.URL,
|
||||
"available_models": models,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
// GooseCustomProviderFile returns the JSON body and provider ID for the goose
|
||||
// custom_providers/<id>.json file. Returns nil body when Gateway.URL is empty.
|
||||
func GooseCustomProviderFile(p *canonical.Profile) ([]byte, string) {
|
||||
if p.Gateway.URL == "" {
|
||||
return nil, ""
|
||||
}
|
||||
providerID := gatewayProviderID
|
||||
providerID := GatewayProviderKey(p.Gateway.URL)
|
||||
providerName := "custom_" + providerID
|
||||
|
||||
models := make([]map[string]any, 0)
|
||||
@@ -242,16 +199,16 @@ func GooseCustomProviderFile(p *canonical.Profile) ([]byte, string) {
|
||||
}
|
||||
}
|
||||
|
||||
chatURL := strings.TrimRight(p.Gateway.URL, "/") + "/v1/chat/completions"
|
||||
// Append only /chat/completions — the profile URL already contains /v1.
|
||||
chatURL := strings.TrimRight(p.Gateway.URL, "/") + "/chat/completions"
|
||||
|
||||
entry := map[string]any{
|
||||
"name": providerName,
|
||||
"engine": "openai",
|
||||
"display_name": displayName,
|
||||
"base_url": chatURL,
|
||||
"models": models,
|
||||
"requires_auth": true,
|
||||
"api_key_env": "CUSTOM_HARNESS_SYNC_GATEWAY_API_KEY",
|
||||
"name": providerName,
|
||||
"engine": "openai",
|
||||
"display_name": displayName,
|
||||
"base_url": chatURL,
|
||||
"models": models,
|
||||
"api_key": p.Gateway.Token,
|
||||
}
|
||||
body, err := json.MarshalIndent(entry, "", " ")
|
||||
if err != nil {
|
||||
|
||||
@@ -9,32 +9,6 @@ import (
|
||||
"github.com/lukaszraczylo/harness-sync/internal/canonical"
|
||||
)
|
||||
|
||||
func TestBuildProvidersGatewayFirst(t *testing.T) {
|
||||
p := &canonical.Profile{
|
||||
Gateway: canonical.Gateway{URL: "https://gw", Token: "t", DefaultModel: "x"},
|
||||
Models: []canonical.Model{{ID: "m1", Alias: "a1"}},
|
||||
Upstreams: []canonical.Upstream{
|
||||
{Name: "anthropic", APIKey: "k", BaseURL: "https://api.anthropic.com"},
|
||||
},
|
||||
}
|
||||
out := BuildProviders(p)
|
||||
require.Len(t, out, 2)
|
||||
assert.Equal(t, "harness-sync-gateway", out[0]["id"])
|
||||
assert.Equal(t, "anthropic", out[1]["id"])
|
||||
assert.NotNil(t, out[0]["models"])
|
||||
}
|
||||
|
||||
func TestBuildProvidersNoGateway(t *testing.T) {
|
||||
p := &canonical.Profile{
|
||||
Upstreams: []canonical.Upstream{
|
||||
{Name: "anthropic", APIKey: "k"},
|
||||
},
|
||||
}
|
||||
out := BuildProviders(p)
|
||||
require.Len(t, out, 1)
|
||||
assert.Equal(t, "anthropic", out[0]["id"])
|
||||
}
|
||||
|
||||
func TestBuildMCPMap(t *testing.T) {
|
||||
reg := &canonical.MCPRegistry{Servers: []canonical.MCPServer{
|
||||
{Name: "filepuff", Command: "/bin/x", Transport: "stdio"},
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
package common
|
||||
|
||||
import "maps"
|
||||
|
||||
// AbsorbDuplicateProviders scans provMap for entries (other than ourKey) whose
|
||||
// options.baseURL matches gatewayURL and absorbs their models into our entry.
|
||||
//
|
||||
// Merge strategy:
|
||||
// - Models only in the duplicate: added to our provider.
|
||||
// - Models only in our canonical entry: kept as-is.
|
||||
// - Models in both: the DUPLICATE's entry wins (preserves user-crafted display
|
||||
// names and custom limits that are often more descriptive than the profile
|
||||
// alias).
|
||||
//
|
||||
// Absorbed entries are deleted from the returned map. Returns provMap unchanged
|
||||
// when gatewayURL is empty or our entry is absent.
|
||||
func AbsorbDuplicateProviders(provMap map[string]any, ourKey, gatewayURL string) map[string]any {
|
||||
if gatewayURL == "" || provMap == nil {
|
||||
return provMap
|
||||
}
|
||||
ourEntry, ok := provMap[ourKey].(map[string]any)
|
||||
if !ok {
|
||||
return provMap
|
||||
}
|
||||
|
||||
// Clone top-level so we don't mutate the caller's map.
|
||||
result := make(map[string]any, len(provMap))
|
||||
maps.Copy(result, provMap)
|
||||
|
||||
ourModels, _ := ourEntry["models"].(map[string]any)
|
||||
if ourModels == nil {
|
||||
ourModels = map[string]any{}
|
||||
}
|
||||
|
||||
// merged starts with our canonical models; duplicates may override per-model.
|
||||
merged := make(map[string]any, len(ourModels))
|
||||
maps.Copy(merged, ourModels)
|
||||
|
||||
for k, v := range result {
|
||||
if k == ourKey {
|
||||
continue
|
||||
}
|
||||
entry, ok := v.(map[string]any)
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
opts, _ := entry["options"].(map[string]any)
|
||||
if opts == nil {
|
||||
continue
|
||||
}
|
||||
if opts["baseURL"] != gatewayURL {
|
||||
continue
|
||||
}
|
||||
// Same gateway URL — absorb and delete.
|
||||
if dupModels, ok := entry["models"].(map[string]any); ok {
|
||||
// Duplicate (user-crafted) wins for overlapping IDs.
|
||||
maps.Copy(merged, dupModels)
|
||||
}
|
||||
delete(result, k)
|
||||
}
|
||||
|
||||
updated := make(map[string]any, len(ourEntry))
|
||||
maps.Copy(updated, ourEntry)
|
||||
if len(merged) > 0 {
|
||||
updated["models"] = merged
|
||||
}
|
||||
result[ourKey] = updated
|
||||
return result
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package common
|
||||
|
||||
import "os"
|
||||
|
||||
// DefaultHome returns the current user's home directory, or "" on error.
|
||||
func DefaultHome() string {
|
||||
h, err := os.UserHomeDir()
|
||||
if err != nil {
|
||||
return ""
|
||||
}
|
||||
return h
|
||||
}
|
||||
@@ -29,6 +29,19 @@ func ReadIfExists(path string) (string, error) {
|
||||
return ReadIfExistsFS(fsx.OS(), path)
|
||||
}
|
||||
|
||||
// ReadExistingFile returns the file body or (nil, nil) when missing.
|
||||
// Other errors (permission denied, I/O failure) are returned verbatim so
|
||||
// read-modify-write callers can distinguish a fresh first-run state from a
|
||||
// broken read. Treating every error as "file is empty" silently overwrites
|
||||
// the user's on-disk edits during apply.
|
||||
func ReadExistingFile(path string) ([]byte, error) {
|
||||
b, err := os.ReadFile(path) //nolint:gosec // caller-controlled path
|
||||
if err != nil && os.IsNotExist(err) {
|
||||
return nil, nil
|
||||
}
|
||||
return b, err
|
||||
}
|
||||
|
||||
// DirExistsFS reports whether path is an existing directory on fs.
|
||||
func DirExistsFS(fs fsx.FS, path string) bool {
|
||||
info, err := fs.Stat(path)
|
||||
@@ -40,18 +53,51 @@ func DirExists(path string) bool {
|
||||
return DirExistsFS(fsx.OS(), path)
|
||||
}
|
||||
|
||||
var (
|
||||
blockComment = regexp.MustCompile(`(?s)/\*.*?\*/`)
|
||||
lineComment = regexp.MustCompile(`(?m)//[^\n]*`)
|
||||
)
|
||||
var trailingComma = regexp.MustCompile(`,(\s*[}\]])`)
|
||||
|
||||
// StripJSONComments is a naive JSONC -> JSON stripper. It does not understand
|
||||
// strings containing // or /* and is therefore only safe for hand-edited
|
||||
// config files that don't put comment markers inside string literals.
|
||||
// StripJSONComments converts JSONC to standard JSON by:
|
||||
// - removing // line comments (only outside string literals)
|
||||
// - removing /* */ block comments (only outside string literals)
|
||||
// - removing trailing commas before } or ]
|
||||
//
|
||||
// It is string-aware so it won't mangle // inside URL values like "https://...".
|
||||
func StripJSONComments(s string) string {
|
||||
s = blockComment.ReplaceAllString(s, "")
|
||||
s = lineComment.ReplaceAllString(s, "")
|
||||
return strings.TrimSpace(s)
|
||||
result := make([]byte, 0, len(s))
|
||||
i, n := 0, len(s)
|
||||
for i < n {
|
||||
switch {
|
||||
case s[i] == '"': // string literal — copy verbatim including escape sequences
|
||||
result = append(result, s[i])
|
||||
i++
|
||||
for i < n {
|
||||
c := s[i]
|
||||
result = append(result, c)
|
||||
i++
|
||||
if c == '\\' && i < n {
|
||||
result = append(result, s[i])
|
||||
i++
|
||||
} else if c == '"' {
|
||||
break
|
||||
}
|
||||
}
|
||||
case i+1 < n && s[i] == '/' && s[i+1] == '*': // /* block comment */
|
||||
i += 2
|
||||
for i+1 < n && (s[i] != '*' || s[i+1] != '/') {
|
||||
i++
|
||||
}
|
||||
i += 2
|
||||
case i+1 < n && s[i] == '/' && s[i+1] == '/': // // line comment
|
||||
i += 2
|
||||
for i < n && s[i] != '\n' {
|
||||
i++
|
||||
}
|
||||
default:
|
||||
result = append(result, s[i])
|
||||
i++
|
||||
}
|
||||
}
|
||||
out := trailingComma.ReplaceAllString(string(result), "$1")
|
||||
return strings.TrimSpace(out)
|
||||
}
|
||||
|
||||
// ImportMCPFromJSONFileFS reads a JSON file from fs and extracts an MCP server
|
||||
|
||||
@@ -0,0 +1,64 @@
|
||||
package common_test
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/lukaszraczylo/harness-sync/internal/adapter/common"
|
||||
)
|
||||
|
||||
// ReadExistingFile: missing file returns (nil, nil). Permission errors and
|
||||
// other I/O failures must NOT be silently swallowed — those would let
|
||||
// read-modify-write code clobber the user's on-disk state.
|
||||
|
||||
func TestReadExistingFileMissing(t *testing.T) {
|
||||
got, err := common.ReadExistingFile(filepath.Join(t.TempDir(), "absent"))
|
||||
require.NoError(t, err)
|
||||
assert.Nil(t, got)
|
||||
}
|
||||
|
||||
func TestReadExistingFileContent(t *testing.T) {
|
||||
dir := t.TempDir()
|
||||
path := filepath.Join(dir, "ok.txt")
|
||||
require.NoError(t, os.WriteFile(path, []byte("body\n"), 0o600))
|
||||
|
||||
got, err := common.ReadExistingFile(path)
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, []byte("body\n"), got)
|
||||
}
|
||||
|
||||
func TestReadExistingFilePropagatesError(t *testing.T) {
|
||||
// Create a directory the OS will refuse us read access to.
|
||||
if os.Geteuid() == 0 {
|
||||
t.Skip("running as root; cannot test permission denial")
|
||||
}
|
||||
dir := t.TempDir()
|
||||
require.NoError(t, os.Mkdir(filepath.Join(dir, "locked"), 0o000))
|
||||
t.Cleanup(func() { _ = os.Chmod(filepath.Join(dir, "locked"), 0o755) })
|
||||
|
||||
_, err := common.ReadExistingFile(filepath.Join(dir, "locked", "file"))
|
||||
require.Error(t, err)
|
||||
assert.False(t, os.IsNotExist(err), "permission denied must not be reported as not-exist")
|
||||
assert.True(t, errors.Is(err, os.ErrPermission) || isPermission(err),
|
||||
"expected permission error, got %v", err)
|
||||
}
|
||||
|
||||
func isPermission(err error) bool {
|
||||
// Some platforms wrap the error in *os.PathError. Check the string too
|
||||
// for portability — it's a coarse signal but adequate here.
|
||||
return err != nil && (contains(err.Error(), "permission") || contains(err.Error(), "access denied"))
|
||||
}
|
||||
|
||||
func contains(s, sub string) bool {
|
||||
for i := 0; i+len(sub) <= len(s); i++ {
|
||||
if s[i:i+len(sub)] == sub {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
@@ -12,7 +12,7 @@ const (
|
||||
MCPCrushStyle
|
||||
// MCPOpencodeStyle: kilo + opencode shape — type: local|remote, command as []string.
|
||||
MCPOpencodeStyle
|
||||
// MCPZedStyle: zed context_servers — {enabled, source, command, args} or {enabled, url}.
|
||||
// MCPZedStyle: zed context_servers — {enabled, command, args} or {enabled, url}.
|
||||
MCPZedStyle
|
||||
)
|
||||
|
||||
@@ -31,32 +31,7 @@ func BuildMCPMapStyled(reg *canonical.MCPRegistry, style MCPStyle) map[string]an
|
||||
func mcpEntry(s canonical.MCPServer, style MCPStyle) map[string]any {
|
||||
e := map[string]any{}
|
||||
switch style {
|
||||
case MCPClaudeStyle:
|
||||
// Claude Code's actual entry shape uses "type" (not "transport").
|
||||
// Default to stdio when no URL is set.
|
||||
t := s.Transport
|
||||
if s.URL != "" {
|
||||
if t == "" {
|
||||
t = "http"
|
||||
}
|
||||
e["type"] = t
|
||||
e["url"] = s.URL
|
||||
} else {
|
||||
if t == "" {
|
||||
t = "stdio"
|
||||
}
|
||||
e["type"] = t
|
||||
if s.Command != "" {
|
||||
e["command"] = s.Command
|
||||
}
|
||||
if len(s.Args) > 0 {
|
||||
e["args"] = s.Args
|
||||
}
|
||||
if len(s.Env) > 0 {
|
||||
e["env"] = s.Env
|
||||
}
|
||||
}
|
||||
case MCPCrushStyle:
|
||||
case MCPClaudeStyle, MCPCrushStyle:
|
||||
if s.URL != "" {
|
||||
t := s.Transport
|
||||
if t == "" {
|
||||
@@ -65,7 +40,12 @@ func mcpEntry(s canonical.MCPServer, style MCPStyle) map[string]any {
|
||||
e["type"] = t
|
||||
e["url"] = s.URL
|
||||
} else {
|
||||
e["type"] = "stdio"
|
||||
// Claude honours Transport field; Crush always uses "stdio".
|
||||
t := "stdio"
|
||||
if style == MCPClaudeStyle && s.Transport != "" {
|
||||
t = s.Transport
|
||||
}
|
||||
e["type"] = t
|
||||
if s.Command != "" {
|
||||
e["command"] = s.Command
|
||||
}
|
||||
@@ -94,11 +74,12 @@ func mcpEntry(s canonical.MCPServer, style MCPStyle) map[string]any {
|
||||
}
|
||||
e["enabled"] = true
|
||||
case MCPZedStyle:
|
||||
e["enabled"] = true
|
||||
// Do NOT emit "enabled" — Zed 1.3.x has a serde flatten+deny_unknown_fields
|
||||
// bug where outer-struct fields bleed into the untagged enum variants and
|
||||
// fail all of them. Omitting "enabled" defaults to true.
|
||||
if s.URL != "" {
|
||||
e["url"] = s.URL
|
||||
} else {
|
||||
e["source"] = "custom"
|
||||
if s.Command != "" {
|
||||
e["command"] = s.Command
|
||||
}
|
||||
|
||||
@@ -89,8 +89,9 @@ func TestBuildMCPMapStyledZedStdio(t *testing.T) {
|
||||
r := reg(canonical.MCPServer{Name: "fp", Command: "/bin/fp", Args: []string{"-x"}})
|
||||
out := BuildMCPMapStyled(r, MCPZedStyle)
|
||||
e := out["fp"].(map[string]any)
|
||||
assert.Equal(t, true, e["enabled"])
|
||||
assert.Equal(t, "custom", e["source"])
|
||||
// Zed 1.3.x serde bug: "enabled" and "source" must NOT be present.
|
||||
assert.NotContains(t, e, "enabled")
|
||||
assert.NotContains(t, e, "source")
|
||||
assert.Equal(t, "/bin/fp", e["command"])
|
||||
assert.Equal(t, []string{"-x"}, e["args"])
|
||||
}
|
||||
@@ -99,7 +100,8 @@ func TestBuildMCPMapStyledZedURL(t *testing.T) {
|
||||
r := reg(canonical.MCPServer{Name: "r", URL: "https://example.com"})
|
||||
out := BuildMCPMapStyled(r, MCPZedStyle)
|
||||
e := out["r"].(map[string]any)
|
||||
assert.Equal(t, true, e["enabled"])
|
||||
// Zed 1.3.x serde bug: "enabled" must NOT be present.
|
||||
assert.NotContains(t, e, "enabled")
|
||||
assert.Equal(t, "https://example.com", e["url"])
|
||||
assert.NotContains(t, e, "source")
|
||||
}
|
||||
|
||||
@@ -6,8 +6,12 @@ type File struct {
|
||||
Dest string
|
||||
SymlinkTarget string
|
||||
Content []byte
|
||||
Mode os.FileMode
|
||||
Kind Kind
|
||||
Mode os.FileMode
|
||||
// NoMerge skips the 3-way git merge and always writes the rendered content.
|
||||
// Use for files the adapter partially manages via JSON/YAML merge (e.g. live
|
||||
// state files where the adapter already reconciles at the key level).
|
||||
NoMerge bool
|
||||
}
|
||||
|
||||
type FileSet struct {
|
||||
|
||||
@@ -19,44 +19,43 @@ import (
|
||||
const name = "cagent"
|
||||
|
||||
// Adapter implements adapter.Adapter for the cagent harness.
|
||||
type Adapter struct{ home string }
|
||||
|
||||
// Option configures an Adapter.
|
||||
type Option func(*Adapter)
|
||||
|
||||
// WithHome overrides the home directory (defaults to os.UserHomeDir).
|
||||
func WithHome(h string) Option { return func(a *Adapter) { a.home = h } }
|
||||
|
||||
// New returns a new Adapter with the given options applied.
|
||||
func New(opts ...Option) *Adapter {
|
||||
a := &Adapter{home: defaultHome()}
|
||||
for _, o := range opts {
|
||||
o(a)
|
||||
}
|
||||
return a
|
||||
type Adapter struct {
|
||||
*adapter.Base
|
||||
}
|
||||
|
||||
func defaultHome() string {
|
||||
h, err := os.UserHomeDir()
|
||||
if err != nil {
|
||||
return ""
|
||||
}
|
||||
return h
|
||||
// WithHome overrides the home directory used to resolve target paths.
|
||||
func WithHome(h string) adapter.BaseOption { return func(b *adapter.Base) { b.Home = h } }
|
||||
|
||||
// New returns a new Adapter with the given options applied.
|
||||
func New(opts ...adapter.BaseOption) *Adapter {
|
||||
return &Adapter{Base: adapter.NewBase(opts...)}
|
||||
}
|
||||
|
||||
// Name returns the harness identifier.
|
||||
func (a *Adapter) Name() string { return name }
|
||||
|
||||
// Capabilities declares what cagent harness-sync manages.
|
||||
func (a *Adapter) Capabilities() adapter.HarnessCapabilities {
|
||||
return adapter.HarnessCapabilities{
|
||||
ManagesProviders: true,
|
||||
ManagesModels: true,
|
||||
ManagesMCP: true,
|
||||
ManagesSkills: false,
|
||||
ManagesInstructions: true,
|
||||
HasBuiltInSub: false,
|
||||
}
|
||||
}
|
||||
|
||||
// Detect returns true when ~/.config/cagent/ exists.
|
||||
func (a *Adapter) Detect() bool {
|
||||
_, err := os.Stat(filepath.Join(a.home, ".config", "cagent"))
|
||||
_, err := os.Stat(filepath.Join(a.Home, ".config", "cagent"))
|
||||
return err == nil
|
||||
}
|
||||
|
||||
// Render produces a starter default.yaml for cagent.
|
||||
func (a *Adapter) Render(b *canonical.Bundle) (*adapter.FileSet, error) {
|
||||
fs := adapter.NewFileSet()
|
||||
cfgPath := filepath.Join(a.home, ".config", "cagent", "default.yaml")
|
||||
cfgPath := filepath.Join(a.Home, ".config", "cagent", "default.yaml")
|
||||
|
||||
instructions := b.Instructions.Global
|
||||
if override, ok := b.Instructions.PerHarness[name]; ok && override != "" {
|
||||
@@ -77,11 +76,9 @@ func (a *Adapter) Render(b *canonical.Bundle) (*adapter.FileSet, error) {
|
||||
mcps[s.Name] = e
|
||||
}
|
||||
|
||||
provKey := common.GatewayProviderKey(b.Profile.Gateway.URL)
|
||||
// inline model shorthand: "providerID/modelID"
|
||||
modelRef := ""
|
||||
if b.Profile.Gateway.DefaultModel != "" {
|
||||
modelRef = "harness-sync-gateway/" + b.Profile.Gateway.DefaultModel
|
||||
}
|
||||
modelRef := common.KiloModelString(&b.Profile)
|
||||
|
||||
cfg := map[string]any{
|
||||
"version": 8,
|
||||
@@ -96,8 +93,8 @@ func (a *Adapter) Render(b *canonical.Bundle) (*adapter.FileSet, error) {
|
||||
},
|
||||
"providers": common.ProvidersAsCagentMap(&b.Profile),
|
||||
"models": map[string]any{
|
||||
"harness-sync-gateway": map[string]any{
|
||||
"provider": "harness-sync-gateway",
|
||||
provKey: map[string]any{
|
||||
"provider": provKey,
|
||||
"model": b.Profile.Gateway.DefaultModel,
|
||||
},
|
||||
},
|
||||
|
||||
@@ -48,20 +48,20 @@ func TestCagentRenderProducesExpectedTargets(t *testing.T) {
|
||||
|
||||
agents := parsed["agents"].(map[string]any)
|
||||
def := agents["default"].(map[string]any)
|
||||
assert.Equal(t, "harness-sync-gateway/claude-sonnet-4-6", def["model"])
|
||||
assert.Equal(t, "hs-gw/claude-sonnet-4-6", def["model"])
|
||||
assert.Contains(t, def["instruction"], "# global instruction")
|
||||
|
||||
// providers map (new schema).
|
||||
providers := parsed["providers"].(map[string]any)
|
||||
gwProv := providers["harness-sync-gateway"].(map[string]any)
|
||||
gwProv := providers["hs-gw"].(map[string]any)
|
||||
assert.Equal(t, "https://gw", gwProv["base_url"])
|
||||
assert.Equal(t, "HARNESS_SYNC_GATEWAY_TOKEN", gwProv["token_key"])
|
||||
assert.Equal(t, "openai", gwProv["provider"])
|
||||
assert.NotContains(t, gwProv, "token_key")
|
||||
|
||||
// models map.
|
||||
models := parsed["models"].(map[string]any)
|
||||
gw := models["harness-sync-gateway"].(map[string]any)
|
||||
assert.Equal(t, "harness-sync-gateway", gw["provider"])
|
||||
gw := models["hs-gw"].(map[string]any)
|
||||
assert.Equal(t, "hs-gw", gw["provider"])
|
||||
assert.Equal(t, "claude-sonnet-4-6", gw["model"])
|
||||
|
||||
mcps := parsed["mcps"].(map[string]any)
|
||||
@@ -93,16 +93,17 @@ func TestCagentRenderProvidersAndModelsMaps(t *testing.T) {
|
||||
// providers block present.
|
||||
providers, ok := parsed["providers"].(map[string]any)
|
||||
require.True(t, ok, "providers must be a map")
|
||||
gw, ok := providers["harness-sync-gateway"].(map[string]any)
|
||||
gw, ok := providers["hs-gw"].(map[string]any)
|
||||
require.True(t, ok)
|
||||
assert.Equal(t, "https://gw", gw["base_url"])
|
||||
assert.Equal(t, "HARNESS_SYNC_GATEWAY_TOKEN", gw["token_key"])
|
||||
assert.Equal(t, "tok", gw["api_key"])
|
||||
assert.Equal(t, "openai", gw["provider"])
|
||||
assert.NotContains(t, gw, "token_key")
|
||||
|
||||
// agents.default.model uses inline shorthand.
|
||||
agents := parsed["agents"].(map[string]any)
|
||||
def := agents["default"].(map[string]any)
|
||||
assert.Equal(t, "harness-sync-gateway/claude-sonnet-4-6", def["model"])
|
||||
assert.Equal(t, "hs-gw/claude-sonnet-4-6", def["model"])
|
||||
}
|
||||
|
||||
func TestCagentRenderNoMCP(t *testing.T) {
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
package claudecode
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
||||
@@ -14,48 +15,45 @@ const name = "claude-code"
|
||||
|
||||
// Adapter implements adapter.Adapter for the claude-code harness.
|
||||
type Adapter struct {
|
||||
home string
|
||||
*adapter.Base
|
||||
}
|
||||
|
||||
// Option configures an Adapter.
|
||||
type Option func(*Adapter)
|
||||
|
||||
// WithHome overrides the home directory (defaults to os.UserHomeDir).
|
||||
func WithHome(h string) Option { return func(a *Adapter) { a.home = h } }
|
||||
// WithHome overrides the home directory used to resolve target paths.
|
||||
func WithHome(h string) adapter.BaseOption { return func(b *adapter.Base) { b.Home = h } }
|
||||
|
||||
// New returns a new Adapter with the given options applied.
|
||||
func New(opts ...Option) *Adapter {
|
||||
a := &Adapter{home: defaultHome()}
|
||||
for _, o := range opts {
|
||||
o(a)
|
||||
}
|
||||
return a
|
||||
}
|
||||
|
||||
func defaultHome() string {
|
||||
h, err := os.UserHomeDir()
|
||||
if err != nil {
|
||||
return ""
|
||||
}
|
||||
return h
|
||||
func New(opts ...adapter.BaseOption) *Adapter {
|
||||
return &Adapter{Base: adapter.NewBase(opts...)}
|
||||
}
|
||||
|
||||
// Name returns the harness identifier.
|
||||
func (a *Adapter) Name() string { return name }
|
||||
|
||||
// Capabilities declares what claude-code harness-sync manages.
|
||||
// Claude Code has its own Anthropic Max subscription — provider/model config is skipped.
|
||||
func (a *Adapter) Capabilities() adapter.HarnessCapabilities {
|
||||
return adapter.HarnessCapabilities{
|
||||
ManagesProviders: false,
|
||||
ManagesModels: false,
|
||||
ManagesMCP: true,
|
||||
ManagesSkills: true,
|
||||
ManagesInstructions: true,
|
||||
HasBuiltInSub: true,
|
||||
}
|
||||
}
|
||||
|
||||
// Detect returns true when ~/.claude exists.
|
||||
func (a *Adapter) Detect() bool {
|
||||
_, err := os.Stat(filepath.Join(a.home, ".claude"))
|
||||
_, err := os.Stat(filepath.Join(a.Home, ".claude"))
|
||||
return err == nil
|
||||
}
|
||||
|
||||
// Render produces the FileSet that applies the canonical bundle to claude-code.
|
||||
// settings.json is MERGED into any existing file so user-managed keys
|
||||
// settings.json is MERGED into any existing file so user-managed keys
|
||||
// (hooks, permissions, env, …) are preserved.
|
||||
// Claude Code manages its own subscription and settings.json — harness-sync
|
||||
// only manages skills/agents symlinks, CLAUDE.md, and MCP servers.
|
||||
func (a *Adapter) Render(b *canonical.Bundle) (*adapter.FileSet, error) {
|
||||
fs := adapter.NewFileSet()
|
||||
base := filepath.Join(a.home, ".claude")
|
||||
base := filepath.Join(a.Home, ".claude")
|
||||
|
||||
fs.Add(adapter.File{
|
||||
Dest: filepath.Join(base, "skills"),
|
||||
@@ -78,29 +76,6 @@ func (a *Adapter) Render(b *canonical.Bundle) (*adapter.FileSet, error) {
|
||||
Content: []byte(instructions),
|
||||
})
|
||||
|
||||
// settings.json holds the gateway env vars + model override.
|
||||
// Only emit when a gateway URL is configured.
|
||||
if b.Profile.Gateway.URL != "" {
|
||||
settingsPath := filepath.Join(base, "settings.json")
|
||||
settingsExisting, _ := os.ReadFile(settingsPath)
|
||||
settingsOverlay := map[string]any{
|
||||
"model": b.Profile.Gateway.DefaultModel,
|
||||
"env": map[string]any{
|
||||
"ANTHROPIC_BASE_URL": b.Profile.Gateway.URL,
|
||||
"ANTHROPIC_AUTH_TOKEN": b.Profile.Gateway.Token,
|
||||
},
|
||||
}
|
||||
settingsMerged, err := common.MergeJSONKeys(settingsExisting, settingsOverlay)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
fs.Add(adapter.File{
|
||||
Dest: settingsPath,
|
||||
Kind: adapter.RenderedFile,
|
||||
Content: settingsMerged,
|
||||
})
|
||||
}
|
||||
|
||||
// Claude Code reads MCP servers from two files on disk:
|
||||
// * ~/.claude.json (live, written by `claude mcp add`)
|
||||
// * ~/.claude/mcp_servers.json (older / fallback location)
|
||||
@@ -111,7 +86,10 @@ func (a *Adapter) Render(b *canonical.Bundle) (*adapter.FileSet, error) {
|
||||
overlay := map[string]any{"mcpServers": mcpMap}
|
||||
|
||||
dedicatedPath := filepath.Join(base, "mcp_servers.json")
|
||||
dedicatedExisting, _ := os.ReadFile(dedicatedPath)
|
||||
dedicatedExisting, err := common.ReadExistingFile(dedicatedPath)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("read %s: %w", dedicatedPath, err)
|
||||
}
|
||||
dedicatedMerged, err := common.MergeJSONKeys(dedicatedExisting, overlay)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -122,9 +100,12 @@ func (a *Adapter) Render(b *canonical.Bundle) (*adapter.FileSet, error) {
|
||||
Content: dedicatedMerged,
|
||||
})
|
||||
|
||||
livePath := filepath.Join(a.home, ".claude.json")
|
||||
livePath := filepath.Join(a.Home, ".claude.json")
|
||||
if _, err := os.Stat(livePath); err == nil {
|
||||
liveExisting, _ := os.ReadFile(livePath)
|
||||
liveExisting, err := common.ReadExistingFile(livePath)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("read %s: %w", livePath, err)
|
||||
}
|
||||
liveMerged, err := common.MergeJSONKeys(liveExisting, overlay)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -133,6 +114,10 @@ func (a *Adapter) Render(b *canonical.Bundle) (*adapter.FileSet, error) {
|
||||
Dest: livePath,
|
||||
Kind: adapter.RenderedFile,
|
||||
Content: liveMerged,
|
||||
// NoMerge: .claude.json is a live state file (Claude Code rewrites it
|
||||
// constantly). The JSON merge above already reconciles at the key level;
|
||||
// a git 3-way merge on top causes perpetual conflicts.
|
||||
NoMerge: true,
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -94,7 +94,9 @@ func TestRenderMergesLiveClaudeJSON(t *testing.T) {
|
||||
assert.Equal(t, "stdio", fp["type"])
|
||||
}
|
||||
|
||||
func TestClaudeCodeRenderSetsAnthropicBaseURLInSettings(t *testing.T) {
|
||||
func TestClaudeCodeRenderNeverWritesSettings(t *testing.T) {
|
||||
// Claude Code uses its own Anthropic Max subscription.
|
||||
// harness-sync must NEVER write settings.json even when a gateway is configured.
|
||||
home := t.TempDir()
|
||||
ad := New(WithHome(home))
|
||||
b := &canonical.Bundle{
|
||||
@@ -113,16 +115,7 @@ func TestClaudeCodeRenderSetsAnthropicBaseURLInSettings(t *testing.T) {
|
||||
fs.ForEach(func(f adapter.File) { seen[f.Dest] = f })
|
||||
|
||||
settingsDest := filepath.Join(home, ".claude", "settings.json")
|
||||
require.Contains(t, seen, settingsDest)
|
||||
assert.Equal(t, adapter.RenderedFile, seen[settingsDest].Kind)
|
||||
|
||||
var parsed map[string]any
|
||||
require.NoError(t, json.Unmarshal(seen[settingsDest].Content, &parsed))
|
||||
assert.Equal(t, "claude-sonnet-4-6", parsed["model"])
|
||||
env, ok := parsed["env"].(map[string]any)
|
||||
require.True(t, ok, "env must be a map")
|
||||
assert.Equal(t, "https://gw", env["ANTHROPIC_BASE_URL"])
|
||||
assert.Equal(t, "tok", env["ANTHROPIC_AUTH_TOKEN"])
|
||||
assert.NotContains(t, seen, settingsDest, "settings.json must never be written — claude-code has its own subscription")
|
||||
}
|
||||
|
||||
func TestClaudeCodeRenderNoGatewayNoSettings(t *testing.T) {
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
package crush
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
||||
@@ -13,37 +14,36 @@ import (
|
||||
const name = "crush"
|
||||
|
||||
// Adapter implements adapter.Adapter for the crush harness.
|
||||
type Adapter struct{ home string }
|
||||
|
||||
// Option configures an Adapter.
|
||||
type Option func(*Adapter)
|
||||
|
||||
// WithHome overrides the home directory (defaults to os.UserHomeDir).
|
||||
func WithHome(h string) Option { return func(a *Adapter) { a.home = h } }
|
||||
|
||||
// New returns a new Adapter with the given options applied.
|
||||
func New(opts ...Option) *Adapter {
|
||||
a := &Adapter{home: defaultHome()}
|
||||
for _, o := range opts {
|
||||
o(a)
|
||||
}
|
||||
return a
|
||||
type Adapter struct {
|
||||
*adapter.Base
|
||||
}
|
||||
|
||||
func defaultHome() string {
|
||||
h, err := os.UserHomeDir()
|
||||
if err != nil {
|
||||
return ""
|
||||
}
|
||||
return h
|
||||
// WithHome overrides the home directory used to resolve target paths.
|
||||
func WithHome(h string) adapter.BaseOption { return func(b *adapter.Base) { b.Home = h } }
|
||||
|
||||
// New returns a new Adapter with the given options applied.
|
||||
func New(opts ...adapter.BaseOption) *Adapter {
|
||||
return &Adapter{Base: adapter.NewBase(opts...)}
|
||||
}
|
||||
|
||||
// Name returns the harness identifier.
|
||||
func (a *Adapter) Name() string { return name }
|
||||
|
||||
// Capabilities declares what crush harness-sync manages.
|
||||
func (a *Adapter) Capabilities() adapter.HarnessCapabilities {
|
||||
return adapter.HarnessCapabilities{
|
||||
ManagesProviders: true,
|
||||
ManagesModels: true,
|
||||
ManagesMCP: true,
|
||||
ManagesSkills: true,
|
||||
ManagesInstructions: false,
|
||||
HasBuiltInSub: false,
|
||||
}
|
||||
}
|
||||
|
||||
// Detect returns true when ~/.config/crush exists.
|
||||
func (a *Adapter) Detect() bool {
|
||||
_, err := os.Stat(filepath.Join(a.home, ".config", "crush"))
|
||||
_, err := os.Stat(filepath.Join(a.Home, ".config", "crush"))
|
||||
return err == nil
|
||||
}
|
||||
|
||||
@@ -52,7 +52,7 @@ func (a *Adapter) Detect() bool {
|
||||
// MCP key is "mcp" (not "mcpServers"); entries include a "type" field.
|
||||
func (a *Adapter) Render(b *canonical.Bundle) (*adapter.FileSet, error) {
|
||||
fs := adapter.NewFileSet()
|
||||
base := filepath.Join(a.home, ".config", "crush")
|
||||
base := filepath.Join(a.Home, ".config", "crush")
|
||||
|
||||
fs.Add(adapter.File{
|
||||
Dest: filepath.Join(base, "skills"),
|
||||
@@ -61,7 +61,10 @@ func (a *Adapter) Render(b *canonical.Bundle) (*adapter.FileSet, error) {
|
||||
})
|
||||
|
||||
cfgPath := filepath.Join(base, "crush.json")
|
||||
existing, _ := os.ReadFile(cfgPath)
|
||||
existing, err := common.ReadExistingFile(cfgPath)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("read %s: %w", cfgPath, err)
|
||||
}
|
||||
overlay := map[string]any{}
|
||||
if providers := common.ProvidersAsCrushMap(&b.Profile); len(providers) > 0 {
|
||||
overlay["providers"] = providers
|
||||
@@ -69,6 +72,7 @@ func (a *Adapter) Render(b *canonical.Bundle) (*adapter.FileSet, error) {
|
||||
if roleModels := common.CrushRoleModels(&b.Profile); len(roleModels) > 0 {
|
||||
overlay["models"] = roleModels
|
||||
}
|
||||
overlay["default_model"] = b.Profile.Gateway.DefaultModel
|
||||
if mcp := common.BuildMCPMapStyled(&b.MCP, common.MCPCrushStyle); len(mcp) > 0 {
|
||||
overlay["mcp"] = mcp
|
||||
}
|
||||
|
||||
@@ -44,8 +44,8 @@ func TestCrushRenderProducesExpectedTargets(t *testing.T) {
|
||||
// providers must be a map (not array), keyed by providerID.
|
||||
providers, ok := parsed["providers"].(map[string]any)
|
||||
require.True(t, ok, "providers must be a map")
|
||||
gw, ok := providers["harness-sync-gateway"].(map[string]any)
|
||||
require.True(t, ok, "harness-sync-gateway provider missing")
|
||||
gw, ok := providers["hs-gw"].(map[string]any)
|
||||
require.True(t, ok, "hs-gw provider missing")
|
||||
assert.Equal(t, "openai-compat", gw["type"])
|
||||
// models must be role-map with large/small/title.
|
||||
models, ok := parsed["models"].(map[string]any)
|
||||
@@ -53,8 +53,8 @@ func TestCrushRenderProducesExpectedTargets(t *testing.T) {
|
||||
assert.Contains(t, models, "large")
|
||||
assert.Contains(t, models, "small")
|
||||
assert.Contains(t, models, "title")
|
||||
// Must NOT write "default_model" or "mcpServers".
|
||||
assert.NotContains(t, parsed, "default_model")
|
||||
// Must write "default_model" (prevents Bedrock fallback) but NOT "mcpServers".
|
||||
assert.Contains(t, parsed, "default_model")
|
||||
assert.NotContains(t, parsed, "mcpServers")
|
||||
}
|
||||
|
||||
@@ -137,7 +137,7 @@ func TestCrushRenderProducesMapProvidersAndRoleModels(t *testing.T) {
|
||||
// providers is a map, not an array.
|
||||
providers, ok := parsed["providers"].(map[string]any)
|
||||
require.True(t, ok, "providers must be a map")
|
||||
gw, ok := providers["harness-sync-gateway"].(map[string]any)
|
||||
gw, ok := providers["hs-gw"].(map[string]any)
|
||||
require.True(t, ok)
|
||||
assert.Equal(t, "openai-compat", gw["type"])
|
||||
assert.Equal(t, "https://gw", gw["base_url"])
|
||||
@@ -160,7 +160,7 @@ func TestCrushRenderProducesMapProvidersAndRoleModels(t *testing.T) {
|
||||
sel, ok := roleModels[role].(map[string]any)
|
||||
require.True(t, ok, "role %s missing", role)
|
||||
assert.Equal(t, "claude-sonnet-4-6", sel["model"])
|
||||
assert.Equal(t, "harness-sync-gateway", sel["provider"])
|
||||
assert.Equal(t, "hs-gw", sel["provider"])
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
package goose
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
@@ -22,37 +23,36 @@ import (
|
||||
const name = "goose"
|
||||
|
||||
// Adapter implements adapter.Adapter for the Goose harness.
|
||||
type Adapter struct{ home string }
|
||||
|
||||
// Option configures an Adapter.
|
||||
type Option func(*Adapter)
|
||||
|
||||
// WithHome overrides the home directory (defaults to os.UserHomeDir).
|
||||
func WithHome(h string) Option { return func(a *Adapter) { a.home = h } }
|
||||
|
||||
// New returns a new Adapter with the given options applied.
|
||||
func New(opts ...Option) *Adapter {
|
||||
a := &Adapter{home: defaultHome()}
|
||||
for _, o := range opts {
|
||||
o(a)
|
||||
}
|
||||
return a
|
||||
type Adapter struct {
|
||||
*adapter.Base
|
||||
}
|
||||
|
||||
func defaultHome() string {
|
||||
h, err := os.UserHomeDir()
|
||||
if err != nil {
|
||||
return ""
|
||||
}
|
||||
return h
|
||||
// WithHome overrides the home directory used to resolve target paths.
|
||||
func WithHome(h string) adapter.BaseOption { return func(b *adapter.Base) { b.Home = h } }
|
||||
|
||||
// New returns a new Adapter with the given options applied.
|
||||
func New(opts ...adapter.BaseOption) *Adapter {
|
||||
return &Adapter{Base: adapter.NewBase(opts...)}
|
||||
}
|
||||
|
||||
// Name returns the harness identifier.
|
||||
func (a *Adapter) Name() string { return name }
|
||||
|
||||
// Capabilities declares what goose harness-sync manages.
|
||||
func (a *Adapter) Capabilities() adapter.HarnessCapabilities {
|
||||
return adapter.HarnessCapabilities{
|
||||
ManagesProviders: true,
|
||||
ManagesModels: true,
|
||||
ManagesMCP: true,
|
||||
ManagesSkills: true,
|
||||
ManagesInstructions: false,
|
||||
HasBuiltInSub: false,
|
||||
}
|
||||
}
|
||||
|
||||
// Detect returns true when ~/.config/goose/ exists.
|
||||
func (a *Adapter) Detect() bool {
|
||||
_, err := os.Stat(filepath.Join(a.home, ".config", "goose"))
|
||||
_, err := os.Stat(filepath.Join(a.Home, ".config", "goose"))
|
||||
return err == nil
|
||||
}
|
||||
|
||||
@@ -63,16 +63,26 @@ func (a *Adapter) Detect() bool {
|
||||
// also added to the FileSet so goose can load the provider on first run.
|
||||
func (a *Adapter) Render(b *canonical.Bundle) (*adapter.FileSet, error) {
|
||||
fs := adapter.NewFileSet()
|
||||
cfgPath := filepath.Join(a.home, ".config", "goose", "config.yaml")
|
||||
cfgPath := filepath.Join(a.Home, ".config", "goose", "config.yaml")
|
||||
|
||||
existing, _ := os.ReadFile(cfgPath)
|
||||
// goose reads skills from ~/.agents/skills/<name>/SKILL.md (open Agent Skills spec)
|
||||
fs.Add(adapter.File{
|
||||
Dest: filepath.Join(a.Home, ".agents", "skills"),
|
||||
Kind: adapter.SymlinkDir,
|
||||
SymlinkTarget: filepath.Join(b.Root, "skills"),
|
||||
})
|
||||
|
||||
existing, err := common.ReadExistingFile(cfgPath)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("read %s: %w", cfgPath, err)
|
||||
}
|
||||
|
||||
provider, model := splitProviderModel(b.Profile.Gateway.DefaultModel)
|
||||
if b.Profile.Gateway.URL != "" {
|
||||
// Emit the custom provider JSON file.
|
||||
body, providerName := common.GooseCustomProviderFile(&b.Profile)
|
||||
if body != nil {
|
||||
cpDir := filepath.Join(a.home, ".config", "goose", "custom_providers")
|
||||
cpDir := filepath.Join(a.Home, ".config", "goose", "custom_providers")
|
||||
fs.Add(adapter.File{
|
||||
Dest: filepath.Join(cpDir, providerName+".json"),
|
||||
Kind: adapter.RenderedFile,
|
||||
@@ -133,8 +143,8 @@ func buildExtensions(servers []canonical.MCPServer) map[string]any {
|
||||
// splitProviderModel splits "provider/model" into its parts.
|
||||
// If no slash, provider is "anthropic" and the whole string is the model.
|
||||
func splitProviderModel(s string) (string, string) {
|
||||
if idx := strings.IndexByte(s, '/'); idx >= 0 {
|
||||
return s[:idx], s[idx+1:]
|
||||
if p, m, ok := strings.Cut(s, "/"); ok {
|
||||
return p, m
|
||||
}
|
||||
return "anthropic", s
|
||||
}
|
||||
|
||||
@@ -91,7 +91,7 @@ func TestGooseRenderGatewayURL(t *testing.T) {
|
||||
var parsed map[string]any
|
||||
require.NoError(t, yaml.Unmarshal(seen[cfgDest].Content, &parsed))
|
||||
// Custom gateway → GOOSE_PROVIDER is the custom provider name.
|
||||
assert.Equal(t, "custom_harness-sync-gateway", parsed["GOOSE_PROVIDER"])
|
||||
assert.Equal(t, "custom_hs-gw", parsed["GOOSE_PROVIDER"])
|
||||
}
|
||||
|
||||
func TestGooseRenderProducesCustomProviderFile(t *testing.T) {
|
||||
@@ -109,16 +109,17 @@ func TestGooseRenderProducesCustomProviderFile(t *testing.T) {
|
||||
seen := map[string]adapter.File{}
|
||||
fs.ForEach(func(f adapter.File) { seen[f.Dest] = f })
|
||||
|
||||
cpDest := filepath.Join(home, ".config", "goose", "custom_providers", "custom_harness-sync-gateway.json")
|
||||
cpDest := filepath.Join(home, ".config", "goose", "custom_providers", "custom_hs-gw.json")
|
||||
require.Contains(t, seen, cpDest)
|
||||
assert.Equal(t, adapter.RenderedFile, seen[cpDest].Kind)
|
||||
|
||||
var cp map[string]any
|
||||
require.NoError(t, json.Unmarshal(seen[cpDest].Content, &cp))
|
||||
assert.Equal(t, "custom_harness-sync-gateway", cp["name"])
|
||||
assert.Equal(t, "custom_hs-gw", cp["name"])
|
||||
assert.Equal(t, "openai", cp["engine"])
|
||||
assert.Equal(t, true, cp["requires_auth"])
|
||||
assert.Equal(t, "CUSTOM_HARNESS_SYNC_GATEWAY_API_KEY", cp["api_key_env"])
|
||||
assert.Equal(t, "tok", cp["api_key"])
|
||||
assert.NotContains(t, cp, "api_key_env")
|
||||
assert.NotContains(t, cp, "requires_auth")
|
||||
models, ok := cp["models"].([]any)
|
||||
require.True(t, ok)
|
||||
require.Len(t, models, 1)
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
package kilo
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"maps"
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
||||
@@ -14,38 +17,35 @@ const name = "kilo"
|
||||
|
||||
// Adapter implements adapter.Adapter for the kilo harness.
|
||||
type Adapter struct {
|
||||
home string
|
||||
*adapter.Base
|
||||
}
|
||||
|
||||
// Option configures an Adapter.
|
||||
type Option func(*Adapter)
|
||||
|
||||
// WithHome overrides the home directory (defaults to os.UserHomeDir).
|
||||
func WithHome(h string) Option { return func(a *Adapter) { a.home = h } }
|
||||
// WithHome overrides the home directory used to resolve target paths.
|
||||
func WithHome(h string) adapter.BaseOption { return func(b *adapter.Base) { b.Home = h } }
|
||||
|
||||
// New returns a new Adapter with the given options applied.
|
||||
func New(opts ...Option) *Adapter {
|
||||
a := &Adapter{home: defaultHome()}
|
||||
for _, o := range opts {
|
||||
o(a)
|
||||
}
|
||||
return a
|
||||
}
|
||||
|
||||
func defaultHome() string {
|
||||
h, err := os.UserHomeDir()
|
||||
if err != nil {
|
||||
return ""
|
||||
}
|
||||
return h
|
||||
func New(opts ...adapter.BaseOption) *Adapter {
|
||||
return &Adapter{Base: adapter.NewBase(opts...)}
|
||||
}
|
||||
|
||||
// Name returns the harness identifier.
|
||||
func (a *Adapter) Name() string { return name }
|
||||
|
||||
// Capabilities declares what kilo harness-sync manages.
|
||||
func (a *Adapter) Capabilities() adapter.HarnessCapabilities {
|
||||
return adapter.HarnessCapabilities{
|
||||
ManagesProviders: true,
|
||||
ManagesModels: true,
|
||||
ManagesMCP: true,
|
||||
ManagesSkills: true,
|
||||
ManagesInstructions: false,
|
||||
HasBuiltInSub: false,
|
||||
}
|
||||
}
|
||||
|
||||
// Detect returns true when ~/.config/kilo exists.
|
||||
func (a *Adapter) Detect() bool {
|
||||
_, err := os.Stat(filepath.Join(a.home, ".config", "kilo"))
|
||||
_, err := os.Stat(filepath.Join(a.Home, ".config", "kilo"))
|
||||
return err == nil
|
||||
}
|
||||
|
||||
@@ -56,16 +56,25 @@ func (a *Adapter) Detect() bool {
|
||||
// No "providers" key — kilo has no such concept.
|
||||
func (a *Adapter) Render(b *canonical.Bundle) (*adapter.FileSet, error) {
|
||||
fs := adapter.NewFileSet()
|
||||
base := filepath.Join(a.home, ".config", "kilo")
|
||||
base := filepath.Join(a.Home, ".config", "kilo")
|
||||
|
||||
fs.Add(adapter.File{
|
||||
Dest: filepath.Join(base, "agent"),
|
||||
Kind: adapter.SymlinkDir,
|
||||
SymlinkTarget: filepath.Join(b.Root, "agents"),
|
||||
})
|
||||
// kilo reads skills from ~/.kilo/skills/<name>/SKILL.md
|
||||
fs.Add(adapter.File{
|
||||
Dest: filepath.Join(a.Home, ".kilo", "skills"),
|
||||
Kind: adapter.SymlinkDir,
|
||||
SymlinkTarget: filepath.Join(b.Root, "skills"),
|
||||
})
|
||||
|
||||
cfgPath := filepath.Join(base, "kilo.json")
|
||||
existing, _ := os.ReadFile(cfgPath)
|
||||
existing, err := common.ReadExistingFile(cfgPath)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("read %s: %w", cfgPath, err)
|
||||
}
|
||||
modelStr := common.KiloModelString(&b.Profile)
|
||||
overlay := map[string]any{}
|
||||
if providers := common.ProvidersAsMap(&b.Profile); len(providers) > 0 {
|
||||
@@ -88,9 +97,59 @@ func (a *Adapter) Render(b *canonical.Bundle) (*adapter.FileSet, error) {
|
||||
Content: merged,
|
||||
})
|
||||
|
||||
// Also merge into opencode.jsonc when present — kilo reads it as its
|
||||
// primary config. Delete the enabled_providers filter so our provider is
|
||||
// visible alongside user-defined providers.
|
||||
ocPath := filepath.Join(base, "opencode.jsonc")
|
||||
if ocContent, mergeErr := mergeOpenCodeJSONC(ocPath, overlay, b.Profile.Gateway.URL); mergeErr != nil {
|
||||
return nil, mergeErr
|
||||
} else if ocContent != nil {
|
||||
fs.Add(adapter.File{
|
||||
Dest: ocPath,
|
||||
Kind: adapter.RenderedFile,
|
||||
Content: ocContent,
|
||||
NoMerge: true,
|
||||
})
|
||||
}
|
||||
|
||||
return fs, nil
|
||||
}
|
||||
|
||||
// mergeOpenCodeJSONC deep-merges our overlay into the existing opencode.jsonc
|
||||
// file, deleting the enabled_providers filter and deduplicating gateway providers.
|
||||
// Returns nil content (no error) when the file does not exist.
|
||||
func mergeOpenCodeJSONC(path string, overlay map[string]any, gatewayURL string) ([]byte, error) {
|
||||
ocRaw, err := os.ReadFile(path)
|
||||
if err != nil {
|
||||
return nil, nil //nolint:nilerr // file absent is not an error
|
||||
}
|
||||
|
||||
var ocBase map[string]any
|
||||
clean := common.StripJSONComments(string(ocRaw))
|
||||
_ = json.Unmarshal([]byte(clean), &ocBase)
|
||||
if ocBase == nil {
|
||||
ocBase = map[string]any{}
|
||||
}
|
||||
|
||||
ocOverlay := map[string]any{"enabled_providers": nil}
|
||||
|
||||
if newProv, ok := overlay["provider"].(map[string]any); ok && len(newProv) > 0 {
|
||||
existingProv, _ := ocBase["provider"].(map[string]any)
|
||||
if existingProv == nil {
|
||||
existingProv = map[string]any{}
|
||||
}
|
||||
maps.Copy(existingProv, newProv)
|
||||
ocOverlay["provider"] = common.AbsorbDuplicateProviders(existingProv, common.GatewayProviderKey(gatewayURL), gatewayURL)
|
||||
}
|
||||
for _, k := range []string{"model", "small_model", "mcp"} {
|
||||
if v, ok := overlay[k]; ok {
|
||||
ocOverlay[k] = v
|
||||
}
|
||||
}
|
||||
|
||||
return common.MergeJSONKeys([]byte(clean), ocOverlay)
|
||||
}
|
||||
|
||||
// Import reads kilo config from home and returns a canonical ImportResult.
|
||||
func (a *Adapter) Import(home string) (*adapter.ImportResult, error) {
|
||||
return importFrom(home)
|
||||
|
||||
@@ -43,12 +43,12 @@ func TestKiloRender(t *testing.T) {
|
||||
var parsed map[string]any
|
||||
require.NoError(t, json.Unmarshal(seen[cfgDest].Content, &parsed))
|
||||
// model is "providerID/modelID" string.
|
||||
assert.Equal(t, "harness-sync-gateway/sonnet", parsed["model"])
|
||||
assert.Equal(t, "harness-sync-gateway/sonnet", parsed["small_model"])
|
||||
assert.Equal(t, "hs-gw/sonnet", parsed["model"])
|
||||
assert.Equal(t, "hs-gw/sonnet", parsed["small_model"])
|
||||
// provider map present with npm field.
|
||||
provider, ok := parsed["provider"].(map[string]any)
|
||||
require.True(t, ok, "provider must be a map")
|
||||
gw, ok := provider["harness-sync-gateway"].(map[string]any)
|
||||
gw, ok := provider["hs-gw"].(map[string]any)
|
||||
require.True(t, ok)
|
||||
assert.Equal(t, "@ai-sdk/openai-compatible", gw["npm"])
|
||||
assert.Contains(t, parsed, "mcp")
|
||||
@@ -113,14 +113,14 @@ func TestKiloRenderEmitsModelString(t *testing.T) {
|
||||
var parsed map[string]any
|
||||
require.NoError(t, json.Unmarshal(seen[cfgDest].Content, &parsed))
|
||||
|
||||
// model must be "harness-sync-gateway/<modelID>".
|
||||
assert.Equal(t, "harness-sync-gateway/claude-sonnet-4-6", parsed["model"])
|
||||
assert.Equal(t, "harness-sync-gateway/claude-sonnet-4-6", parsed["small_model"])
|
||||
// model must be "hs-gw/<modelID>".
|
||||
assert.Equal(t, "hs-gw/claude-sonnet-4-6", parsed["model"])
|
||||
assert.Equal(t, "hs-gw/claude-sonnet-4-6", parsed["small_model"])
|
||||
|
||||
// provider map has npm field.
|
||||
provider, ok := parsed["provider"].(map[string]any)
|
||||
require.True(t, ok)
|
||||
gw, ok := provider["harness-sync-gateway"].(map[string]any)
|
||||
gw, ok := provider["hs-gw"].(map[string]any)
|
||||
require.True(t, ok)
|
||||
assert.Equal(t, "@ai-sdk/openai-compatible", gw["npm"])
|
||||
opts, ok := gw["options"].(map[string]any)
|
||||
@@ -128,6 +128,48 @@ func TestKiloRenderEmitsModelString(t *testing.T) {
|
||||
assert.Equal(t, "https://gw", opts["baseURL"])
|
||||
}
|
||||
|
||||
func TestKiloRenderMergesOpenCodeJSONC(t *testing.T) {
|
||||
home := t.TempDir()
|
||||
base := filepath.Join(home, ".config", "kilo")
|
||||
require.NoError(t, os.MkdirAll(base, 0o750))
|
||||
|
||||
// Existing opencode.jsonc with a filter and a different provider.
|
||||
existing := `{
|
||||
"enabled_providers": ["llmgw"],
|
||||
"provider": {
|
||||
"llmgw": {"npm": "@ai-sdk/openai-compatible", "options": {"baseURL": "https://old"}}
|
||||
},
|
||||
"model": "llmgw/old-model"
|
||||
}`
|
||||
require.NoError(t, os.WriteFile(filepath.Join(base, "opencode.jsonc"), []byte(existing), 0o600))
|
||||
|
||||
ad := New(WithHome(home))
|
||||
b := &canonical.Bundle{
|
||||
Profile: canonical.Profile{
|
||||
Gateway: canonical.Gateway{URL: "https://gw", Token: "dummy", DefaultModel: "sonnet"},
|
||||
Models: []canonical.Model{{ID: "claude-sonnet-4-6", Alias: "sonnet"}},
|
||||
},
|
||||
}
|
||||
fs, err := ad.Render(b)
|
||||
require.NoError(t, err)
|
||||
seen := map[string]adapter.File{}
|
||||
fs.ForEach(func(f adapter.File) { seen[f.Dest] = f })
|
||||
|
||||
ocDest := filepath.Join(base, "opencode.jsonc")
|
||||
require.Contains(t, seen, ocDest)
|
||||
|
||||
var parsed map[string]any
|
||||
require.NoError(t, json.Unmarshal(seen[ocDest].Content, &parsed))
|
||||
// enabled_providers deleted so our provider is visible.
|
||||
assert.NotContains(t, parsed, "enabled_providers")
|
||||
// llmgw preserved, harness-sync-gateway added.
|
||||
provider := parsed["provider"].(map[string]any)
|
||||
assert.Contains(t, provider, "llmgw")
|
||||
assert.Contains(t, provider, "hs-gw")
|
||||
// model updated.
|
||||
assert.Equal(t, "hs-gw/sonnet", parsed["model"])
|
||||
}
|
||||
|
||||
func TestKiloImport(t *testing.T) {
|
||||
home := t.TempDir()
|
||||
base := filepath.Join(home, ".config", "kilo")
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
package opencode
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
||||
@@ -13,37 +15,36 @@ import (
|
||||
const name = "opencode"
|
||||
|
||||
// Adapter implements adapter.Adapter for the opencode harness.
|
||||
type Adapter struct{ home string }
|
||||
|
||||
// Option configures an Adapter.
|
||||
type Option func(*Adapter)
|
||||
|
||||
// WithHome overrides the home directory (defaults to os.UserHomeDir).
|
||||
func WithHome(h string) Option { return func(a *Adapter) { a.home = h } }
|
||||
|
||||
// New returns a new Adapter with the given options applied.
|
||||
func New(opts ...Option) *Adapter {
|
||||
a := &Adapter{home: defaultHome()}
|
||||
for _, o := range opts {
|
||||
o(a)
|
||||
}
|
||||
return a
|
||||
type Adapter struct {
|
||||
*adapter.Base
|
||||
}
|
||||
|
||||
func defaultHome() string {
|
||||
h, err := os.UserHomeDir()
|
||||
if err != nil {
|
||||
return ""
|
||||
}
|
||||
return h
|
||||
// WithHome overrides the home directory used to resolve target paths.
|
||||
func WithHome(h string) adapter.BaseOption { return func(b *adapter.Base) { b.Home = h } }
|
||||
|
||||
// New returns a new Adapter with the given options applied.
|
||||
func New(opts ...adapter.BaseOption) *Adapter {
|
||||
return &Adapter{Base: adapter.NewBase(opts...)}
|
||||
}
|
||||
|
||||
// Name returns the harness identifier.
|
||||
func (a *Adapter) Name() string { return name }
|
||||
|
||||
// Capabilities declares what opencode harness-sync manages.
|
||||
func (a *Adapter) Capabilities() adapter.HarnessCapabilities {
|
||||
return adapter.HarnessCapabilities{
|
||||
ManagesProviders: true,
|
||||
ManagesModels: true,
|
||||
ManagesMCP: true,
|
||||
ManagesSkills: true,
|
||||
ManagesInstructions: true,
|
||||
HasBuiltInSub: false,
|
||||
}
|
||||
}
|
||||
|
||||
// Detect returns true when ~/.config/opencode exists.
|
||||
func (a *Adapter) Detect() bool {
|
||||
_, err := os.Stat(filepath.Join(a.home, ".config", "opencode"))
|
||||
_, err := os.Stat(filepath.Join(a.Home, ".config", "opencode"))
|
||||
return err == nil
|
||||
}
|
||||
|
||||
@@ -53,12 +54,41 @@ func (a *Adapter) Detect() bool {
|
||||
// "mcp" (map with type: local|remote entries).
|
||||
func (a *Adapter) Render(b *canonical.Bundle) (*adapter.FileSet, error) {
|
||||
fs := adapter.NewFileSet()
|
||||
base := filepath.Join(a.home, ".config", "opencode")
|
||||
base := filepath.Join(a.Home, ".config", "opencode")
|
||||
|
||||
// opencode reads skills from ~/.config/opencode/skills/<name>/SKILL.md
|
||||
fs.Add(adapter.File{
|
||||
Dest: filepath.Join(base, "skills"),
|
||||
Kind: adapter.SymlinkDir,
|
||||
SymlinkTarget: filepath.Join(b.Root, "skills"),
|
||||
})
|
||||
|
||||
cfgPath := filepath.Join(base, "opencode.jsonc")
|
||||
existing, _ := os.ReadFile(cfgPath)
|
||||
existing, err := common.ReadExistingFile(cfgPath)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("read %s: %w", cfgPath, err)
|
||||
}
|
||||
|
||||
// Build the provider map, then absorb any existing providers at the same
|
||||
// gateway URL so duplicates don't accumulate across apply runs.
|
||||
provMap := common.ProvidersAsMap(&b.Profile)
|
||||
if len(existing) > 0 {
|
||||
var base map[string]any
|
||||
clean := common.StripJSONComments(string(existing))
|
||||
if json.Unmarshal([]byte(clean), &base) == nil {
|
||||
if existingProv, ok := base["provider"].(map[string]any); ok {
|
||||
for k, v := range existingProv {
|
||||
if _, ours := provMap[k]; !ours {
|
||||
provMap[k] = v
|
||||
}
|
||||
}
|
||||
provMap = common.AbsorbDuplicateProviders(provMap, common.GatewayProviderKey(b.Profile.Gateway.URL), b.Profile.Gateway.URL)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
overlay := map[string]any{
|
||||
"provider": common.ProvidersAsMap(&b.Profile),
|
||||
"provider": provMap,
|
||||
"model": common.KiloModelString(&b.Profile),
|
||||
}
|
||||
if mcp := common.BuildMCPMapStyled(&b.MCP, common.MCPOpencodeStyle); len(mcp) > 0 {
|
||||
|
||||
@@ -129,15 +129,15 @@ func TestOpencodeRenderProviderHasNpm(t *testing.T) {
|
||||
// provider map has npm field.
|
||||
provider, ok := parsed["provider"].(map[string]any)
|
||||
require.True(t, ok)
|
||||
gw, ok := provider["harness-sync-gateway"].(map[string]any)
|
||||
gw, ok := provider["hs-gw"].(map[string]any)
|
||||
require.True(t, ok)
|
||||
assert.Equal(t, "@ai-sdk/openai-compatible", gw["npm"])
|
||||
opts, ok := gw["options"].(map[string]any)
|
||||
require.True(t, ok)
|
||||
assert.Equal(t, "https://gw", opts["baseURL"])
|
||||
|
||||
// model is "harness-sync-gateway/modelID".
|
||||
assert.Equal(t, "harness-sync-gateway/claude-sonnet-4-6", parsed["model"])
|
||||
// model is "hs-gw/modelID".
|
||||
assert.Equal(t, "hs-gw/claude-sonnet-4-6", parsed["model"])
|
||||
}
|
||||
|
||||
func TestOpencodeImportStripsComments(t *testing.T) {
|
||||
|
||||
+104
-50
@@ -1,14 +1,15 @@
|
||||
// Package zed is the Zed editor harness adapter.
|
||||
//
|
||||
// Zed uses ~/.config/zed/settings.json with many user-managed keys.
|
||||
// We MERGE only "agent" and "context_servers"; all other keys are preserved.
|
||||
// MCP servers become context_servers entries with source: "custom".
|
||||
// harness-sync manages: context_servers (MCP), language_models.openai, agent.default_model.
|
||||
// All other keys are preserved via JSON merge.
|
||||
package zed
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/lukaszraczylo/harness-sync/internal/adapter"
|
||||
"github.com/lukaszraczylo/harness-sync/internal/adapter/common"
|
||||
@@ -18,64 +19,68 @@ import (
|
||||
const name = "zed"
|
||||
|
||||
// Adapter implements adapter.Adapter for the Zed harness.
|
||||
type Adapter struct{ home string }
|
||||
|
||||
// Option configures an Adapter.
|
||||
type Option func(*Adapter)
|
||||
|
||||
// WithHome overrides the home directory (defaults to os.UserHomeDir).
|
||||
func WithHome(h string) Option { return func(a *Adapter) { a.home = h } }
|
||||
|
||||
// New returns a new Adapter with the given options applied.
|
||||
func New(opts ...Option) *Adapter {
|
||||
a := &Adapter{home: defaultHome()}
|
||||
for _, o := range opts {
|
||||
o(a)
|
||||
}
|
||||
return a
|
||||
type Adapter struct {
|
||||
*adapter.Base
|
||||
}
|
||||
|
||||
func defaultHome() string {
|
||||
h, err := os.UserHomeDir()
|
||||
if err != nil {
|
||||
return ""
|
||||
}
|
||||
return h
|
||||
// WithHome overrides the home directory used to resolve target paths.
|
||||
func WithHome(h string) adapter.BaseOption { return func(b *adapter.Base) { b.Home = h } }
|
||||
|
||||
// New returns a new Adapter with the given options applied.
|
||||
func New(opts ...adapter.BaseOption) *Adapter {
|
||||
return &Adapter{Base: adapter.NewBase(opts...)}
|
||||
}
|
||||
|
||||
// Name returns the harness identifier.
|
||||
func (a *Adapter) Name() string { return name }
|
||||
|
||||
// Capabilities declares what zed harness-sync manages.
|
||||
// Zed does not have a built-in subscription — it routes through the configured gateway.
|
||||
func (a *Adapter) Capabilities() adapter.HarnessCapabilities {
|
||||
return adapter.HarnessCapabilities{
|
||||
ManagesProviders: true,
|
||||
ManagesModels: true,
|
||||
ManagesMCP: false, // Agent panel uses Extensions; context_servers key causes serde parse errors
|
||||
ManagesSkills: false,
|
||||
ManagesInstructions: false,
|
||||
HasBuiltInSub: false,
|
||||
}
|
||||
}
|
||||
|
||||
// Detect returns true when ~/.config/zed/ exists.
|
||||
func (a *Adapter) Detect() bool {
|
||||
_, err := os.Stat(filepath.Join(a.home, ".config", "zed"))
|
||||
_, err := os.Stat(filepath.Join(a.Home, ".config", "zed"))
|
||||
return err == nil
|
||||
}
|
||||
|
||||
// Render produces the FileSet that applies the canonical bundle to Zed.
|
||||
// settings.json is MERGED to preserve all user-managed Zed configuration.
|
||||
// Only "agent" (default_model) and "context_servers" (MCP) are overlaid.
|
||||
// Manages: language_models.openai_compatible, agent.default_model.
|
||||
//
|
||||
// NOTE: context_servers is NOT written. Zed 1.3+ uses Extension-based MCP
|
||||
// servers in the Agent panel; writing context_servers causes a serde parse
|
||||
// error (ContextServerSettingsContent untagged enum bug) that aborts loading
|
||||
// the entire settings.json. We clear any existing context_servers key to fix
|
||||
// pre-existing parse errors from user-configured entries.
|
||||
func (a *Adapter) Render(b *canonical.Bundle) (*adapter.FileSet, error) {
|
||||
fs := adapter.NewFileSet()
|
||||
cfgPath := filepath.Join(a.home, ".config", "zed", "settings.json")
|
||||
existing, _ := os.ReadFile(cfgPath)
|
||||
cfgPath := filepath.Join(a.Home, ".config", "zed", "settings.json")
|
||||
existing, err := common.ReadExistingFile(cfgPath)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("read %s: %w", cfgPath, err)
|
||||
}
|
||||
|
||||
// Set context_servers to nil so MergeJSONKeys removes the key entirely,
|
||||
// clearing any entries that trigger the serde ContextServerSettingsContent bug.
|
||||
overlay := map[string]any{
|
||||
"context_servers": common.BuildMCPMapStyled(&b.MCP, common.MCPZedStyle),
|
||||
"context_servers": nil,
|
||||
}
|
||||
|
||||
if dm := b.Profile.Gateway.DefaultModel; dm != "" {
|
||||
provider, model := splitProviderModel(dm)
|
||||
overlay["agent"] = map[string]any{
|
||||
"default_model": map[string]any{
|
||||
"provider": provider,
|
||||
"model": model,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
if lm := common.ZedLanguageModels(&b.Profile); len(lm) > 0 {
|
||||
overlay["language_models"] = lm
|
||||
if b.Profile.Gateway.URL != "" {
|
||||
overlay["language_models"] = zedLanguageModels(&b.Profile)
|
||||
overlay["agent"] = zedAgentBlock(existing, &b.Profile)
|
||||
} else {
|
||||
overlay["language_models"] = nil
|
||||
}
|
||||
|
||||
merged, err := common.MergeJSONKeys(existing, overlay)
|
||||
@@ -86,21 +91,70 @@ func (a *Adapter) Render(b *canonical.Bundle) (*adapter.FileSet, error) {
|
||||
Dest: cfgPath,
|
||||
Kind: adapter.RenderedFile,
|
||||
Content: merged,
|
||||
// NoMerge: Zed settings.json is JSONC (trailing commas, comments). The
|
||||
// JSON merge above already reconciles at the key level; git 3-way merge
|
||||
// on JSONC causes spurious conflicts on whitespace/comment differences.
|
||||
NoMerge: true,
|
||||
})
|
||||
|
||||
return fs, nil
|
||||
}
|
||||
|
||||
// zedLanguageModels builds language_models.openai_compatible from the profile
|
||||
// gateway. Each named entry becomes its own provider in Zed's Agent panel.
|
||||
// API key is read by Zed from env var HARNESS_SYNC_GATEWAY_API_KEY at runtime.
|
||||
func zedLanguageModels(p *canonical.Profile) map[string]any {
|
||||
entry := map[string]any{"api_url": p.Gateway.URL}
|
||||
if len(p.Models) > 0 {
|
||||
models := make([]map[string]any, 0, len(p.Models))
|
||||
for _, m := range p.Models {
|
||||
me := map[string]any{
|
||||
"name": m.ID,
|
||||
"max_tokens": 200000,
|
||||
"capabilities": map[string]any{
|
||||
"tools": true,
|
||||
"images": false,
|
||||
"parallel_tool_calls": false,
|
||||
"prompt_cache_key": false,
|
||||
},
|
||||
}
|
||||
if m.Alias != "" {
|
||||
me["display_name"] = m.Alias
|
||||
}
|
||||
models = append(models, me)
|
||||
}
|
||||
entry["available_models"] = models
|
||||
}
|
||||
return map[string]any{
|
||||
"openai_compatible": map[string]any{
|
||||
common.GatewayProviderKey(p.Gateway.URL): entry,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
// zedAgentBlock merges default_model into the existing agent block,
|
||||
// preserving all other user-managed agent settings.
|
||||
func zedAgentBlock(existing []byte, p *canonical.Profile) map[string]any {
|
||||
base := map[string]any{}
|
||||
if len(existing) > 0 {
|
||||
var raw map[string]any
|
||||
clean := common.StripJSONComments(string(existing))
|
||||
if json.Unmarshal([]byte(clean), &raw) == nil {
|
||||
if ag, ok := raw["agent"].(map[string]any); ok {
|
||||
base = ag
|
||||
}
|
||||
}
|
||||
}
|
||||
if p.Gateway.DefaultModel != "" {
|
||||
base["default_model"] = map[string]any{
|
||||
"provider": common.GatewayProviderKey(p.Gateway.URL),
|
||||
"model": p.Gateway.DefaultModel,
|
||||
}
|
||||
}
|
||||
return base
|
||||
}
|
||||
|
||||
// Import reads context_servers from Zed settings.json back to MCP servers.
|
||||
func (a *Adapter) Import(home string) (*adapter.ImportResult, error) {
|
||||
return importFrom(home)
|
||||
}
|
||||
|
||||
// splitProviderModel splits "provider/model" at the first slash.
|
||||
// If no slash, provider is "anthropic".
|
||||
func splitProviderModel(s string) (string, string) {
|
||||
if idx := strings.IndexByte(s, '/'); idx >= 0 {
|
||||
return s[:idx], s[idx+1:]
|
||||
}
|
||||
return "anthropic", s
|
||||
}
|
||||
|
||||
@@ -16,7 +16,13 @@ import (
|
||||
func bundle() *canonical.Bundle {
|
||||
return &canonical.Bundle{
|
||||
Profile: canonical.Profile{
|
||||
Gateway: canonical.Gateway{DefaultModel: "anthropic/claude-sonnet-4-6"},
|
||||
Gateway: canonical.Gateway{
|
||||
URL: "https://llmgw.example.com/v1",
|
||||
DefaultModel: "claude-sonnet-4-6",
|
||||
},
|
||||
Models: []canonical.Model{
|
||||
{ID: "claude-sonnet-4-6", Alias: "sonnet"},
|
||||
},
|
||||
},
|
||||
MCP: canonical.MCPRegistry{Servers: []canonical.MCPServer{
|
||||
{Name: "filepuff", Command: "/bin/filepuff", Args: []string{"--serve"}},
|
||||
@@ -40,18 +46,21 @@ func TestZedRenderProducesExpectedTargets(t *testing.T) {
|
||||
var parsed map[string]any
|
||||
require.NoError(t, json.Unmarshal(seen[cfgDest].Content, &parsed))
|
||||
|
||||
// Agent default_model is an object.
|
||||
// agent.default_model routes through hs-llmgw-example-com (openai_compatible provider).
|
||||
agent := parsed["agent"].(map[string]any)
|
||||
dm := agent["default_model"].(map[string]any)
|
||||
assert.Equal(t, "anthropic", dm["provider"])
|
||||
assert.Equal(t, "hs-llmgw-example-com", dm["provider"])
|
||||
assert.Equal(t, "claude-sonnet-4-6", dm["model"])
|
||||
|
||||
// context_servers.
|
||||
cs := parsed["context_servers"].(map[string]any)
|
||||
fp := cs["filepuff"].(map[string]any)
|
||||
assert.Equal(t, true, fp["enabled"])
|
||||
assert.Equal(t, "custom", fp["source"])
|
||||
assert.Equal(t, "/bin/filepuff", fp["command"])
|
||||
// language_models.openai_compatible has our named gateway entry.
|
||||
lm := parsed["language_models"].(map[string]any)
|
||||
oc := lm["openai_compatible"].(map[string]any)
|
||||
gw := oc["hs-llmgw-example-com"].(map[string]any)
|
||||
assert.Equal(t, "https://llmgw.example.com/v1", gw["api_url"])
|
||||
|
||||
// context_servers must be absent — Zed serde untagged-enum bug aborts
|
||||
// settings loading when this key is present; we delete it via nil overlay.
|
||||
assert.NotContains(t, parsed, "context_servers")
|
||||
}
|
||||
|
||||
func TestZedRenderMergesExistingKeys(t *testing.T) {
|
||||
@@ -83,9 +92,9 @@ func TestZedRenderMergesExistingKeys(t *testing.T) {
|
||||
assert.Equal(t, "One Dark", parsed["theme"])
|
||||
assert.Equal(t, float64(16), parsed["font_size"])
|
||||
assert.Equal(t, true, parsed["vim_mode"])
|
||||
// Managed keys present.
|
||||
// Managed keys present; context_servers absent (serde bug — we delete it).
|
||||
assert.Contains(t, parsed, "agent")
|
||||
assert.Contains(t, parsed, "context_servers")
|
||||
assert.NotContains(t, parsed, "context_servers")
|
||||
}
|
||||
|
||||
func TestZedRenderNoMCP(t *testing.T) {
|
||||
@@ -105,13 +114,11 @@ func TestZedRenderNoMCP(t *testing.T) {
|
||||
cfgDest := filepath.Join(home, ".config", "zed", "settings.json")
|
||||
var parsed map[string]any
|
||||
require.NoError(t, json.Unmarshal(seen[cfgDest].Content, &parsed))
|
||||
// context_servers key present but empty map.
|
||||
cs, ok := parsed["context_servers"]
|
||||
assert.True(t, ok)
|
||||
assert.Empty(t, cs)
|
||||
// context_servers must be absent (nil overlay deletes the key).
|
||||
assert.NotContains(t, parsed, "context_servers")
|
||||
}
|
||||
|
||||
func TestZedRenderEmitsLanguageModelsOpenAI(t *testing.T) {
|
||||
func TestZedRenderEmitsLanguageModelsOpenAICompatible(t *testing.T) {
|
||||
home := t.TempDir()
|
||||
ad := New(WithHome(home))
|
||||
b := &canonical.Bundle{
|
||||
@@ -131,15 +138,21 @@ func TestZedRenderEmitsLanguageModelsOpenAI(t *testing.T) {
|
||||
|
||||
lm, ok := parsed["language_models"].(map[string]any)
|
||||
require.True(t, ok, "language_models must be present")
|
||||
oai, ok := lm["openai"].(map[string]any)
|
||||
require.True(t, ok, "language_models.openai must be present")
|
||||
assert.Equal(t, "https://gw", oai["api_url"])
|
||||
avail, ok := oai["available_models"].([]any)
|
||||
oc, ok := lm["openai_compatible"].(map[string]any)
|
||||
require.True(t, ok, "language_models.openai_compatible must be present")
|
||||
gw, ok := oc["hs-gw"].(map[string]any)
|
||||
require.True(t, ok, "openai_compatible.hs-gw must be present")
|
||||
assert.Equal(t, "https://gw", gw["api_url"])
|
||||
avail, ok := gw["available_models"].([]any)
|
||||
require.True(t, ok)
|
||||
require.Len(t, avail, 1)
|
||||
m0 := avail[0].(map[string]any)
|
||||
assert.Equal(t, "claude-sonnet-4-6", m0["name"])
|
||||
assert.Equal(t, "sonnet", m0["display_name"])
|
||||
caps, ok := m0["capabilities"].(map[string]any)
|
||||
require.True(t, ok, "model must have capabilities")
|
||||
assert.Equal(t, true, caps["tools"])
|
||||
assert.Equal(t, false, caps["prompt_cache_key"])
|
||||
}
|
||||
|
||||
func TestZedImport(t *testing.T) {
|
||||
@@ -181,16 +194,3 @@ func TestZedDetect(t *testing.T) {
|
||||
ad := New(WithHome(home))
|
||||
assert.False(t, ad.Detect())
|
||||
}
|
||||
|
||||
func TestSplitProviderModel(t *testing.T) {
|
||||
t.Run("with slash", func(t *testing.T) {
|
||||
p, m := splitProviderModel("anthropic/claude-sonnet-4-6")
|
||||
assert.Equal(t, "anthropic", p)
|
||||
assert.Equal(t, "claude-sonnet-4-6", m)
|
||||
})
|
||||
t.Run("no slash", func(t *testing.T) {
|
||||
p, m := splitProviderModel("claude-sonnet")
|
||||
assert.Equal(t, "anthropic", p)
|
||||
assert.Equal(t, "claude-sonnet", m)
|
||||
})
|
||||
}
|
||||
|
||||
+39
-10
@@ -9,6 +9,7 @@ import (
|
||||
"path/filepath"
|
||||
|
||||
"github.com/lukaszraczylo/harness-sync/internal/adapter"
|
||||
"github.com/lukaszraczylo/harness-sync/internal/adapter/common"
|
||||
"github.com/lukaszraczylo/harness-sync/internal/canonical"
|
||||
"github.com/lukaszraczylo/harness-sync/internal/gitx"
|
||||
"github.com/lukaszraczylo/harness-sync/internal/merge"
|
||||
@@ -42,6 +43,11 @@ type Action struct {
|
||||
// Run renders all adapters and writes their FileSets to disk.
|
||||
// Conflicts are recorded as <dest>.rej files; processing continues past conflicts.
|
||||
//
|
||||
// When Options.Repo is nil the canonical repo is auto-opened from Bundle.Root.
|
||||
// If that directory is not a git repository the commit step is silently
|
||||
// skipped — useful for one-off renders (CI smoke tests, dry-runs) where
|
||||
// initialising a repo would be more surprising than useful.
|
||||
//
|
||||
// IMPORTANT: harness-sync intentionally does NOT resolve ${VAR} references in
|
||||
// canonical configs. Every supported harness performs its own env-var
|
||||
// expansion at MCP launch / config-load time, so resolving here would only
|
||||
@@ -66,13 +72,30 @@ func Run(opt Options) (*Report, error) {
|
||||
return rep, renderErr
|
||||
}
|
||||
}
|
||||
if !opt.DryRun && rep.Written > 0 && opt.Repo != nil {
|
||||
if err := opt.Repo.AddAll(); err != nil {
|
||||
return rep, err
|
||||
}
|
||||
if err := opt.Repo.Commit(fmt.Sprintf("apply: %d files, %d conflicts", rep.Written, rep.Conflicts)); err != nil {
|
||||
return rep, err
|
||||
}
|
||||
if opt.DryRun || rep.Written == 0 {
|
||||
return rep, nil
|
||||
}
|
||||
repo := opt.Repo
|
||||
if repo == nil {
|
||||
repo = gitx.New(opt.Bundle.Root)
|
||||
}
|
||||
if !repo.IsRepo() {
|
||||
return rep, nil
|
||||
}
|
||||
if err := repo.AddAll(); err != nil {
|
||||
return rep, err
|
||||
}
|
||||
dirty, err := repo.HasStagedChanges()
|
||||
if err != nil {
|
||||
return rep, err
|
||||
}
|
||||
if !dirty {
|
||||
// Nothing changed inside the canonical repo (writes were outside it,
|
||||
// e.g. symlinks to temp dirs in tests). Skip the no-op commit.
|
||||
return rep, nil
|
||||
}
|
||||
if err := repo.Commit(fmt.Sprintf("apply: %d files, %d conflicts", rep.Written, rep.Conflicts)); err != nil {
|
||||
return rep, err
|
||||
}
|
||||
return rep, nil
|
||||
}
|
||||
@@ -93,8 +116,14 @@ func statePath(root, adapterName, dest string) string {
|
||||
|
||||
func handleRendered(opt Options, adapterName string, f adapter.File, rep *Report) error {
|
||||
sp := statePath(opt.Bundle.Root, adapterName, f.Dest)
|
||||
base, _ := os.ReadFile(sp)
|
||||
current, _ := os.ReadFile(f.Dest)
|
||||
base, readErr := common.ReadExistingFile(sp)
|
||||
if readErr != nil {
|
||||
return fmt.Errorf("read state %s: %w", sp, readErr)
|
||||
}
|
||||
current, readErr := common.ReadExistingFile(f.Dest)
|
||||
if readErr != nil {
|
||||
return fmt.Errorf("read target %s: %w", f.Dest, readErr)
|
||||
}
|
||||
|
||||
if string(current) == string(f.Content) {
|
||||
rep.Skipped++
|
||||
@@ -102,7 +131,7 @@ func handleRendered(opt Options, adapterName string, f adapter.File, rep *Report
|
||||
return writeState(opt, sp, f.Content)
|
||||
}
|
||||
|
||||
if opt.Force || len(base) == 0 || string(current) == string(base) {
|
||||
if opt.Force || f.NoMerge || len(base) == 0 || string(current) == string(base) {
|
||||
if opt.DryRun {
|
||||
rep.Actions = append(rep.Actions, Action{Adapter: adapterName, Dest: f.Dest, Kind: "wrote", Note: "would write"})
|
||||
return nil
|
||||
|
||||
@@ -26,6 +26,9 @@ func (f *failingAdapter) Render(_ *canonical.Bundle) (*adapter.FileSet, error) {
|
||||
func (f *failingAdapter) Import(_ string) (*adapter.ImportResult, error) {
|
||||
return &adapter.ImportResult{}, nil
|
||||
}
|
||||
func (f *failingAdapter) Capabilities() adapter.HarnessCapabilities {
|
||||
return adapter.HarnessCapabilities{}
|
||||
}
|
||||
|
||||
type stubAdapter struct {
|
||||
name string
|
||||
@@ -44,6 +47,9 @@ func (s *stubAdapter) Render(_ *canonical.Bundle) (*adapter.FileSet, error) {
|
||||
}
|
||||
return fs, nil
|
||||
}
|
||||
func (s *stubAdapter) Capabilities() adapter.HarnessCapabilities {
|
||||
return adapter.HarnessCapabilities{}
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Existing tests
|
||||
@@ -578,6 +584,160 @@ func TestApplyUnknownFileKind(t *testing.T) {
|
||||
assert.Contains(t, err.Error(), "unknown file kind")
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// TestApplyPropagatesReadErrors — regression for the silent-read footgun.
|
||||
// A target file in a directory we can no longer read must surface as an
|
||||
// error from Run, not as a fast-forward overwrite.
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
func TestApplyPropagatesReadErrors(t *testing.T) {
|
||||
if os.Geteuid() == 0 {
|
||||
t.Skip("running as root; cannot test permission denial")
|
||||
}
|
||||
root := t.TempDir()
|
||||
targetDir := t.TempDir()
|
||||
target := filepath.Join(targetDir, "out.txt")
|
||||
require.NoError(t, os.WriteFile(target, []byte("user-content\n"), 0o600))
|
||||
require.NoError(t, initCanonical(root))
|
||||
|
||||
// Strip read perms on the target's parent so os.ReadFile fails.
|
||||
require.NoError(t, os.Chmod(targetDir, 0o000))
|
||||
t.Cleanup(func() { _ = os.Chmod(targetDir, 0o755) })
|
||||
|
||||
ad := &stubAdapter{name: "stub", files: []adapter.File{
|
||||
{Dest: target, Kind: adapter.RenderedFile, Content: []byte("new-render\n")},
|
||||
}}
|
||||
_, err := Run(Options{
|
||||
Bundle: &canonical.Bundle{Root: root},
|
||||
Adapters: []adapter.Adapter{ad},
|
||||
Repo: gitx.New(root),
|
||||
})
|
||||
require.Error(t, err)
|
||||
assert.Contains(t, err.Error(), "read target")
|
||||
|
||||
// User's on-disk file must be untouched.
|
||||
_ = os.Chmod(targetDir, 0o755)
|
||||
body, rerr := os.ReadFile(target)
|
||||
require.NoError(t, rerr)
|
||||
assert.Equal(t, "user-content\n", string(body),
|
||||
"target must not be overwritten when read fails")
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// TestApplyAutoOpensRepoFromBundleRoot — regression: callers no longer need
|
||||
// to pre-construct a *gitx.Repo. Run opens one from Bundle.Root, skips
|
||||
// commit gracefully when the root is not a git repo, and commits when it is.
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
func TestApplyAutoOpensRepoFromBundleRoot(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
target := filepath.Join(t.TempDir(), "out.txt")
|
||||
require.NoError(t, initCanonical(root))
|
||||
|
||||
ad := &stubAdapter{name: "stub", files: []adapter.File{
|
||||
{Dest: target, Kind: adapter.RenderedFile, Content: []byte("auto\n")},
|
||||
}}
|
||||
// Intentionally pass Repo: nil — the new behaviour should open one itself.
|
||||
rep, err := Run(Options{
|
||||
Bundle: &canonical.Bundle{Root: root},
|
||||
Adapters: []adapter.Adapter{ad},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, 1, rep.Written)
|
||||
|
||||
// git log should have a new commit from apply, on top of the init one.
|
||||
out, gitErr := runGit(root, "log", "--oneline")
|
||||
require.NoError(t, gitErr)
|
||||
assert.GreaterOrEqual(t, countLines(out), 2)
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// TestApplyNoRepoSkipsCommit — when Bundle.Root isn't a git repo, Run must
|
||||
// still succeed (no error, no commit attempt). One-off renders / dry-runs.
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
func TestApplyNoRepoSkipsCommit(t *testing.T) {
|
||||
root := t.TempDir() // NOT initCanonical — no .git
|
||||
target := filepath.Join(t.TempDir(), "out.txt")
|
||||
|
||||
ad := &stubAdapter{name: "stub", files: []adapter.File{
|
||||
{Dest: target, Kind: adapter.RenderedFile, Content: []byte("x\n")},
|
||||
}}
|
||||
rep, err := Run(Options{
|
||||
Bundle: &canonical.Bundle{Root: root},
|
||||
Adapters: []adapter.Adapter{ad},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, 1, rep.Written)
|
||||
body, rerr := os.ReadFile(target)
|
||||
require.NoError(t, rerr)
|
||||
assert.Equal(t, "x\n", string(body))
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// TestApplySkipsNoOpCommit — symlinks at a path outside the canonical repo
|
||||
// do not write a state snapshot inside the repo (handleSymlink has no
|
||||
// state-tracking), so git has nothing to commit. apply.Run must detect
|
||||
// "no staged changes" and skip the commit instead of failing with
|
||||
// "nothing to commit" from git itself.
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
func TestApplySkipsNoOpCommit(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
require.NoError(t, initCanonical(root))
|
||||
targetDir := t.TempDir()
|
||||
target := filepath.Join(targetDir, "outside-link")
|
||||
real := filepath.Join(targetDir, "real.txt")
|
||||
require.NoError(t, os.WriteFile(real, []byte("real\n"), 0o600))
|
||||
|
||||
ad := &stubAdapter{name: "stub", files: []adapter.File{
|
||||
{Dest: target, Kind: adapter.SymlinkFile, SymlinkTarget: real},
|
||||
}}
|
||||
rep, err := Run(Options{
|
||||
Bundle: &canonical.Bundle{Root: root},
|
||||
Adapters: []adapter.Adapter{ad},
|
||||
// Repo: nil — auto-open from Bundle.Root (which IS a git repo).
|
||||
})
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, 1, rep.Written)
|
||||
|
||||
// Symlink exists on disk.
|
||||
got, lerr := os.Readlink(target)
|
||||
require.NoError(t, lerr)
|
||||
assert.Equal(t, real, got)
|
||||
|
||||
// No extra commit — still just the init commit. A failed "nothing to
|
||||
// commit" would surface here as an error from Run.
|
||||
out, gitErr := runGit(root, "log", "--oneline")
|
||||
require.NoError(t, gitErr)
|
||||
assert.Equal(t, 1, countLines(out),
|
||||
"expected only the init commit; symlink outside canonical root should not create one")
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// TestApplyCommitMessageHasCounts — commit message includes the file and
|
||||
// conflict counts so the rollback story is auditable from git log alone.
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
func TestApplyCommitMessageHasCounts(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
target := filepath.Join(t.TempDir(), "msg.txt")
|
||||
require.NoError(t, initCanonical(root))
|
||||
|
||||
ad := &stubAdapter{name: "stub", files: []adapter.File{
|
||||
{Dest: target, Kind: adapter.RenderedFile, Content: []byte("m\n")},
|
||||
}}
|
||||
_, err := Run(Options{
|
||||
Bundle: &canonical.Bundle{Root: root},
|
||||
Adapters: []adapter.Adapter{ad},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
|
||||
out, gitErr := runGit(root, "log", "-1", "--pretty=%s")
|
||||
require.NoError(t, gitErr)
|
||||
assert.Contains(t, out, "apply: 1 files, 0 conflicts")
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// helpers
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
@@ -24,6 +24,9 @@ func (d *detectableAdapter) Render(_ *canonical.Bundle) (*adapter.FileSet, error
|
||||
func (d *detectableAdapter) Import(_ string) (*adapter.ImportResult, error) {
|
||||
return &adapter.ImportResult{}, nil
|
||||
}
|
||||
func (d *detectableAdapter) Capabilities() adapter.HarnessCapabilities {
|
||||
return adapter.HarnessCapabilities{ManagesMCP: true}
|
||||
}
|
||||
|
||||
func TestDetectCommandPrintsList(t *testing.T) {
|
||||
reg := adapter.NewRegistry()
|
||||
|
||||
@@ -23,6 +23,9 @@ func (i *importableAdapter) Render(_ *canonical.Bundle) (*adapter.FileSet, error
|
||||
return adapter.NewFileSet(), nil
|
||||
}
|
||||
func (i *importableAdapter) Import(_ string) (*adapter.ImportResult, error) { return i.res, nil }
|
||||
func (i *importableAdapter) Capabilities() adapter.HarnessCapabilities {
|
||||
return adapter.HarnessCapabilities{ManagesMCP: true}
|
||||
}
|
||||
|
||||
func TestInitImportWritesCanonical(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
|
||||
+69
-3
@@ -34,8 +34,8 @@ func NewProfile(reg *adapter.Registry) *cobra.Command {
|
||||
}
|
||||
names := make([]string, 0, len(entries))
|
||||
for _, e := range entries {
|
||||
if strings.HasSuffix(e.Name(), ".yaml") {
|
||||
names = append(names, strings.TrimSuffix(e.Name(), ".yaml"))
|
||||
if n, ok := strings.CutSuffix(e.Name(), ".yaml"); ok {
|
||||
names = append(names, n)
|
||||
}
|
||||
}
|
||||
sort.Strings(names)
|
||||
@@ -84,8 +84,54 @@ func NewProfile(reg *adapter.Registry) *cobra.Command {
|
||||
rootFlag(use)
|
||||
use.Flags().BoolVar(&applyAfter, "apply", false, "run apply automatically after switching profile")
|
||||
|
||||
rename := &cobra.Command{
|
||||
Use: "rename <old> <new>",
|
||||
Short: "Rename a profile (file + name field + active_profile if needed)",
|
||||
Args: cobra.ExactArgs(2),
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
r, err := resolveRoot(root)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
oldName, newName := args[0], args[1]
|
||||
oldPath := filepath.Join(r, "profiles", oldName+".yaml")
|
||||
newPath := filepath.Join(r, "profiles", newName+".yaml")
|
||||
|
||||
if _, statErr := os.Stat(oldPath); statErr != nil {
|
||||
return fmt.Errorf("profile %q not found", oldName)
|
||||
}
|
||||
if _, statErr := os.Stat(newPath); statErr == nil {
|
||||
return fmt.Errorf("profile %q already exists", newName)
|
||||
}
|
||||
|
||||
body, err := os.ReadFile(oldPath)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if err := os.WriteFile(newPath, []byte(setProfileName(string(body), newName)), 0o600); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := os.Remove(oldPath); err != nil {
|
||||
_ = os.Remove(newPath)
|
||||
return err
|
||||
}
|
||||
|
||||
// Update active_profile in config.yaml if it points at the old name.
|
||||
configPath := filepath.Join(r, "config.yaml")
|
||||
if existing, readErr := os.ReadFile(configPath); readErr == nil {
|
||||
if isActiveProfile(string(existing), oldName) {
|
||||
_ = os.WriteFile(configPath, []byte(setActiveProfile(string(existing), newName)), 0o600)
|
||||
}
|
||||
}
|
||||
|
||||
_, _ = fmt.Fprintf(cmd.OutOrStdout(), "Renamed profile %q → %q.\n", oldName, newName)
|
||||
return nil
|
||||
},
|
||||
}
|
||||
rootFlag(rename)
|
||||
|
||||
cmd := &cobra.Command{Use: "profile", Short: "Manage profiles"}
|
||||
cmd.AddCommand(list, use)
|
||||
cmd.AddCommand(list, use, rename)
|
||||
return cmd
|
||||
}
|
||||
|
||||
@@ -99,3 +145,23 @@ func setActiveProfile(existing, name string) string {
|
||||
}
|
||||
return strings.TrimRight(existing, "\n") + "\nactive_profile: " + name + "\n"
|
||||
}
|
||||
|
||||
func isActiveProfile(configYAML, name string) bool {
|
||||
for l := range strings.SplitSeq(configYAML, "\n") {
|
||||
if rest, ok := strings.CutPrefix(l, "active_profile:"); ok {
|
||||
return strings.TrimSpace(rest) == name
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func setProfileName(body, name string) string {
|
||||
lines := strings.Split(body, "\n")
|
||||
for i, l := range lines {
|
||||
if strings.HasPrefix(l, "name:") {
|
||||
lines[i] = "name: " + name
|
||||
return strings.Join(lines, "\n")
|
||||
}
|
||||
}
|
||||
return "name: " + name + "\n" + strings.TrimLeft(body, "\n")
|
||||
}
|
||||
|
||||
@@ -62,6 +62,69 @@ func TestProfileUseHintMessage(t *testing.T) {
|
||||
assert.Contains(t, buf.String(), "harness-sync apply")
|
||||
}
|
||||
|
||||
func TestProfileRename(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
require.NoError(t, os.MkdirAll(filepath.Join(root, "profiles"), 0o750))
|
||||
require.NoError(t, os.WriteFile(filepath.Join(root, "profiles", "old.yaml"), []byte("name: old\ngateway:\n url: https://gw\n"), 0o600))
|
||||
require.NoError(t, os.WriteFile(filepath.Join(root, "config.yaml"), []byte("active_profile: other\n"), 0o600))
|
||||
|
||||
var buf bytes.Buffer
|
||||
cmd := NewProfile(nil)
|
||||
cmd.SetOut(&buf)
|
||||
cmd.SetArgs([]string{"rename", "old", "new", "--root", root})
|
||||
require.NoError(t, cmd.Execute())
|
||||
|
||||
// old file gone, new file present with updated name field.
|
||||
_, err := os.Stat(filepath.Join(root, "profiles", "old.yaml"))
|
||||
assert.True(t, os.IsNotExist(err), "old.yaml should be removed")
|
||||
body, err := os.ReadFile(filepath.Join(root, "profiles", "new.yaml"))
|
||||
require.NoError(t, err)
|
||||
assert.Contains(t, string(body), "name: new")
|
||||
assert.NotContains(t, string(body), "name: old")
|
||||
|
||||
// config.yaml not modified — old was not active.
|
||||
cfg, err := os.ReadFile(filepath.Join(root, "config.yaml"))
|
||||
require.NoError(t, err)
|
||||
assert.Contains(t, string(cfg), "active_profile: other")
|
||||
|
||||
assert.Contains(t, buf.String(), `"old" → "new"`)
|
||||
}
|
||||
|
||||
func TestProfileRenameUpdatesActiveProfile(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
require.NoError(t, os.MkdirAll(filepath.Join(root, "profiles"), 0o750))
|
||||
require.NoError(t, os.WriteFile(filepath.Join(root, "profiles", "old.yaml"), []byte("name: old\n"), 0o600))
|
||||
require.NoError(t, os.WriteFile(filepath.Join(root, "config.yaml"), []byte("active_profile: old\n"), 0o600))
|
||||
|
||||
cmd := NewProfile(nil)
|
||||
cmd.SetArgs([]string{"rename", "old", "new", "--root", root})
|
||||
require.NoError(t, cmd.Execute())
|
||||
|
||||
cfg, err := os.ReadFile(filepath.Join(root, "config.yaml"))
|
||||
require.NoError(t, err)
|
||||
assert.Contains(t, string(cfg), "active_profile: new")
|
||||
}
|
||||
|
||||
func TestProfileRenameErrorNotFound(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
require.NoError(t, os.MkdirAll(filepath.Join(root, "profiles"), 0o750))
|
||||
|
||||
cmd := NewProfile(nil)
|
||||
cmd.SetArgs([]string{"rename", "missing", "new", "--root", root})
|
||||
assert.Error(t, cmd.Execute())
|
||||
}
|
||||
|
||||
func TestProfileRenameErrorAlreadyExists(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
require.NoError(t, os.MkdirAll(filepath.Join(root, "profiles"), 0o750))
|
||||
require.NoError(t, os.WriteFile(filepath.Join(root, "profiles", "old.yaml"), []byte("name: old\n"), 0o600))
|
||||
require.NoError(t, os.WriteFile(filepath.Join(root, "profiles", "new.yaml"), []byte("name: new\n"), 0o600))
|
||||
|
||||
cmd := NewProfile(nil)
|
||||
cmd.SetArgs([]string{"rename", "old", "new", "--root", root})
|
||||
assert.Error(t, cmd.Execute())
|
||||
}
|
||||
|
||||
// TestProfileUseWithApply verifies --apply triggers apply after switching.
|
||||
func TestProfileUseWithApply(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
|
||||
@@ -31,6 +31,9 @@ func (r *renderingAdapter) Render(_ *canonical.Bundle) (*adapter.FileSet, error)
|
||||
}
|
||||
return fs, nil
|
||||
}
|
||||
func (r *renderingAdapter) Capabilities() adapter.HarnessCapabilities {
|
||||
return adapter.HarnessCapabilities{}
|
||||
}
|
||||
|
||||
func TestShowPrintsTargets(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
|
||||
+15
-1
@@ -50,7 +50,10 @@ func (r *Repo) Add(paths ...string) error {
|
||||
}
|
||||
|
||||
func (r *Repo) Commit(msg string) error {
|
||||
_, err := r.run("commit", "-q", "-m", msg)
|
||||
// --no-verify: harness-sync makes internal state-tracking commits in the
|
||||
// canonical repo; user-configured hooks (secret scanners, linters) must not
|
||||
// block them — those hooks belong to the harness-sync source repo, not here.
|
||||
_, err := r.run("commit", "-q", "--no-verify", "-m", msg)
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -68,6 +71,17 @@ func (r *Repo) IsRepo() bool {
|
||||
return err == nil
|
||||
}
|
||||
|
||||
// HasStagedChanges reports whether the index currently differs from HEAD.
|
||||
// Used by callers that want to skip a no-op `git commit` (commit exits 1
|
||||
// when there is nothing to commit, which is the wrong signal to propagate).
|
||||
func (r *Repo) HasStagedChanges() (bool, error) {
|
||||
b, err := r.run("status", "--porcelain")
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
return len(bytes.TrimSpace(b)) > 0, nil
|
||||
}
|
||||
|
||||
// Revert undoes the last N commits with `git revert --no-edit HEAD~N..HEAD`.
|
||||
// n must be >= 1.
|
||||
func (r *Repo) Revert(n int) error {
|
||||
|
||||
@@ -41,3 +41,33 @@ func TestShowFileAtHead(t *testing.T) {
|
||||
_, err = r.ShowFileAtHead("nope.txt")
|
||||
assert.Error(t, err)
|
||||
}
|
||||
|
||||
func TestHasStagedChangesEmptyAfterInit(t *testing.T) {
|
||||
dir := t.TempDir()
|
||||
r := New(dir)
|
||||
require.NoError(t, r.Init())
|
||||
require.NoError(t, r.Configure("nobody", "[email protected]"))
|
||||
// No commits yet, working tree clean.
|
||||
dirty, err := r.HasStagedChanges()
|
||||
require.NoError(t, err)
|
||||
assert.False(t, dirty)
|
||||
}
|
||||
|
||||
func TestHasStagedChangesAfterAdd(t *testing.T) {
|
||||
dir := t.TempDir()
|
||||
r := New(dir)
|
||||
require.NoError(t, r.Init())
|
||||
require.NoError(t, r.Configure("nobody", "[email protected]"))
|
||||
require.NoError(t, os.WriteFile(filepath.Join(dir, "a.txt"), []byte("x"), 0o600))
|
||||
require.NoError(t, r.AddAll())
|
||||
|
||||
dirty, err := r.HasStagedChanges()
|
||||
require.NoError(t, err)
|
||||
assert.True(t, dirty)
|
||||
|
||||
// After commit, index matches HEAD again → no staged changes.
|
||||
require.NoError(t, r.Commit("c"))
|
||||
dirty, err = r.HasStagedChanges()
|
||||
require.NoError(t, err)
|
||||
assert.False(t, dirty)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user