From b1d4750ed1e5151f2e46eff18f770fc9052696e4 Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart.allen@gmail.com>
Date: Wed, 24 Dec 2025 21:55:35 -0500
Subject: [PATCH] move client, conf to ui

---
 src/kiri/core/api.js                          |  4 ++--
 src/kiri/core/function.js                     |  2 +-
 src/kiri/core/init.js                         |  2 +-
 src/kiri/core/main.js                         |  2 +-
 src/kiri/mode/cam/tools.js                    |  2 +-
 src/kiri/mode/fdm/init-ui.js                  |  4 ++--
 src/kiri/run/engine.js                        |  4 ++--
 src/kiri/{core => ui}/client.js               | 10 +++++-----
 .../{core/conf.js => ui/config/defaults.js}   |  0
 .../settings.js => ui/config/manager.js}      | 20 +++++++++----------
 src/kiri/ui/devices.js                        |  4 ++--
 src/kiri/ui/export.js                         |  2 +-
 12 files changed, 28 insertions(+), 28 deletions(-)
 rename src/kiri/{core => ui}/client.js (97%)
 rename src/kiri/{core/conf.js => ui/config/defaults.js} (100%)
 rename src/kiri/{core/settings.js => ui/config/manager.js} (98%)

diff --git a/src/kiri/core/api.js b/src/kiri/core/api.js
index 416fdcbb..8ed318c5 100644
--- a/src/kiri/core/api.js
+++ b/src/kiri/core/api.js
@@ -1,11 +1,11 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
 import alerts from '../ui/alerts.js';
-import settings from './settings.js'
+import settings from '../ui/config/manager.js';
 import STACKS from '../ui/stacks.js';
 
 import { broker } from '../../moto/broker.js';
-import { client as work } from './client.js';
+import { client as work } from '../ui/client.js';
 import { consts, COLOR as color, LISTS as lists } from './consts.js';
 import { device, devices } from '../ui/devices.js';
 import { catalog, dialog, event, group, help, hide, image } from './main.js';
diff --git a/src/kiri/core/function.js b/src/kiri/core/function.js
index 9b078e8e..72e7385d 100644
--- a/src/kiri/core/function.js
+++ b/src/kiri/core/function.js
@@ -1,7 +1,7 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
 import { api } from './api.js';
-import { client } from './client.js';
+import { client } from '../ui/client.js';
 import { codec } from './codec.js';
 import { space } from '../../moto/space.js';
 import { COLOR, PMODES } from './consts.js';
diff --git a/src/kiri/core/init.js b/src/kiri/core/init.js
index b363c334..19ae5441 100644
--- a/src/kiri/core/init.js
+++ b/src/kiri/core/init.js
@@ -12,7 +12,7 @@ import { space } from '../../moto/space.js';
 import { LOCAL, SETUP } from './main.js';
 import { VIEWS, MODES, SEED } from './consts.js';
 import { beta, version } from '../../moto/license.js';
-import { settings as set_ctrl } from './settings.js';
+import { settings as set_ctrl } from '../ui/config/manager.js';
 import STACKS from '../ui/stacks.js';
 import { init as initCAM } from '../mode/cam/init-ui.js';
 import { init as initDRAG } from '../mode/drag/init-ui.js';
diff --git a/src/kiri/core/main.js b/src/kiri/core/main.js
index f9d0b55f..2679bd8b 100644
--- a/src/kiri/core/main.js
+++ b/src/kiri/core/main.js
@@ -15,7 +15,7 @@ import { local as dataLocal } from '../../data/local.js';
 import { openFiles } from '../ui/files.js';
 import { platform } from './platform.js';
 import { selection } from './selection.js';
-import { settings } from './settings.js';
+import { settings } from '../ui/config/manager.js';
 import { showDevices } from '../ui/devices.js';
 import { space as SPACE } from '../../moto/space.js';
 import { stats } from '../ui/stats.js';
diff --git a/src/kiri/mode/cam/tools.js b/src/kiri/mode/cam/tools.js
index 16dc117e..b542415a 100644
--- a/src/kiri/mode/cam/tools.js
+++ b/src/kiri/mode/cam/tools.js
@@ -3,7 +3,7 @@
 import { $ } from '../../../moto/webui.js';
 import { api } from '../../core/api.js';
 import { consts } from '../../core/consts.js';
-import { settings as setconf } from '../../core/settings.js';
+import { settings as setconf } from '../../ui/config/manager.js';
 import { Tool, calcTaperAngle, calcTaperBallExtent, calcTaperLength } from './tool.js';
 
 const DEG2RAD = Math.PI / 180;
diff --git a/src/kiri/mode/fdm/init-ui.js b/src/kiri/mode/fdm/init-ui.js
index ea9187a5..b403ad8d 100644
--- a/src/kiri/mode/fdm/init-ui.js
+++ b/src/kiri/mode/fdm/init-ui.js
@@ -2,9 +2,9 @@
 
 import { $ } from '../../../moto/webui.js';
 import { api } from '../../core/api.js';
