npm - @agentunion/kite - Versions diffs - 1.3.0 → 1.3.2 - Mend

@agentunion/kite 1.3.0 → 1.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

package/CHANGELOG.md +87 -1
package/extensions/agents/assistant/server.py +30 -12
package/extensions/channels/acp_channel/server.py +30 -12
package/extensions/services/backup/entry.py +123 -65
package/extensions/services/model_service/entry.py +123 -65
package/extensions/services/watchdog/entry.py +171 -80
package/extensions/services/watchdog/monitor.py +112 -6
package/extensions/services/web/routes/routes_modules.py +249 -0
package/extensions/services/web/routes/schemas.py +22 -0
package/extensions/services/web/server.py +37 -14
package/extensions/services/web/static/css/style.css +97 -0
package/extensions/services/web/static/index.html +105 -2
package/extensions/services/web/static/js/app.js +288 -1
package/kernel/event_hub.py +21 -3
package/kernel/registry_store.py +22 -5
package/kernel/rpc_router.py +15 -5
package/kernel/server.py +75 -5
package/launcher/count_lines.py +34 -0
package/launcher/entry.py +92 -14
package/launcher/process_manager.py +12 -1
package/package.json +1 -1

package/extensions/services/web/static/index.html CHANGED Viewed

@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>AI Phone Agent</title>
-  <link rel="stylesheet" href="css/style.css?v=35">
+  <link rel="stylesheet" href="css/style.css?v=36">
 </head>
 <body>
@@ -52,6 +52,10 @@
           <span class="nav-label">蓝牙</span>
           <span class="nav-sublabel">Bluetooth</span>
         </li>
+        <li class="nav-item" data-page="modules">
+          <span class="nav-label">模块</span>
+          <span class="nav-sublabel">Modules</span>
+        </li>
         <li class="nav-item" data-page="voicechat">
           <span class="nav-label">语音测试</span>
           <span class="nav-sublabel">Voice Chat</span>
@@ -960,6 +964,105 @@
         </div>
       </section>
+      <!-- ==================== Voice Chat ==================== -->
+      <!-- ==================== Modules ==================== -->
+      <section id="page-modules" class="page">
+        <div style="display:flex;align-items:center;gap:12px;margin-bottom:20px;">
+          <h2 class="page-title" style="margin-bottom:0;">模块</h2>
+          <span id="module-save-status" class="config-save-status"></span>
+        </div>
+        <!-- Module Cards Grid -->
+        <div id="modules-grid" class="modules-grid">
+          <p class="text-muted" style="padding:40px;text-align:center;">加载中...</p>
+        </div>
+        <!-- Module Detail Panel (hidden by default) -->
+        <div id="module-detail" class="hidden">
+          <div style="display:flex;align-items:center;gap:12px;margin-bottom:16px;">
+            <button class="btn btn-secondary btn-sm" id="btn-module-back">&larr; 返回</button>
+            <h3 id="module-detail-name" style="font-size:18px;font-weight:600;color:var(--gray-900);margin:0;"></h3>
+            <span id="module-detail-type-badge" class="module-type-badge"></span>
+          </div>
+          <!-- Metadata Form -->
+          <div class="form-section" id="module-meta-form">
+            <h4 class="form-title">元数据</h4>
+            <!-- Read-only fields -->
+            <div class="form-row" style="margin-bottom:14px;">
+              <div class="form-group">
+                <label>Name</label>
+                <input type="text" id="mod-meta-name" disabled style="background:var(--gray-100);cursor:not-allowed;">
+              </div>
+              <div class="form-group">
+                <label>Type</label>
+                <input type="text" id="mod-meta-type" disabled style="background:var(--gray-100);cursor:not-allowed;">
+              </div>
+            </div>
+            <div class="form-row" style="margin-bottom:14px;">
+              <div class="form-group">
+                <label>Runtime</label>
+                <input type="text" id="mod-meta-runtime" disabled style="background:var(--gray-100);cursor:not-allowed;">
+              </div>
+              <div class="form-group">
+                <label>Entry</label>
+                <input type="text" id="mod-meta-entry" disabled style="background:var(--gray-100);cursor:not-allowed;">
+              </div>
+            </div>
+            <hr style="border:none;border-top:1px solid var(--gray-200);margin:16px 0;">
+            <!-- Editable fields -->
+            <div class="form-row">
+              <div class="form-group">
+                <label>Display Name</label>
+                <input type="text" id="mod-meta-display-name" data-field="display_name">
+              </div>
+              <div class="form-group">
+                <label>Version</label>
+                <input type="text" id="mod-meta-version" data-field="version">
+              </div>
+            </div>
+            <div class="form-row">
+              <div class="form-group">
+                <label>State</label>
+                <select id="mod-meta-state" data-field="state">
+                  <option value="enabled">enabled</option>
+                  <option value="manual">manual</option>
+                  <option value="disabled">disabled</option>
+                </select>
+              </div>
+              <div class="form-group">
+                <label>Preferred Port</label>
+                <input type="number" id="mod-meta-port" data-field="preferred_port" placeholder="(无)">
+              </div>
+            </div>
+            <div class="form-row">
+              <div class="form-group">
+                <label>Advertise IP</label>
+                <input type="text" id="mod-meta-ip" data-field="advertise_ip" placeholder="0.0.0.0">
+              </div>
+              <div class="form-group">
+                <label>Monitor</label>
+                <select id="mod-meta-monitor" data-field="monitor">
+                  <option value="">(未设置)</option>
+                  <option value="true">true</option>
+                  <option value="false">false</option>
+                </select>
+              </div>
+            </div>
+          </div>
+          <!-- Config Tree (only shown if module has config.yaml) -->
+          <div class="form-section hidden" id="module-config-section">
+            <h4 class="form-title">config.yaml</h4>
+            <div id="module-config-tree"></div>
+          </div>
+        </div>
+      </section>
       <!-- ==================== Voice Chat ==================== -->
       <section id="page-voicechat" class="page">
         <div class="vc-layout">
