@jack200714/mafw 4.5.2 → 4.10.1

package/gateway/dist/index.js

@@ -63,6 +63,8 @@ const stale_verify_1 = require("./recall/stale-verify");
 const session_worker_pool_1 = require("./recall/session-worker-pool");
 const reflect_cursor_1 = require("./recall/reflect-cursor");
 const index_scan_1 = require("./recall/index-scan");
+const redact_1 = require("./recall/redact");
+const waitwhat_command_1 = require("./routes/waitwhat-command");
 const consolidation_service_1 = require("./memory/consolidation-service");
 const auth_2 = require("./runtime/auth");
 const harmonic_file_store_2 = require("./memory/harmonic-file-store");
@@ -72,6 +74,7 @@ const media_service_1 = require("./media/media-service");
 const media_agent_1 = require("./media/media-agent");
 const pi_adapter_1 = require("./media/pi-adapter");
 const media_runtime_executor_1 = require("./media/media-runtime-executor");
+const resolve_prompt_1 = require("./media/resolve-prompt");
 const media_plugin_loader_1 = require("./media/media-plugin-loader");
 const tts_service_1 = require("./media/tts-service");
 const eval_endpoint_1 = require("./eval-endpoint");
@@ -99,14 +102,20 @@ const self_update_1 = require("./self-update");
 const step_inject_1 = require("./recall/step-inject");
 const inject_format_1 = require("./recall/inject-format");
 const normalize_1 = require("./runtime/normalize");
+const event_broadcast_1 = require("./runtime/event-broadcast");
 const budget_guard_1 = require("./core/budget-guard");
 const goal_budget_1 = require("./core/goal-budget");
 const contract_1 = require("./runtime/contract");
+const validate_1 = require("./runtime/validate");
 const loader_1 = require("./runtime/loader");
 const pi_runtime_1 = require("./runtime/plugins/pi-runtime");
 const permission_1 = require("./routes/permission");
+const event_publish_1 = require("./routes/event-publish");
 const runtime_switch_1 = require("./routes/runtime-switch");
 const plugins_1 = require("./routes/plugins");
+const package_host_1 = require("./plugins/package-host");
+const package_context_1 = require("./plugins/package-context");
+const hub_1 = require("./plugins/hub");
 const restart_agent_1 = require("./routes/restart-agent");
 const session_mutations_1 = require("./routes/session-mutations");
 const serve_supervisor_1 = require("./runtime/serve-supervisor");
@@ -144,6 +153,8 @@ async function isPortHealthy(port) {
         return false;
     }
 }
