arkaos 3.52.0 → 3.53.1

package/VERSION

@@ -1 +1 @@
-3.52.0
+3.53.1

package/dashboard/app/pages/departments/[dept].vue

@@ -52,6 +52,67 @@ const compareOptions = computed(() =>
     })),
 )
 
+// PR95c v3.53.0 — Merge this department's agents into another.
+const { apiBase } = useApi()
+const toast = useToast()
+const confirmDialog = useConfirmDialog()
+const merging = ref(false)
+
+const mergeOptions = computed(() =>
+  (deptListData.value?.departments ?? [])
+    .filter((d) => d.department !== deptId.value)
+    .map((d) => ({
+      label: `Move all into ${d.department}`,
+      icon: 'i-lucide-folder-input',
+      onSelect: () => mergeInto(d.department),
+    })),
+)
+
+async function mergeInto(target: string) {
+  const ok = await confirmDialog({
+    title: `Merge ${deptId.value} → ${target}?`,
+    description: `Every agent in '${deptId.value}' will be moved to '${target}'. Tier 0 agents are skipped. This is reversible per-agent from /trash.`,
+    confirmLabel: `Move all into ${target}`,
+    cancelLabel: 'Cancel',
+    variant: 'danger',
+  })
+  if (!ok) return
+  merging.value = true
+  try {
+    const res = await $fetch<{
+      moved: number
+      skipped: number
+      failed: number
+      error?: string
+    }>(`${apiBase}/api/departments/${deptId.value}/merge-into/${target}`, {
+      method: 'POST',
+    })
+    if (res.error) throw new Error(res.error)
+    toast.add({
+      title: res.moved > 0
+        ? `Merged ${res.moved} agent${res.moved === 1 ? '' : 's'} into ${target}`
+        : 'Nothing moved',
+      description: [
+        res.skipped > 0 ? `${res.skipped} skipped (Tier 0)` : '',
+        res.failed > 0 ? `${res.failed} failed` : '',
+      ].filter(Boolean).join(' · ') || undefined,
+      color: res.failed > 0
+        ? 'warning'
+        : res.moved > 0 ? 'success' : 'info',
+      icon: 'i-lucide-folder-input',
+    })
+    if (res.moved > 0) navigateTo('/departments')
+  } catch (err) {
+    toast.add({
+      title: 'Merge failed',
+      description: err instanceof Error ? err.message : 'unknown error',
+      color: 'error',
+    })
+  } finally {
+    merging.value = false
+  }
+}
+
 const errorMsg = computed(() => data.value?.error || error.value?.message || null)
 const detail = computed<DeptDetail | null>(() => {
   if (!data.value || data.value.error) return null
@@ -90,6 +151,17 @@ const tierColor = (tier: number | undefined) => {
               trailing-icon="i-lucide-chevron-down"
             />
           </UDropdownMenu>
+          <UDropdownMenu v-if="mergeOptions.length > 0" :items="mergeOptions">
+            <UButton
+              label="Merge"
+              icon="i-lucide-folder-input"
+              variant="soft"
+              color="warning"
+              size="sm"
+              :loading="merging"
+              trailing-icon="i-lucide-chevron-down"
+            />
+          </UDropdownMenu>
         </template>
       </UDashboardNavbar>
     </template>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arkaos",
-  "version": "3.52.0",
+  "version": "3.53.1",
   "description": "The Operating System for AI Agent Teams",
   "type": "module",
   "bin": {

package/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arkaos-core"
-version = "3.52.0"
+version = "3.53.1"
 description = "Core engine for ArkaOS — The Operating System for AI Agent Teams"
 readme = "README.md"
 license = {text = "MIT"}

package/scripts/dashboard-api.py

@@ -1801,6 +1801,70 @@ def departments_list():
     return {"departments": out, "total": len(out)}
 
 
+@app.post("/api/departments/{src}/merge-into/{dst}")
+def department_merge(src: str, dst: str):
+    """PR95c v3.53.0 — move every agent from `src` department to `dst`.
+
+    Returns ``{src, dst, moved, skipped, failed, results}``. Tier 0
+    agents are skipped (governance fixtures). Refuses self-merge,
+    unknown source / destination, or empty source.
+    """
+    src = src.strip().lower()
+    dst = dst.strip().lower()
+    if not src or not dst:
+        return {"error": "src and dst are required"}
+    if src == dst:
+        return {"error": "src and dst must differ"}
+    src_dir = ARKAOS_ROOT / "departments" / src / "agents"
+    dst_dir = ARKAOS_ROOT / "departments" / dst / "agents"
+    if not src_dir.exists():
+        return {"error": f"department '{src}' not found"}
+    if not dst_dir.exists():
+        return {"error": f"department '{dst}' not found"}
+    # Walk the filesystem directly so freshly-created (not-yet-registered)
+    # agents are also picked up. _load_agents() reads a cached registry
+    # that doesn't refresh during the FastAPI process.
+    try:
+        import yaml as _yaml
+    except ImportError:
+        return {"error": "PyYAML unavailable"}
+    source_ids: list[str] = []
+    for path in sorted(src_dir.glob("*.yaml")):
+        try:
+            raw = _yaml.safe_load(path.read_text(encoding="utf-8")) or {}
+        except Exception:  # noqa: BLE001
+            continue
+        if isinstance(raw, dict) and raw.get("id"):
+            source_ids.append(str(raw["id"]))
+    if not source_ids:
+        return {"error": f"department '{src}' has no agents"}
+
+    moved = 0
+    skipped = 0
+    failed = 0
+    results: list[dict] = []
+    for aid in source_ids:
+        res = agent_move(aid, {"department": dst})
+        if res.get("moved"):
+            moved += 1
+            results.append({"id": aid, "status": "moved"})
+        elif "Tier 0" in (res.get("error") or ""):
+            skipped += 1
+            results.append({"id": aid, "status": "skipped", "reason": "Tier 0"})
+        else:
+            failed += 1
+            results.append({"id": aid, "status": "failed", "error": res.get("error", "")})
+
+    return {
+        "src": src,
+        "dst": dst,
+        "moved": moved,
+        "skipped": skipped,
+        "failed": failed,
+        "results": results,
+    }
+
+
 @app.get("/api/departments/{dept_id}")
 def department_detail(dept_id: str):
     """Full department detail: agents, workflows, 30d cost."""