@@ -1440,6 +1543,6 @@
   <!-- ===== Toast / Notification Area ===== -->
   <div id="toast-container"></div>
-  <script src="js/app.js?v=51"></script>
+  <script src="js/app.js?v=52"></script>
 </body>
 </html>

package/extensions/services/web/static/js/app.js CHANGED Viewed

@@ -97,7 +97,7 @@ function showToast(message, type = 'info') {
 // ============================================================
 // Navigation / Router
 // ============================================================
-const pages = ['dashboard', 'calls', 'sms', 'contacts', 'config', 'bluetooth', 'voicechat', 'devlog'];
+const pages = ['dashboard', 'calls', 'sms', 'contacts', 'config', 'bluetooth', 'modules', 'voicechat', 'devlog'];
 let currentPage = '';
 function navigate(page) {
@@ -128,6 +128,7 @@ function navigate(page) {
         case 'contacts':   loadContacts(); break;
         case 'config':     loadConfig(); break;
         case 'bluetooth':  loadBluetooth(); break;
+        case 'modules':    loadModules(); break;
         case 'voicechat': loadVoiceChatConfig(); break;
         case 'devlog':    loadDevLog(); break;
     }
@@ -4202,6 +4203,282 @@ function closeDevLogArchiveModal() {
     document.getElementById('devlog-archive-modal')?.classList.add('hidden');
 }
+// ============================================================
+// Modules Page
+// ============================================================
+let _moduleSaveTimer = null;
+let _currentModuleName = '';
+async function loadModules() {
+    // Reset to grid view
+    document.getElementById('modules-grid')?.classList.remove('hidden');
+    document.getElementById('module-detail')?.classList.add('hidden');
+    try {
+        const modules = await API.get('/api/modules');
+        renderModulesGrid(modules);
+    } catch (err) {
+        const grid = document.getElementById('modules-grid');
+        if (grid) grid.innerHTML = `<p class="text-muted" style="padding:40px;text-align:center;">加载失败: ${escapeHtml(err.message)}</p>`;
+    }
+}
+function renderModulesGrid(modules) {
+    const grid = document.getElementById('modules-grid');
+    if (!grid) return;
+    if (!modules.length) {
+        grid.innerHTML = '<p class="text-muted" style="padding:40px;text-align:center;">未发现模块</p>';
+        return;
+    }
+    grid.innerHTML = modules.map(m => {
+        const stateClass = m.state === 'enabled' ? 'enabled' : m.state === 'manual' ? 'manual' : 'disabled';
+        const typeClass = m.type || 'unknown';
+        const displayName = m.display_name || m.name;
+        const version = m.version ? `<span class="module-version">v${escapeHtml(String(m.version))}</span>` : '';
+        const configBadge = m.has_config ? '<span class="badge badge-info" style="font-size:10px;">config</span>' : '';
+        return `<div class="module-card" data-name="${escapeHtml(m.name)}" onclick="openModuleDetail('${escapeHtml(m.name)}')">
+            <div class="module-card-header">
+                <span class="module-state-dot ${stateClass}" title="${escapeHtml(m.state || 'enabled')}"></span>
+                <span class="module-type-badge type-${escapeHtml(typeClass)}">${escapeHtml(m.type || '?')}</span>
+                ${version}
+            </div>
+            <div class="module-card-name">${escapeHtml(m.name)}</div>
+            <div class="module-card-display-name">${escapeHtml(displayName)}</div>
+            <div class="module-card-footer">
+                ${m.preferred_port ? '<span style="font-size:11px;color:var(--gray-400);">:' + m.preferred_port + '</span>' : ''}
+                ${configBadge}
+            </div>
+        </div>`;
+    }).join('');
+}
+async function openModuleDetail(name) {
+    _currentModuleName = name;
+    // Switch view
+    document.getElementById('modules-grid')?.classList.add('hidden');
+    document.getElementById('module-detail')?.classList.remove('hidden');
+    try {
+        const mod = await API.get(`/api/modules/${encodeURIComponent(name)}`);
+        // Header
+        document.getElementById('module-detail-name').textContent = mod.display_name || mod.name;
+        const badge = document.getElementById('module-detail-type-badge');
+        if (badge) {
+            badge.textContent = mod.type || '?';
+            badge.className = `module-type-badge type-${mod.type || 'unknown'}`;
+        }
+        // Read-only fields
+        _setVal('mod-meta-name', mod.name || '');
+        _setVal('mod-meta-type', mod.type || '');
+        _setVal('mod-meta-runtime', mod.runtime || '');
+        _setVal('mod-meta-entry', mod.entry || '');
+        // Editable fields
+        _setVal('mod-meta-display-name', mod.display_name || '');
+        _setVal('mod-meta-version', mod.version || '');
+        _setVal('mod-meta-state', mod.state || 'enabled');
+        _setVal('mod-meta-port', mod.preferred_port != null ? mod.preferred_port : '');
+        _setVal('mod-meta-ip', mod.advertise_ip || '');
+        const monitorEl = document.getElementById('mod-meta-monitor');
+        if (monitorEl) monitorEl.value = mod.monitor != null ? String(mod.monitor) : '';
+        // Config section
+        const configSection = document.getElementById('module-config-section');
+        const configTree = document.getElementById('module-config-tree');
+        if (mod.has_config && mod.config) {
+            configSection?.classList.remove('hidden');
+            if (configTree) {
+                configTree.innerHTML = '';
+                renderConfigTree(mod.config, configTree, '');
+            }
+        } else {
+            configSection?.classList.add('hidden');
+        }
+    } catch (err) {
+        showToast('加载模块详情失败: ' + err.message, 'error');
+    }
+}
+function renderConfigTree(obj, container, pathPrefix) {
+    if (!obj || typeof obj !== 'object') return;
+    // Secret field patterns
+    const secretKeys = /(?:password|secret|token|api_key|access_key|private_key)/i;
+    Object.entries(obj).forEach(([key, val]) => {
+        const fullPath = pathPrefix ? `${pathPrefix}.${key}` : key;
+        if (val !== null && typeof val === 'object' && !Array.isArray(val)) {
+            // Nested object → collapsible group
+            const group = document.createElement('div');
+            group.className = 'config-tree-group';
+            const header = document.createElement('div');
+            header.className = 'config-tree-key';
+            header.textContent = key;
+            header.addEventListener('click', () => {
+                group.classList.toggle('collapsed');
+            });
+            const nested = document.createElement('div');
+            nested.className = 'config-tree-nested';
+            group.appendChild(header);
+            group.appendChild(nested);
+            container.appendChild(group);
+            renderConfigTree(val, nested, fullPath);
+        } else {
+            // Leaf value → form input
+            const row = document.createElement('div');
+            row.className = 'config-tree-leaf';
+            const label = document.createElement('label');
+            label.className = 'config-tree-label';
+            label.textContent = key;
+            let input;
+            if (typeof val === 'boolean') {
+                input = document.createElement('input');
+                input.type = 'checkbox';
+                input.checked = val;
+                input.className = 'config-tree-checkbox';
+            } else if (typeof val === 'number') {
+                input = document.createElement('input');
+                input.type = 'number';
+                input.value = val;
+                input.step = 'any';
+                input.className = 'config-tree-input';
+            } else if (Array.isArray(val)) {
+                input = document.createElement('input');
+                input.type = 'text';
+                input.value = val.join(', ');
+                input.className = 'config-tree-input';
+                input.placeholder = 'comma separated';
+            } else {
+                input = document.createElement('input');
+                input.type = secretKeys.test(key) ? 'password' : 'text';
+                input.value = val != null ? String(val) : '';
+                input.className = 'config-tree-input';
+            }
+            input.dataset.path = fullPath;
+            input.dataset.origType = Array.isArray(val) ? 'array' : typeof val;
+            // Debounced save on input/change
+            const saveEvent = (input.type === 'checkbox' || input.tagName === 'SELECT') ? 'change' : 'input';
+            input.addEventListener(saveEvent, _debouncedSaveModule);
+            row.appendChild(label);
+            row.appendChild(input);
+            container.appendChild(row);
+        }
+    });
+}
+function _buildModuleConfigObject() {
+    const tree = document.getElementById('module-config-tree');
+    if (!tree) return null;
+    const obj = {};
+    tree.querySelectorAll('[data-path]').forEach(input => {
+        const path = input.dataset.path;
+        const origType = input.dataset.origType;
+        let val;
+        if (input.type === 'checkbox') {
+            val = input.checked;
+        } else if (origType === 'number') {
+            val = input.value === '' ? 0 : Number(input.value);
+        } else if (origType === 'array') {
+            val = input.value.split(',').map(s => s.trim()).filter(Boolean);
+        } else {
+            val = input.value;
+        }
+        // Build nested object from dot path
+        const parts = path.split('.');
+        let target = obj;
+        for (let i = 0; i < parts.length - 1; i++) {
+            if (!(parts[i] in target)) target[parts[i]] = {};
+            target = target[parts[i]];
+        }
+        target[parts[parts.length - 1]] = val;
+    });
+    return obj;
+}
+function _debouncedSaveModule() {
+    clearTimeout(_moduleSaveTimer);
+    _moduleSaveTimer = setTimeout(async () => {
+        _showModuleSaveStatus('saving');
+        try {
+            // Collect metadata
+            const meta = {};
+            document.querySelectorAll('#module-meta-form [data-field]').forEach(el => {
+                const field = el.dataset.field;
+                let val;
+                if (field === 'preferred_port') {
+                    val = el.value === '' ? null : parseInt(el.value);
+                } else if (field === 'monitor') {
+                    val = el.value === '' ? null : el.value === 'true';
+                } else {
+                    val = el.value || null;
+                }
+                if (val !== null) meta[field] = val;
+            });
+            // Save metadata
+            const metaPromise = Object.keys(meta).length > 0
+                ? API.put(`/api/modules/${encodeURIComponent(_currentModuleName)}/metadata`, meta)
+                : Promise.resolve();
+            // Save config if visible
+            const configSection = document.getElementById('module-config-section');
+            const configObj = _buildModuleConfigObject();
+            const configPromise = configSection && !configSection.classList.contains('hidden') && configObj
+                ? API.put(`/api/modules/${encodeURIComponent(_currentModuleName)}/config`, configObj)
+                : Promise.resolve();
+            await Promise.all([metaPromise, configPromise]);
+            _showModuleSaveStatus('saved');
+        } catch (err) {
+            _showModuleSaveStatus('error');
+            showToast('保存失败: ' + err.message, 'error');
+        }
+    }, 800);
+}
+function _showModuleSaveStatus(status) {
+    const el = document.getElementById('module-save-status');
+    if (!el) return;
+    el.classList.remove('saving', 'saved', 'error', 'fade-out');
+    if (status === 'saving') {
+        el.textContent = '保存中...';
+        el.classList.add('saving');
+    } else if (status === 'saved') {
+        el.textContent = '已保存';
+        el.classList.add('saved');
+        setTimeout(() => {
+            el.classList.add('fade-out');
+            setTimeout(() => { el.textContent = ''; el.classList.remove('saved', 'fade-out'); }, 300);
+        }, 2000);
+    } else if (status === 'error') {
+        el.textContent = '保存失败';
+        el.classList.add('error');
+        setTimeout(() => {
+            el.classList.add('fade-out');
+            setTimeout(() => { el.textContent = ''; el.classList.remove('error', 'fade-out'); }, 300);
+        }, 3000);
+    }
+}
 // ============================================================
 // Initialization
 // ============================================================
@@ -4663,6 +4940,16 @@ document.addEventListener('DOMContentLoaded', () => {
         if (dateEl) loadDevLogArchiveDetail(dateEl.dataset.date);
     });
+    // Modules page
+    const btnModuleBack = document.getElementById('btn-module-back');
+    if (btnModuleBack) btnModuleBack.addEventListener('click', loadModules);
+    // Module metadata form auto-save
+    document.querySelectorAll('#module-meta-form [data-field]').forEach(el => {
+        const event = (el.tagName === 'SELECT') ? 'change' : 'input';
+        el.addEventListener(event, _debouncedSaveModule);
+    });
     // Navigate to last active page (or dashboard)
     navigate(localStorage.getItem('activePage') || 'dashboard');

package/kernel/event_hub.py CHANGED Viewed

@@ -40,6 +40,9 @@ def _loads(raw: str):
 QUEUE_MAXSIZE = 10000
+# System events that are auto-broadcast to ALL connected modules (no subscription needed)
+SYSTEM_EVENTS = {"module.offline", "module.ready", "module.shutdown"}
 class EventHub:
@@ -193,10 +196,27 @@ class EventHub:
     # ── Routing ──
     def _route_event(self, sender_id: str, msg: dict, event_type: str, echo: bool):
-        """Enqueue event to all matching subscribers' delivery queues."""
+        """Enqueue event to all matching subscribers' delivery queues.
+        System events (module.offline, module.ready, module.shutdown) are auto-broadcast
+        to ALL connected modules, regardless of subscription."""
         e_parts = tuple(event_type.split("."))
         raw = None  # lazy serialization
+        # System events → broadcast to all connected modules
+        if event_type in SYSTEM_EVENTS:
+            for mid, queue in self._queues.items():
+                if mid == sender_id and not echo:
+                    continue
+                if raw is None:
+                    raw = _dumps(msg)
+                try:
+                    queue.put_nowait(raw)
+                except asyncio.QueueFull:
+                    pass
+                self._cnt_queued += 1
+            return
+        # Normal events → subscription-based routing
         for mid, patterns in self.subscriptions.items():
             if mid == sender_id and not echo:
                 continue
@@ -209,8 +229,6 @@ class EventHub:
                         try:
                             queue.put_nowait(raw)
                         except asyncio.QueueFull:
-                            # Best-effort: drop if queue is full and we can't await
-                            # (we're not in an async context in _route_event)
                             pass
                         self._cnt_queued += 1
                     break

package/kernel/registry_store.py CHANGED Viewed

@@ -77,7 +77,7 @@ class RegistryStore:
         # Strip action field — it's a request verb, not part of the registration payload
         record = {k: v for k, v in data.items() if k != "action"}
-        record["status"] = "online"
+        record["status"] = "registered"  # State machine: connected → registered (via register RPC)
         record["registered_at"] = time.time()
         self.modules[mid] = record
         self.heartbeats[mid] = time.time()
@@ -94,21 +94,38 @@ class RegistryStore:
         if module_id not in self.modules:
             return {"ok": False, "error": "module not registered"}
         self.heartbeats[module_id] = time.time()
-        self.modules[module_id]["status"] = "online"
+        # Don't change status — heartbeat just keeps alive, doesn't upgrade state
         return {"ok": True}
+    def set_connected(self, module_id: str):
+        """Mark a module as connected (WS established, not yet registered).
+        Only upgrades from offline; doesn't downgrade from registered/ready."""
+        if module_id in self.modules:
+            if self.modules[module_id].get("status") == "offline":
+                self.modules[module_id]["status"] = "connected"
+    def set_ready(self, module_id: str):
+        """Mark a module as ready (received module.ready event)."""
+        if module_id in self.modules:
+            self.modules[module_id]["status"] = "ready"
     def set_offline(self, module_id: str):
-        """Mark a module as offline (called on WebSocket disconnect)."""
+        """Mark a module as offline (called after debounce on WebSocket disconnect)."""
         if module_id in self.modules:
             self.modules[module_id]["status"] = "offline"
+    def is_ready(self, module_id: str) -> bool:
+        """Check if a module is in ready state."""
+        mod = self.modules.get(module_id)
+        return mod is not None and mod.get("status") == "ready"
     def check_ttl(self) -> list[str]:
         """Mark modules as offline if heartbeat expired. Returns list of newly-offline module_ids."""
         now = time.time()
         expired = []
         for mid, last in list(self.heartbeats.items()):
             if mid in self.modules and now - last > self.ttl:
-                if self.modules[mid].get("status") != "offline":
+                if self.modules[mid].get("status") not in ("offline",):
                     self.modules[mid]["status"] = "offline"
                     expired.append(mid)
         return expired
@@ -164,7 +181,7 @@ class RegistryStore:
         """
         results = []
         for mid, data in self.modules.items():
-            if data.get("status") != "online":
+            if data.get("status") not in ("registered", "ready"):
                 continue
             if module and not fnmatch.fnmatch(mid, module):
                 continue

package/kernel/rpc_router.py CHANGED Viewed

@@ -124,6 +124,12 @@ class RpcRouter:
         if dot_idx > 0:
             target = method[:dot_idx]
             if target in self.connections:
+                # Check if target module is ready (state machine protection)
+                if not self.registry.is_ready(target):
+                    await ws.send_text(_error_msg(
+                        msg_id, MODULE_OFFLINE,
+                        f"Module not ready: {target} (status: {self.registry.modules.get(target, {}).get('status', 'unknown')})"))
+                    return
                 await self._forward(caller_id, ws, msg_id, target, method, params)
                 return
             # Target not connected — check if registered but offline
@@ -247,10 +253,8 @@ class RpcRouter:
             # When Launcher registers, Kernel publishes its own module.ready
             if mid == "launcher" and self.kernel_server:
-                if not self.kernel_server._ready_published:
-                    self.kernel_server.publish_ready()
-                    self.kernel_server._ready_published = True
-                    print(f"[kernel] launcher registered → kernel module.ready published")
+                self.kernel_server.publish_ready()
+                print(f"[kernel] launcher registered → kernel module.ready published")
         return result
     async def _registry_deregister(self, caller_id: str, params: dict) -> dict:
@@ -303,6 +307,12 @@ class RpcRouter:
         event_type = params.get("event", "")
         data = params.get("data")
         echo = params.get("echo", False)
+        # When a module publishes module.ready, update its status in registry
+        if event_type == "module.ready":
+            mid = (data or {}).get("module_id", caller_id)
+            self.registry.set_ready(mid)
         return self.event_hub.publish_event(caller_id, event_id, event_type, data, echo)
     async def _event_subscribe(self, caller_id: str, params: dict) -> dict:
@@ -334,7 +344,7 @@ class RpcRouter:
             "module_count": len(self.registry.modules),
             "online_count": sum(
                 1 for m in self.registry.modules.values()
-                if m.get("status") == "online"
+                if m.get("status") in ("registered", "ready")
             ),
             "event_stats": eh_health.get("details", {}),
         }