+const manager_session_runtime_1 = require("./core/manager/manager-session-runtime");
+const INTERNAL_SESSION_TTL_DAYS = 7;
 class MafwScheduler {
     serveInstance;
     serveUrl;
@@ -157,6 +168,10 @@ class MafwScheduler {
     serveOwned = false;
     serveExitStreak = 0;
     serveRecovering = false;
+    // External runtimes (pi) do not own serve: the watchdog can only warn and
+    // reconnect the event stream. Flag keeps that warning a one-shot ERROR per
+    // outage instead of an unbounded WARN loop.
+    serveExternalDownNotified = false;
     serveWatchdogTimer = null;
     serveRetryTimer = null;
     serveStableTimer = null;
@@ -169,6 +184,8 @@ class MafwScheduler {
     lastActiveBySession = new Map();
     lastWriteBySession = new Map();
     tokenWriterSession = null;
+    /** 畸形事件 warn 限频（每 runtime 30s 一次） */
+    malformedEventWarnAt = new Map();
     stopTokenWatcher = null;
     // Path 1 step-injection state (mark-before-async + dedup + queue). All
     // per-session entries expire via TtlMap.
@@ -206,8 +223,6 @@ class MafwScheduler {
     registeredProjects = new Map();
     registryPath;
     registryWriteQueue = Promise.resolve();
-    configPath;
-    configWriteQueue = Promise.resolve();
     running = true;
     // private dashboard?: DashboardServer;
     mcpEndpoint;
@@ -232,6 +247,8 @@ class MafwScheduler {
     mediaPluginLoader;
     mediaRuntimeExecutor;
     mediaRuntimeExecutorRt;
+    pluginHost;
+    usageStatsProvider;
     ttsService;
     kernels;
     automationEngine;
@@ -252,7 +269,6 @@ class MafwScheduler {
         this.serveUrl = config_1.config.server.serveUrl;
         this.apiPort = config_1.config.server.apiPort;
         this.pollInterval = config_1.config.timeouts.backupPollInterval;
-        this.configPath = config_1.config.paths.globalConfig;
         this.registryPath = config_1.config.paths.registryFile;
         this.chatSessions = new chat_sessions_1.ChatSessionManager();
         this.serveSupervisor = (0, serve_supervisor_1.createServeSupervisor)({
@@ -357,6 +373,16 @@ class MafwScheduler {
         await this.runtimeLoader.init();
         // 内置插件注册：pi-coding-agent runtime（进程内 SDK 嵌入）
         this.runtimeLoader.registerBuiltin('pi', pi_runtime_1.createPiRuntime, pi_runtime_1.PI_CAPABILITIES, true);
+        // 2b. 统一插件包宿主（必须在 createRuntime 之前 init——包 runtime 贡献要先注册）
+        this.pluginHost = new package_host_1.PluginHost(process.env.MAFW_PLUGINS_DIR || config_1.config.resolvePath('plugins'), (name) => (0, package_context_1.createPluginPackageContext)(name, {
+            getCredentials: () => this.opencodeClient?.credentials ?? undefined,
+            usageStats: () => this.usageStatsProvider,
+            projectDir: this.projectDir,
+            gatewayPort: config_1.config.server.apiPort,
+            emit: (event) => this.broadcast(event),
+        }));
+        this.pluginHost.bindRuntime((entries) => this.runtimeLoader?.setPackageEntries(entries));
+        await this.pluginHost.init();
         // 3. 创建 SDK 客户端（auth），用于健康检查和后续通信
         const sdkConfig = {
             baseUrl: this.serveUrl,
@@ -367,6 +393,12 @@ class MafwScheduler {
         if (opencodePassword) {
             sdkConfig.headers = { Authorization: 'Basic ' + Buffer.from(`opencode:${opencodePassword}`).toString('base64') };
         }
+        // opencode 注册为正式内置插件（与用户插件同一接口；同名文件/包可覆盖）
+        const sdkSnapshot = { ...sdkConfig, headers: { ...sdkConfig.headers } };
+        this.runtimeLoader.registerBuiltin('opencode', async () => (await import('./runtime/opencode-runtime.js')).createOpencodeRuntime({
+            ...sdkSnapshot,
+            headers: { ...sdkSnapshot.headers },
+        }), (0, contract_1.fullCapabilities)(), !!process.env.MAFW_SERVER_SERVE_URL);
         const runtime = await this.createRuntime(sdkConfig);
         this.opencodeClient = runtime;
         this.runtimeCaps = runtime.capabilities;
@@ -423,8 +455,7 @@ class MafwScheduler {
         // 4. Dashboard is now served via the API server on the same port
         // this.dashboard = new DashboardServer(3001, this.projectDir, this);
         // this.dashboard.start();
-        // 5. 恢复配置和注册表
-        await this.recoverConfig();
+        // 5. 恢复注册表（权威源：gateway DB kv_store + legacy 文件兜底）
         await this.recoverRegistry();
         // 5.0 Data-directory migration: move memory store + pipeline files from
         // the previously-fixed gateway package .mafw (and any project-relative
@@ -598,7 +629,7 @@ class MafwScheduler {
         }
         else {
             try {
-                const ms = this.getGatewayDb().kvGet('manager-session', this.projectDir);
+                const ms = this.readManagerSessionEntry(this.projectDir);
                 if (ms?.sessionId)
                     targets.add(ms.sessionId);
             }
@@ -642,8 +673,10 @@ class MafwScheduler {
                 if (changed.includes('runtime')) {
                     const newPlugin = config_1.config.runtime?.plugin;
                     if (newPlugin !== prevPlugin && !this.switchingRuntime && !this.serveRecovering) {
-                        logger_1.log.info(`[Scheduler] Runtime plugin changed: '${prevPlugin ?? 'builtin'}' → '${newPlugin ?? 'builtin'}'; hot-switching...`);
+                        this.switchingRuntime = true;
+                        const prev = this.opencodeClient;
                         try {
+                            logger_1.log.info(`[Scheduler] Runtime plugin changed: '${prevPlugin ?? 'builtin'}' → '${newPlugin ?? 'builtin'}'; hot-switching...`);
                             const sdkConfig = {
                                 baseUrl: this.serveUrl,
                                 directory: this.projectDir,
@@ -668,11 +701,28 @@ class MafwScheduler {
                             if (this.automationEngine)
                                 this.automationEngine.setRuntimeClient(runtime);
                             await this.resubscribeEvents(`config hot-reload runtime plugin changed to '${newPlugin ?? 'builtin'}'`);
+                            // Same desktop hint as the route path: hand-edited config.yaml
+                            // switches must also refresh the renderer (menus/tabs/manager kv).
+                            this.broadcast({ type: 'runtime_switched', runtime: runtime.name, previous: prevPlugin ?? null });
+                            // Dispose the previous runtime AFTER the new one is fully wired
+                            // (mirror of the route path) — without this, switching away from
+                            // pi leaks its AgentSessions/ApprovalBridges/event stream.
+                            if (prev && prev.dispose) {
+                                try {
+                                    await prev.dispose();
+                                }
+                                catch (err) {
+                                    logger_1.log.warn(`[Scheduler] dispose previous runtime failed: ${err.message}`);
+                                }
+                            }
                             logger_1.log.info(`[Scheduler] Runtime hot-switched to '${runtime.name}'`);
                         }
                         catch (err) {
                             logger_1.log.warn(`[Scheduler] Runtime hot-switch failed (non-fatal): ${err.message}`);
                         }
+                        finally {
+                            this.switchingRuntime = false;
+                        }
                     }
                 }
             }, 300);
@@ -773,7 +823,8 @@ class MafwScheduler {
                         registeredAt: new Date().toISOString()
                     });
                     this.persistRegistry();
-                    this.persistConfig();
+                    // 桌面 renderer 依此事件刷新 Rail 项目列表（否则只在 gateway ready 时拉一次）。
+                    this.broadcast((0, event_broadcast_1.projectRegisteredEvent)(projectDir));
                     logger_1.log.info(`[Scheduler] Project registered via filesystem: ${projectDir}`);
                 }
                 catch {
@@ -846,6 +897,23 @@ class MafwScheduler {
     }
     handleOpencodeEvent(evt) {
         const f = (0, normalize_1.normalizeOpencodeEvent)(evt);
+        // 畸形事件诊断（限频）：runtime 插件发来的事件 type/properties 全空时
+        // 静默穿过会污染 trajectory 与桌面 SSE——这里给可定位诊断。
+        if ((0, normalize_1.isMalformedEvent)(evt)) {
+            const now = Date.now();
+            const last = this.malformedEventWarnAt.get(this.runtimeName) ?? 0;
+            if (now - last > 30_000) {
+                this.malformedEventWarnAt.set(this.runtimeName, now);
+                let summary;
+                try {
+                    summary = JSON.stringify(evt)?.slice(0, 200) ?? '(unserializable)';
+                }
+                catch {
+                    summary = '(unserializable)';
+                }
+                logger_1.log.warn(`[SSE] malformed event from runtime '${this.runtimeName}' (no type/properties) — dropped consumers may misbehave; payload: ${summary}`);
+            }
+        }
         const { type, properties: props, sessionID } = f;
         // Only memory-system sessions (index-scan / extract / reflect workers) are
         // internal: their token-level deltas flooded the desktop renderer (per-delta
@@ -952,13 +1020,15 @@ class MafwScheduler {
             catch (err) {
                 logger_1.log.warn(`[Trajectory] idle aggregation failed (non-fatal): ${err.message}`);
             }
-            this.broadcast({ type: 'opencode_event', data: { type: 'message.complete', sessionID, ...(memoryWorker ? { internal: true } : {}) } });
+            this.broadcast((0, event_broadcast_1.opencodeBroadcast)({ type: 'message.complete', sessionID }, memoryWorker));
         }
         else if (f.broadcast === 'error') {
-            this.broadcast({ type: 'opencode_event', data: { type: 'message.error', sessionID, error: props?.error instanceof Error ? props.error.message : String(props?.error ?? 'Unknown error'), ...(memoryWorker ? { internal: true } : {}) } });
+            this.broadcast((0, event_broadcast_1.opencodeBroadcast)({ type: 'message.error', sessionID, error: props?.error instanceof Error ? props.error.message : String(props?.error ?? 'Unknown error') }, memoryWorker));
         }
         else {
-            this.broadcast({ type: 'opencode_event', data: { type, properties: props, sessionID, ...(memoryWorker ? { internal: true } : {}) } });
+            // directory 透传：session.created/updated/deleted 的消费方（桌面 Rail）
+            // 据此定位所属项目做定向刷新（normalize 已从 GlobalEvent 信封提取）。
+            this.broadcast((0, event_broadcast_1.opencodeBroadcast)({ type, properties: props, sessionID, directory: f.directory }, memoryWorker));
         }
     }
     /** 能力门：runtime 未声明该能力时以 503 显式拒绝（fail-open 的声明式降级）。 */
@@ -988,7 +1058,18 @@ class MafwScheduler {
             if (plugin) {
                 try {
                     const creds = await this.runtimeCredentialsForPlugin();
-                    const rt = await plugin.createRuntime((0, loader_1.createRuntimePluginContext)(creds));
+                    const rt = await plugin.createRuntime((0, loader_1.createRuntimePluginContext)(creds, {
+                        projectDir: this.projectDir,
+                        gatewayPort: config_1.config.server.apiPort,
+                    }));
+                    // 声明 vs 实现一致性校验：错位插件在切换/启动期给出字段级诊断并回退，
+                    // 而不是运行时深处才炸。
+                    const issues = (0, validate_1.validateRuntimeShape)(rt, pluginName);
+                    if (issues.length > 0) {
+                        for (const issue of issues)
+                            logger_1.log.error(`[Runtime] shape violation: ${issue}`);
+                        throw new Error(`runtime '${rt.name}' failed shape validation (${issues.length} issue(s)) — see logs`);
+                    }
                     logger_1.log.info(`[Runtime] using plugin runtime '${rt.name}' (capabilities: ${JSON.stringify(rt.capabilities)})`);
                     return rt;
                 }
@@ -1000,6 +1081,11 @@ class MafwScheduler {
                 logger_1.log.warn(`[Runtime] plugin '${pluginName}' not found — falling back to opencode`);
             }
         }
+        const builtin = this.runtimeLoader?.get('opencode');
+        if (builtin) {
+            return builtin.createRuntime((0, loader_1.createRuntimePluginContext)(undefined));
+        }
+        // 最终安全网：loader 未注册时直连（不应发生）
         const { createOpencodeRuntime } = await import('./runtime/opencode-runtime.js');
         return createOpencodeRuntime({
             ...sdkConfig,
@@ -1706,6 +1792,7 @@ class MafwScheduler {
         }
         this.pluginLoader?.stop();
         this.mediaPluginLoader?.stop();
+        this.pluginHost?.stop();
         if (this.opencodeClient && typeof this.opencodeClient.dispose === 'function') {
             void this.opencodeClient.dispose().catch((err) => {
                 logger_1.log.warn(`[Scheduler] runtime dispose error: ${err?.message ?? String(err)}`);
@@ -1719,32 +1806,6 @@ class MafwScheduler {
         // }
         logger_1.log.info('[Scheduler] Stopping...');
     }
-    // Proxy a native opencode request by trying every registered workspace.
-    // Native reply/reject routes are workspace-scoped (WorkspaceRoutingMiddleware),
-    // but the gateway's own projectDir is its cwd — the request may belong to any
-    // registered project. GET list endpoints are cross-workspace and unaffected.
-    async proxyNativeWorkspaces(path, method, body) {
-        const dirs = new Set([this.projectDir || '.']);
-        for (const key of this.registeredProjects.keys())
-            dirs.add(key);
-        let lastStatus = 502;
-        for (const dir of dirs) {
-            try {
-                const r = await fetch(`${this.serveUrl}${path}?directory=${encodeURIComponent(dir)}`, {
-                    method,
-                    headers: { 'content-type': 'application/json', 'x-opencode-directory': encodeURIComponent(dir) },
-                    ...(body !== undefined ? { body: JSON.stringify(body) } : {}),
-                });
-                if (r.ok)
-                    return { ok: true, status: r.status };
-                lastStatus = r.status;
-            }
-            catch (e) {
-                logger_1.log.error(`[Native proxy] ${path} failed for ${dir}: ${e.message}`);
-            }
-        }
-        return { ok: false, status: lastStatus };
-    }
     // 鈹€鈹€ Services & Event Bus 鈹€鈹€
     async initServices() {
         const projectDir = this.projectDir;
@@ -1769,6 +1830,9 @@ class MafwScheduler {
             getCredentials: () => this.opencodeClient?.credentials ?? undefined,
         });
         await this.mediaPluginLoader.init();
+        this.pluginHost?.bindMedia((entries) => this.mediaPluginLoader?.setPackageEntries(entries));
+        // 内置 pi 引擎登记（可被用户同名包/文件覆盖——resolveMediaPrompt 语义）
+        this.mediaPluginLoader.registerBuiltinEngine('pi', ['image', 'video', 'audio']);
         this.mediaService = new media_service_1.MediaService({
             prompt: (0, pi_adapter_1.createPiPromptAdapter)({
                 getApiKey: (provider) => {
@@ -1778,31 +1842,24 @@ class MafwScheduler {
             config: () => config_1.config.raw.media,
             resolvePrompt: (kind, cfg) => {
                 const engineName = cfg[kind]?.engine ?? cfg.engine ?? 'pi';
-                // pi runtime 激活时：图片走 AgentRuntime 会话（MediaRuntimeExecutor），
-                // video/audio 由 executor 内部回退到 complete 路径
-                if (engineName === 'pi' && this.opencodeClient?.name === 'pi') {
-                    // runtime 热切换后 opencodeClient 实例更换——旧 executor 持有 stale
-                    // runtime 引用，必须重建（dispose 尽力而为，不阻塞 prompt）。
-                    if (!this.mediaRuntimeExecutor || this.mediaRuntimeExecutorRt !== this.opencodeClient) {
-                        void this.mediaRuntimeExecutor?.dispose().catch(() => { });
-                        this.mediaRuntimeExecutor = (0, media_runtime_executor_1.createMediaRuntimeExecutor)(this.opencodeClient);
-                        this.mediaRuntimeExecutorRt = this.opencodeClient;
-                    }
-                    return this.mediaRuntimeExecutor.prompt;
-                }
-                if (engineName === 'pi')
-                    return undefined;
-                const engines = this.mediaPluginLoader?.getEngines();
-                const engine = engines?.get(engineName);
-                if (!engine) {
-                    logger_1.log.warn(`[MediaService] engine '${engineName}' not found, falling back to pi`);
-                    return undefined;
-                }
-                if (!engine.modalities.includes(kind)) {
-                    logger_1.log.warn(`[MediaService] engine '${engineName}' does not support modality '${kind}', falling back to pi`);
-                    return undefined;
-                }
-                return engine.prompt;
+                return (0, resolve_prompt_1.resolveMediaPrompt)(engineName, kind, {
+                    engines: this.mediaPluginLoader?.getEngines() ?? new Map(),
+                    builtinPi: () => {
+                        // pi runtime 激活时：图片走 AgentRuntime 会话（MediaRuntimeExecutor），
+                        // video/audio 由 executor 内部回退到 complete 路径
+                        if (this.opencodeClient?.name === 'pi') {
+                            // runtime 热切换后 opencodeClient 实例更换——旧 executor 持有 stale
+                            // runtime 引用，必须重建（dispose 尽力而为，不阻塞 prompt）。
+                            if (!this.mediaRuntimeExecutor || this.mediaRuntimeExecutorRt !== this.opencodeClient) {
+                                void this.mediaRuntimeExecutor?.dispose().catch(() => { });
+                                this.mediaRuntimeExecutor = (0, media_runtime_executor_1.createMediaRuntimeExecutor)(this.opencodeClient);
+                                this.mediaRuntimeExecutorRt = this.opencodeClient;
+                            }
+                            return this.mediaRuntimeExecutor.prompt;
+                        }
+                        return undefined;
+                    },
+                });
             },
         });
         // Determine workspace name: if projectDir resolves to a 'gateway' subdirectory,
@@ -1911,6 +1968,9 @@ class MafwScheduler {
             const collector = new TrajectoryCollector(trajStore, this.getGatewayDb(), projectDir, () => config_1.config.trajectory.retentionDays);
             collector.setRoleFor((sid) => this.internalSessionRoles.get(sid) ?? null);
             this.trajectoryCollector = collector;
+            const pruned = this.getGatewayDb().kvPruneOlderThan('internal-session', INTERNAL_SESSION_TTL_DAYS);
+            if (pruned > 0)
+                logger_1.log.info(`[Scheduler] pruned ${pruned} stale internal-session kv entries (> ${INTERNAL_SESSION_TTL_DAYS}d)`);
             const restored = this.getGatewayDb().kvAll('internal-session');
             for (const { key: sid, value } of restored) {
                 if (value?.role && !this.internalSessionRoles.has(sid)) {
@@ -1927,10 +1987,12 @@ class MafwScheduler {
             const pluginsDir = path.join(os.homedir(), '.mafw', 'usage-plugins');
             const builtinPluginsDir = path.join(__dirname, 'usage', 'builtin-plugins');
             const disabledPlugins = Array.isArray(config_1.config.usage?.disabledPlugins) ? config_1.config.usage.disabledPlugins : [];
+            const statsProvider = createUsageStatsProvider(trajStore);
+            this.usageStatsProvider = statsProvider;
             const pluginLoader = new PluginLoader(pluginsDir, [], {
                 builtinPluginsDir,
                 disabledPlugins,
-                usageStats: createUsageStatsProvider(trajStore),
+                usageStats: statsProvider,
                 // inline provider key 兜底（auth.json 无条目的自建 provider，如 gateway）——
                 // thunk 惰性求值，opencodeClient 此时尚未初始化也不影响。
                 resolveInlineApiKey: async (providerID) => {
@@ -1946,6 +2008,7 @@ class MafwScheduler {
             });
             await pluginLoader.init();
             this.pluginLoader = pluginLoader;
+            this.pluginHost?.bindUsage((entries) => pluginLoader.setPackageEntries(entries));
             const { UsagePoller } = require('./usage/usage-poller');
             this.usagePoller = new UsagePoller(trajStore, () => config_1.config.usage.limits, () => config_1.config.usage.budgets, pluginLoader);
             logger_1.log.info('[Trajectory] store initialized');
@@ -2050,6 +2113,18 @@ class MafwScheduler {
     handleServeExit(code) {
         if (!this.serveOwned || this.serveRecovering)
             return;
+        // After a hot-switch to an in-process/external runtime, the (still owned)
+        // opencode serve is no longer the active backend: its exit must NOT trigger
+        // recovery — pi has no spawnServe, so the orchestrator would fall into the
+        // supervisor's kill+spawn path and retry forever (killing whatever listens
+        // on the serve port each cycle). A later switch back re-ensures via
+        // ensureServeForBuiltinRuntime (probe → adopt or spawn).
+        const rt = this.opencodeClient;
+        if (rt?.external || !rt?.agentProcess?.spawnServe) {
+            this.serveOwned = false;
+            logger_1.log.info('[Scheduler] owned serve exited after runtime switch; recovery skipped (active runtime does not own serve)');
+            return;
+        }
         this.serveInstance = undefined;
         if (this.serveStableTimer) {
             clearTimeout(this.serveStableTimer);
@@ -2122,6 +2197,10 @@ class MafwScheduler {
             if (!this.running || this.serveRecovering)
                 return;
             if (await this.isServeHealthy()) {
+                if (failures > 0 || this.serveExternalDownNotified) {
+                    logger_1.log.info('[Scheduler] Serve back online');
+                }
+                this.serveExternalDownNotified = false;
                 failures = 0;
                 return;
             }
@@ -2130,7 +2209,10 @@ class MafwScheduler {
             if (failures >= this.serveWatchdogFailures) {
                 failures = 0;
                 if (this.opencodeClient?.external) {
-                    logger_1.log.warn('[Scheduler] External serve unreachable; reconnecting event stream only (not killing external process)');
+                    if (!this.serveExternalDownNotified) {
+                        this.serveExternalDownNotified = true;
+                        logger_1.log.error('[Scheduler] External serve unreachable — the active runtime does not own the serve process, so it will NOT be respawned. Serve-dependent features (provider list, sessions, approvals) are degraded.');
+                    }
                     try {
                         await this.subscribeToEvents();
                     }
@@ -3129,6 +3211,32 @@ class MafwScheduler {
                                 res.end(JSON.stringify({ ok: true, text: answer }));
                                 return;
                             }
+                            if (cmd === "waitwhat") {
+                                if (!sessionID) {
+                                    res.writeHead(400);
+                                    res.end(JSON.stringify({ ok: false, error: "sessionID required" }));
+                                    return;
+                                }
+                                if (!this.opencodeClient) {
+                                    res.writeHead(503);
+                                    res.end(JSON.stringify({ ok: false, error: "LLM client not available" }));
+                                    return;
+                                }
+                                const result = await (0, waitwhat_command_1.runWaitwhat)(String(sessionID), {
+                                    listMessages: async (sid) => {
+                                        const r = await this.opencodeClient.session.messages({ sessionID: sid, limit: 50 });
+                                        return (r?.data || []);
+                                    },
+                                    promptAsync: async (sid, text) => {
+                                        await this.opencodeClient.session.promptAsync({ sessionID: sid, parts: [{ type: "text", text }] });
+                                    },
+                                });
+                                res.writeHead(result.ok ? 200 : 400, { 'Content-Type': 'application/json' });
+                                res.end(JSON.stringify(result.ok
+                                    ? { ok: true, message: '重述请求已发送到当前会话' }
+                                    : { ok: false, error: result.error }));
+                                return;
+                            }
                             if (cmd === "status") {
                                 const statusPath = path.join(this.mafwDir, 'STATUS.md');
                                 const text = fs.existsSync(statusPath) ? fs.readFileSync(statusPath, 'utf-8') : 'No active Goals. Use /goal to create one.';
@@ -3600,7 +3708,8 @@ class MafwScheduler {
                                 });
                                 // 持久化到磁盘（写队列防并发覆盖）
                                 await this.persistRegistry();
-                                await this.persistConfig();
+                                // 桌面 renderer 依此事件刷新 Rail 项目列表（否则只在 gateway ready 时拉一次）。
+                                this.broadcast((0, event_broadcast_1.projectRegisteredEvent)(projectDir));
                                 if (this.opencodeClient) {
                                     try {
                                         await this.ensureManagerSession(projectDir, mafwDir);
@@ -3737,8 +3846,14 @@ class MafwScheduler {
                         const filter = parsedUrl.searchParams.get('projectDir') || '';
                         try {
                             const all = this.getGatewayDb().kvAll('manager-session');
+                            // Per-runtime slots: surface only the ACTIVE runtime's manager
+                            // slot per project. Other runtimes' slots stay dormant (resumed
+                            // when switching back) — nothing is deleted here.
+                            const live = all
+                                .map((e) => ({ key: e.key, value: (0, manager_session_runtime_1.readManagerSlot)(e.value, this.runtimeName) }))
+                                .filter((e) => e.value !== null);
                             if (filter) {
-                                const found = all.find((e) => e.key === filter);
+                                const found = live.find((e) => e.key === filter);
                                 if (!found) {
                                     res.writeHead(404);
                                     res.end(JSON.stringify({ error: 'No manager session for project' }));
@@ -3752,13 +3867,13 @@ class MafwScheduler {
                                 }));
                                 return;
                             }
-                            if (all.length === 0) {
+                            if (live.length === 0) {
                                 res.writeHead(404);
                                 res.end(JSON.stringify({ error: 'No manager session' }));
                                 return;
                             }
                             res.writeHead(200);
-                            res.end(JSON.stringify(all.map((e) => ({
+                            res.end(JSON.stringify(live.map((e) => ({
                                 projectDir: e.key,
                                 sessionId: e.value.sessionId,
                                 createdAt: e.value.createdAt || null,
@@ -3969,17 +4084,15 @@ class MafwScheduler {
                         return;
                     }
                     // 鈹€鈹€ Question endpoints (AskCard 鈹€ proxy to native opencode Question API) 鈹€鈹€
-                    // GET /api/questions 鈹€ list pending questions
+                    // GET /api/questions ── list pending questions（契约：session.question.list）
                     if (req.url?.match(/^\/api\/questions(?:\?|$)/) && req.method === 'GET') {
                         if (this.capGuardQuestion(res))
                             return;
                         try {
-                            const dir = new URL(req.url, this.serveUrl).searchParams.get('directory') || this.projectDir || '.';
-                            const r = await fetch(`${this.serveUrl}/question?directory=${encodeURIComponent(dir)}`, {
-                                headers: { 'x-opencode-directory': encodeURIComponent(dir) },
-                            });
-                            const items = await r.json();
-                            res.end(JSON.stringify({ items }));
+                            const dir = new URL(req.url, this.serveUrl).searchParams.get('directory') || this.projectDir || undefined;
+                            const question = this.opencodeClient?.session?.question;
+                            const items = question ? await question.list(dir ? { directory: dir } : undefined) : [];
+                            res.end(JSON.stringify({ items: items ?? [] }));
                         }
                         catch (err) {
                             logger_1.log.error('[Question] list error:', err.message);
@@ -3987,20 +4100,34 @@ class MafwScheduler {
                         }
                         return;
                     }
-                    // POST /api/questions/{id}/reply 鈹€ { answers: string[][] }
+                    // POST /api/questions/{id}/reply ── { answers: string[][] }（契约 + workspace 重试）
                     const qReplyMatch = req.url?.match(/^\/api\/questions\/([^/]+)\/reply(?:\?|$)/);
                     if (qReplyMatch && req.method === 'POST') {
                         if (this.capGuardQuestion(res))
                             return;
+                        const question = this.opencodeClient?.session?.question;
+                        if (!question) {
+                            res.writeHead(503);
+                            res.end(JSON.stringify({ status: 'error', error: 'question API not available on this runtime' }));
+                            return;
+                        }
                         try {
                             const body = JSON.parse(await readBody(req));
-                            const r = await this.proxyNativeWorkspaces(`/question/${qReplyMatch[1]}/reply`, 'POST', { answers: body.answers });
-                            if (!r.ok) {
-                                res.writeHead(r.status);
-                                res.end(JSON.stringify({ status: 'error', code: r.status }));
-                                return;
+                            // workspace 路由：默认（SDK 自带 projectDir）→ 各注册项目逐试
+                            const dirs = [undefined, this.projectDir, ...this.registeredProjects.keys()];
+                            let lastErr = null;
+                            for (const dir of [...new Set(dirs)]) {
+                                try {
+                                    await question.reply({ requestID: qReplyMatch[1], answers: body.answers, ...(dir ? { directory: dir } : {}) });
+                                    res.end(JSON.stringify({ status: 'ok' }));
+                                    return;
+                                }
+                                catch (err) {
+                                    lastErr = err;
+                                }
                             }
-                            res.end(JSON.stringify({ status: 'ok' }));
+                            res.writeHead(400);
+                            res.end(JSON.stringify({ status: 'error', error: lastErr?.message ?? 'question reply failed on all workspaces' }));
                         }
                         catch (err) {
                             logger_1.log.error('[Question] reply error:', err.message);
@@ -4009,19 +4136,32 @@ class MafwScheduler {
                         }
                         return;
                     }
-                    // POST /api/questions/{id}/reject
+                    // POST /api/questions/{id}/reject（契约 + workspace 重试）
                     const qRejectMatch = req.url?.match(/^\/api\/questions\/([^/]+)\/reject(?:\?|$)/);
                     if (qRejectMatch && req.method === 'POST') {
                         if (this.capGuardQuestion(res))
                             return;
+                        const question = this.opencodeClient?.session?.question;
+                        if (!question) {
+                            res.writeHead(503);
+                            res.end(JSON.stringify({ status: 'error', error: 'question API not available on this runtime' }));
+                            return;
+                        }
                         try {
-                            const r = await this.proxyNativeWorkspaces(`/question/${qRejectMatch[1]}/reject`, 'POST');
-                            if (!r.ok) {
-                                res.writeHead(r.status);
-                                res.end(JSON.stringify({ status: 'error', code: r.status }));
-                                return;
+                            const dirs = [undefined, this.projectDir, ...this.registeredProjects.keys()];
+                            let lastErr = null;
+                            for (const dir of [...new Set(dirs)]) {
+                                try {
+                                    await question.reject({ requestID: qRejectMatch[1], ...(dir ? { directory: dir } : {}) });
+                                    res.end(JSON.stringify({ status: 'ok' }));
+                                    return;
+                                }
+                                catch (err) {
+                                    lastErr = err;
+                                }
                             }
-                            res.end(JSON.stringify({ status: 'ok' }));
+                            res.writeHead(400);
+                            res.end(JSON.stringify({ status: 'error', error: lastErr?.message ?? 'question reject failed on all workspaces' }));
                         }
                         catch (err) {
                             logger_1.log.error('[Question] reject error:', err.message);
@@ -4031,17 +4171,16 @@ class MafwScheduler {
                         return;
                     }
                     // 鈹€鈹€ Permission endpoints (PermissionCard 鈹€ proxy to native opencode Permission API) 鈹€鈹€
-                    // GET /api/permissions 鈹€ list pending permission requests
+                    // GET /api/permissions ── list pending permission requests（契约：session.permissionList）
                     if (req.url?.match(/^\/api\/permissions(?:\?|$)/) && req.method === 'GET') {
                         if (this.capGuard(res, 'nativeApprovals'))
                             return;
                         try {
-                            const dir = new URL(req.url, this.serveUrl).searchParams.get('directory') || this.projectDir || '.';
-                            const r = await fetch(`${this.serveUrl}/permission?directory=${encodeURIComponent(dir)}`, {
-                                headers: { 'x-opencode-directory': encodeURIComponent(dir) },
-                            });
-                            const items = await r.json();
-                            res.end(JSON.stringify({ items }));
+                            const dir = new URL(req.url, this.serveUrl).searchParams.get('directory') || this.projectDir || undefined;
+                            const items = this.opencodeClient?.session?.permissionList
+                                ? await this.opencodeClient.session.permissionList(dir ? { directory: dir } : undefined)
+                                : [];
+                            res.end(JSON.stringify({ items: items ?? [] }));
                         }
                         catch (err) {
                             logger_1.log.error('[Permission] list error:', err.message);
@@ -4089,6 +4228,9 @@ class MafwScheduler {
                                 if (this.automationEngine)
                                     this.automationEngine.setRuntimeClient(rt);
                                 await this.resubscribeEvents(`runtime switched to '${rt.name}'`);
+                                // Desktop hint: a runtime switch swaps the session storage backend
+                                // (opencode SQLite vs pi), so cached session lists are stale.
+                                this.broadcast({ type: 'runtime_switched', runtime: rt.name, previous: prev?.name ?? null });
                                 if (prev && prev.dispose) {
                                     try {
                                         await prev.dispose();
@@ -4144,6 +4286,23 @@ class MafwScheduler {
                                 usage: config_1.config.resolvePath('usage-plugins'),
                                 ui: process.env.MAFW_UI_PLUGINS_DIR || path.join(os.homedir(), '.mafw', 'ui-plugins'),
                             },
+                            builtinEntries: () => {
+                                const entries = [];
+                                const rt = (name) => ({ type: 'runtime', name, file: '(builtin)', status: 'enabled', size: 0, mtime: '' });
+                                // opencode 经 registerBuiltin 注册，getBuiltinNames 已含——不再手工 push（防重复）
+                                for (const name of this.runtimeLoader?.getBuiltinNames?.() ?? [])
+                                    entries.push(rt(name));
+                                for (const name of this.mediaPluginLoader?.getBuiltinEngineNames?.() ?? []) {
+                                    entries.push({ type: 'media', name, file: '(builtin)', status: 'enabled', size: 0, mtime: '' });
+                                }
+                                const usageState = this.pluginLoader?.getState?.() ?? [];
+                                for (const s of usageState) {
+                                    if (s.builtin && s.status === 'ok' && s.name) {
+                                        entries.push({ type: 'usage', name: s.name, file: s.file, status: 'enabled', size: 0, mtime: '', pluginType: s.pluginType });
+                                    }
+                                }
+                                return entries;
+                            },
                             getErrors: (type) => {
                                 const stateOf = (loader) => (loader && typeof loader.getState === 'function' ? loader.getState() : []);
                                 const source = type === 'runtime' ? this.runtimeLoader : type === 'media' ? this.mediaPluginLoader : type === 'usage' ? this.pluginLoader : null;
@@ -4164,8 +4323,19 @@ class MafwScheduler {
                                     await this.pluginLoader?.reload();
                                 // ui: desktop main fs.watch picks it up automatically
                             },
+                            getPackages: () => this.pluginHost?.getState() ?? [],
                         },
                     };
+                    try {
+                        const cleaned = (0, hub_1.cleanupExamples)(pluginHubDeps.hub);
+                        if (cleaned.removed.length)
+                            logger_1.log.info(`[PluginsHub] removed stale examples: ${cleaned.removed.length}`);
+                        if (cleaned.failed.length)
+                            logger_1.log.warn(`[PluginsHub] cleanupExamples failed: ${cleaned.failed.join(', ')}`);
+                    }
+                    catch (err) {
+                        logger_1.log.warn(`[PluginsHub] cleanupExamples error: ${err.message}`);
+                    }
                     if (req.method === 'GET' && req.url?.match(/^\/api\/plugins(?:\?|$)/)) {
                         await (0, plugins_1.handlePluginsList)(req, res, pluginHubDeps);
                         return;
@@ -4281,20 +4451,37 @@ class MafwScheduler {
                         }
                         return;
                     }
-                    // POST /api/permissions/{id}/reply 鈹€ { reply: 'once'|'always'|'reject', message?: string }
+                    // POST /api/permissions/{id}/reply ── { reply, message? }（契约：列表反查 sessionID → permissionReply）
                     const pReplyMatch = req.url?.match(/^\/api\/permissions\/([^/]+)\/reply(?:\?|$)/);
                     if (pReplyMatch && req.method === 'POST') {
                         if (this.capGuard(res, 'nativeApprovals'))
                             return;
+                        const runtime = this.opencodeClient;
+                        if (!runtime?.session?.permissionList || !runtime?.session?.permissionReply) {
+                            res.writeHead(503);
+                            res.end(JSON.stringify({ status: 'error', error: 'permission API not available on this runtime' }));
+                            return;
+                        }
                         try {
                             const body = JSON.parse(await readBody(req));
-                            const payload = { reply: body.reply };
-                            if (body.message)
-                                payload.message = body.message;
-                            const r = await this.proxyNativeWorkspaces(`/permission/${pReplyMatch[1]}/reply`, 'POST', payload);
-                            if (!r.ok) {
-                                res.writeHead(r.status);
-                                res.end(JSON.stringify({ status: 'error', code: r.status }));
+                            const reply = body.reply;
+                            if (reply !== 'once' && reply !== 'always' && reply !== 'reject') {
+                                res.writeHead(400);
+                                res.end(JSON.stringify({ status: 'error', error: "reply must be 'once'|'always'|'reject'" }));
+                                return;
+                            }
+                            // 反查 sessionID：pending 列表项携带（跨 runtime 形状一致）
+                            const pending = await runtime.session.permissionList();
+                            const found = (Array.isArray(pending) ? pending : []).find((p) => p?.id === pReplyMatch[1]);
+                            if (!found?.sessionID) {
+                                res.writeHead(404);
+                                res.end(JSON.stringify({ status: 'error', error: 'permission request not found' }));
+                                return;
+                            }
+                            const ok = await runtime.session.permissionReply(found.sessionID, pReplyMatch[1], reply, body.message);
+                            if (!ok) {
+                                res.writeHead(404);
+                                res.end(JSON.stringify({ status: 'error', error: 'permission request not found' }));
                                 return;
                             }
                             res.end(JSON.stringify({ status: 'ok' }));
@@ -5142,7 +5329,10 @@ class MafwScheduler {
                                     session_id: sessionID,
                                     turn_id: turnId,
                                     source: source,
-                                    content: content.slice(0, 100_000),
+                                    // Redact secrets once at capture so every downstream consumer
+                                    // (turnCompress transcripts, worker prompts, archive) only
+                                    // ever sees redacted content.
+                                    content: (0, redact_1.redactSecrets)(content).slice(0, 100_000),
                                     failure,
                                 });
                                 // Async scan prefetch: precompute semantic recall for this turn
@@ -5162,6 +5352,11 @@ class MafwScheduler {
                         });
                         return;
                     }
+                    // POST /api/events —— 事件发布（插件/外部程序 → 全 UI 通道；契约见 routes/event-publish.ts）
+                    if (req.url && req.url.startsWith('/api/events') && req.method === 'POST') {
+                        await (0, event_publish_1.handleEventPublish)({ broadcast: (e) => this.broadcast(e) }, req, res);
+                        return;
+                    }
                     // SSE 事件（→ Dashboard / Chat）
                     if (req.url && req.url.startsWith('/api/events') && req.method === 'GET') {
                         const parsedUrl = new URL(req.url, `http://${req.headers.host || 'localhost'}`);
@@ -5433,33 +5628,6 @@ class MafwScheduler {
             logger_1.log.info(`[Scheduler] Recovered ${filtered.length} registered projects`);
         }
     }
-    async persistConfig() {
-        this.configWriteQueue = this.configWriteQueue.then(async () => {
-            const dir = path.dirname(this.configPath);
-            if (!fs.existsSync(dir))
-                fs.mkdirSync(dir, { recursive: true });
-            let config = {};
-            if (fs.existsSync(this.configPath)) {
-                config = JSON.parse(fs.readFileSync(this.configPath, 'utf-8'));
-            }
-            config.projects = Object.fromEntries(this.registeredProjects);
-            fs.writeFileSync(this.configPath, JSON.stringify(config, null, 2));
-        });
-        await this.configWriteQueue;
-    }
-    async recoverConfig() {
-        if (fs.existsSync(this.configPath)) {
-            try {
-                const config = JSON.parse(fs.readFileSync(this.configPath, 'utf-8'));
-                const entries = Object.entries((config.projects || {}))
-                    .filter(([dir]) => !this.isUserDataDir(dir));
-                this.registeredProjects = new Map(entries);
-            }
-            catch (err) {
-                logger_1.log.error(`[Scheduler] Failed to recover config: ${err.message}`);
-            }
-        }
-    }
     // ── 4. 轮询（降级兜底 + autoresume） ──
     startBackupPolling() {
         const interval = config_1.config.timeouts.backupPollInterval;
@@ -6190,6 +6358,14 @@ ${observations.map((o, i) => `[${i + 1}] ${o}`).join('\n')}`;
         });
         return run;
     }
+    // Slot-based read of a manager-session kv entry: each runtime owns a slot
+    // in the value (byRuntime), so switching runtimes never drops a topic —
+    // switching back resumes the previous manager. Legacy v1 entries are
+    // inferred by session id prefix and only surface under their own runtime.
+    // See manager-session-runtime.ts.
+    readManagerSessionEntry(projectDir) {
+        return (0, manager_session_runtime_1.readManagerSlot)(this.getGatewayDb().kvGet('manager-session', projectDir), this.runtimeName);
+    }
     // Serialized rotate: joins any in-flight ensure/create for the same project
     // so rotate and lazy-init never double-create (spec §4).
     async runManagerExclusive(projectDir, fn) {
@@ -6206,7 +6382,7 @@ ${observations.map((o, i) => `[${i + 1}] ${o}`).join('\n')}`;
         // The inflight map is shared with ensureManagerSession, whose joiners
         // expect the promise to resolve to a session id string — map the rotate
         // result onto the resulting kv entry.
-        const mapped = run.then(() => this.getGatewayDb().kvGet('manager-session', projectDir)?.sessionId ?? '', () => '');
+        const mapped = run.then(() => this.readManagerSessionEntry(projectDir)?.sessionId ?? '', () => '');
         this.managerSessionInflight.set(projectDir, mapped);
         try {
             return await run;
@@ -6221,7 +6397,7 @@ ${observations.map((o, i) => `[${i + 1}] ${o}`).join('\n')}`;
             throw new Error('opencodeClient not available');
         // Manager identity lives in the gateway DB (kv_store), so it survives
         // project-directory churn and never gets orphaned by directory moves.
-        const existing = this.getGatewayDb().kvGet('manager-session', projectDir);
+        const existing = this.readManagerSessionEntry(projectDir);
         if (existing?.sessionId) {
             await this.sdkSession.registerExternal(existing.sessionId, projectDir, {
                 mafw: { role: 'manager', pinned: true, exemptFromTrim: true, exemptFromEvict: true, exemptFromArchive: true },
@@ -6237,7 +6413,7 @@ ${observations.map((o, i) => `[${i + 1}] ${o}`).join('\n')}`;
             throw new Error('Failed to create manager session: no id returned');
         }
         const createdAt = new Date().toISOString();
-        this.getGatewayDb().kvSet('manager-session', projectDir, { sessionId, createdAt });
+        this.getGatewayDb().kvSet('manager-session', projectDir, (0, manager_session_runtime_1.writeManagerSlot)(this.getGatewayDb().kvGet('manager-session', projectDir), this.runtimeName, { sessionId, createdAt }));
         this.registerInternalSession(sessionId, 'manager');
         try {
             await this.sdkSession.registerExternal(sessionId, projectDir, {
@@ -6269,7 +6445,7 @@ ${observations.map((o, i) => `[${i + 1}] ${o}`).join('\n')}`;
     }
     rotateDeps() {
         return {
-            getManagerSession: (pd) => this.getGatewayDb().kvGet('manager-session', pd),
+            getManagerSession: (pd) => this.readManagerSessionEntry(pd),
             lock: (pd, fn) => this.runManagerExclusive(pd, fn),
             ensure: (pd) => this.ensureManagerSession(pd, this.mafwDirFor(pd)),
             downgrade: async (sid) => {
@@ -6316,7 +6492,7 @@ ${observations.map((o, i) => `[${i + 1}] ${o}`).join('\n')}`;
             return undefined;
         if (!this.milestonePush) {
             this.milestonePush = new milestone_push_1.MilestonePushNotifier({
-                getManagerSession: (pd) => this.getGatewayDb().kvGet('manager-session', pd),
+                getManagerSession: (pd) => this.readManagerSessionEntry(pd),
                 wasNotified: (key) => !!this.getGatewayDb().kvGet('milestone-notified', key),
                 markNotified: (key) => this.getGatewayDb().kvSet('milestone-notified', key, { at: new Date().toISOString() }),
                 readGoalState: (goalId, pd) => {
@@ -6345,7 +6521,7 @@ ${observations.map((o, i) => `[${i + 1}] ${o}`).join('\n')}`;
         const sessionId = session.id;
         if (!sessionId)
             throw new Error('Failed to create manager session: no id returned');
-        this.getGatewayDb().kvSet('manager-session', projectDir, { sessionId, createdAt: new Date().toISOString() });
+        this.getGatewayDb().kvSet('manager-session', projectDir, (0, manager_session_runtime_1.writeManagerSlot)(this.getGatewayDb().kvGet('manager-session', projectDir), this.runtimeName, { sessionId, createdAt: new Date().toISOString() }));
         this.registerInternalSession(sessionId, 'manager');
         await this.sdkSession.registerExternal(sessionId, projectDir, {
             mafw: { role: 'manager', pinned: true, exemptFromTrim: true, exemptFromEvict: true, exemptFromArchive: true },