-import { conf } from '../../core/conf.js';
+import { conf } from '../../ui/config/defaults.js';
 import { util } from '../../../geo/base.js';
-import { client } from '../../core/client.js';
+import { client } from '../../ui/client.js';
 import { addbox, delbox, getlastbox } from '../../core/boxes.js';
 import { Layers } from '../../ui/layers.js';
 import { Stack } from '../../ui/stack.js';
diff --git a/src/kiri/run/engine.js b/src/kiri/run/engine.js
index 5b9d7008..f1b49fc7 100644
--- a/src/kiri/run/engine.js
+++ b/src/kiri/run/engine.js
@@ -4,8 +4,8 @@ import '../../add/array.js';
 import '../../add/class.js';
 import '../../add/three.js';
 import { api } from '../core/api.js';
-import { conf } from '../core/conf.js';
-import { client } from '../core/client.js';
+import { conf } from '../ui/config/defaults.js';
+import { client } from '../ui/client.js';
 import { load } from '../../load/file.js';
 import { newWidget } from '../core/widget.js';
 
diff --git a/src/kiri/core/client.js b/src/kiri/ui/client.js
similarity index 97%
rename from src/kiri/core/client.js
rename to src/kiri/ui/client.js
index a6a5a116..84208ed2 100644
--- a/src/kiri/core/client.js
+++ b/src/kiri/ui/client.js
@@ -1,10 +1,10 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { api } from './api.js';
-import { noop } from './utils.js';
-import { codec } from './codec.js';
-import { Widget } from './widget.js';
-import { newPrint } from './print.js';
+import { api } from '../core/api.js';
+import { noop } from '../core/utils.js';
+import { codec } from '../core/codec.js';
+import { Widget } from '../core/widget.js';
+import { newPrint } from '../core/print.js';
 
 // this code runs in kiri's main loop
 let debug = self.debug === true,
diff --git a/src/kiri/core/conf.js b/src/kiri/ui/config/defaults.js
similarity index 100%
rename from src/kiri/core/conf.js
rename to src/kiri/ui/config/defaults.js
diff --git a/src/kiri/core/settings.js b/src/kiri/ui/config/manager.js
similarity index 98%
rename from src/kiri/core/settings.js
rename to src/kiri/ui/config/manager.js
index 51bb27e2..edf14e67 100644
--- a/src/kiri/core/settings.js
+++ b/src/kiri/ui/config/manager.js
@@ -1,15 +1,15 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { $, h } from '../../moto/webui.js';
-import { api } from './api.js';
-import { conf } from './conf.js';
-import { codec } from './codec.js';
-import { consts } from './consts.js';
-import { space } from '../../moto/space.js';
-import { local } from '../../data/local.js';
-import { utils } from './utils.js';
-import { version } from '../../moto/license.js';
-import { JSZip } from '../../ext/jszip-esm.js';
+import { $, h } from '../../../moto/webui.js';
+import { api } from '../../core/api.js';
+import { conf } from './defaults.js';
+import { codec } from '../../core/codec.js';
+import { consts } from '../../core/consts.js';
+import { space } from '../../../moto/space.js';
+import { local } from '../../../data/local.js';
+import { utils } from '../../core/utils.js';
+import { version } from '../../../moto/license.js';
+import { JSZip } from '../../../ext/jszip-esm.js';
 
 const { areEqual, ls2o, js2o } = utils;
 const { COLOR } = consts;
diff --git a/src/kiri/ui/devices.js b/src/kiri/ui/devices.js
index 20a080a2..7586687a 100644
--- a/src/kiri/ui/devices.js
+++ b/src/kiri/ui/devices.js
@@ -2,10 +2,10 @@
 
 import { $, h } from '../../moto/webui.js';
 import { api } from '../core/api.js';
-import { conf } from '../core/conf.js';
+import { conf } from './config/defaults.js';
 import { space } from '../../moto/space.js';
 import { devices as devlist } from '../../pack/kiri-devs.js';
-import { settings, conf as setconf } from '../core/settings.js';
+import { settings, conf as setconf } from './config/manager.js';
 
 export const device = {
     clone: cloneDevice,
diff --git a/src/kiri/ui/export.js b/src/kiri/ui/export.js
index 36511442..02fa1367 100644
--- a/src/kiri/ui/export.js
+++ b/src/kiri/ui/export.js
@@ -2,7 +2,7 @@
 
 import { $ } from '../../moto/webui.js';
 import { api } from '../core/api.js';
-import { client } from '../core/client.js';
+import { client } from './client.js';
 import { local } from '../../data/local.js';
 import { util } from '../../geo/base.js';
 import { MODES } from '../core/consts.js';