@jack200714/mafw 4.5.2 → 4.10.1

package/gateway/dist/usage/plugin-loader.js

@@ -74,6 +74,7 @@ class PluginLoader {
     builtinNames;
     usageStats;
     resolveInlineApiKey;
+    packageEntries = [];
     constructor(pluginsDir, builtinNames, opts) {
         this.pluginsDir = pluginsDir;
         this.builtinNames = new Set(builtinNames);
@@ -91,7 +92,6 @@ class PluginLoader {
         if (!fs.existsSync(this.pluginsDir)) {
             fs.mkdirSync(this.pluginsDir, { recursive: true });
             fs.writeFileSync(path.join(this.pluginsDir, 'README.md'), README_CONTENT);
-            fs.writeFileSync(path.join(this.pluginsDir, 'example.js.disabled'), EXAMPLE_CONTENT);
             logger_1.log.info(`[PluginLoader] Created ${this.pluginsDir}`);
         }
     }
@@ -174,18 +174,47 @@ class PluginLoader {
         this.builtinNames = builtinNameSet;
     }
     getAdapters() {
+        const packageNames = new Set(this.packageEntries.map((e) => e.mod.name));
         const adapters = [];
         for (const s of this.state.values()) {
-            if (s.status === 'ok' && s.adapter && !s.disabled)
+            if (s.status === 'ok' && s.adapter && !s.disabled && !packageNames.has(s.name))
                 adapters.push(s.adapter);
         }
+        for (const e of this.packageEntries) {
+            if (this.disabledPlugins.has(e.mod.name))
+                continue;
+            adapters.push((0, plugin_context_1.makeAdapter)(e.mod, e.source, this.usageStats, this.resolveInlineApiKey));
+        }
         return adapters;
     }
     isBuiltinName(name) {
         return this.builtinNames.has(name);
     }
     getState() {
-        return [...this.state.values()];
+        const out = [...this.state.values()].map((s) => ({ ...s }));
+        const packageNames = new Set(this.packageEntries.map((e) => e.mod.name));
+        for (const s of out) {
+            if (s.name && packageNames.has(s.name))
+                s.overridden = true;
+        }
+        for (const e of this.packageEntries) {
+            out.push({
+                file: e.source,
+                name: e.mod.name,
+                status: 'ok',
+                overridden: false,
+                builtin: false,
+                adapter: undefined,
+                configSchema: validateConfigSchema(e.mod.configSchema),
+                disabled: this.disabledPlugins.has(e.mod.name),
+                pluginType: typeof e.mod.type === 'string' ? e.mod.type : undefined,
+            });
+        }
+        return out;
+    }
+    /** PluginHost 推送的包贡献。同名包覆盖 legacy 文件与内置；disabledPlugins 同样生效。 */
+    setPackageEntries(entries) {
+        this.packageEntries = entries ?? [];
     }
     async reload() {
         await this.scan();
@@ -268,13 +297,3 @@ Return \`null\` to hide provider. Builtin plugins live in the package
 \`dist/usage/builtin-plugins/\`; drop a file with the same \`name\` here to override,
 or add the name to \`usage.disabledPlugins\` in config to disable.
 `;
-const EXAMPLE_CONTENT = `// Rename to example.js to activate
-module.exports = {
-  name: "example",
-  type: "api",
-  plan: "Example Plan",
-  async fetch(ctx) {
-    return null; // Hide provider
-  },
-};
-`;

package/gateway/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mafw-gateway",
-  "version": "5.0.0",
-  "description": "MAFW Gateway v5.0 — SSE Event-Driven Scheduler",
+  "version": "4.10.0",
+  "description": "MAFW Gateway v5.0 —SSE Event-Driven Scheduler",
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc && node -e \"const fs=require('fs'),p=require('path');const cp=(s,d)=>{if(fs.existsSync(s)){fs.cpSync(s,d,{recursive:true});console.log('[copy] '+d)}else{console.log('[skip] '+s)};};cp(p.join(__dirname,'src','dashboard','public'),p.join(__dirname,'dist','dashboard','public'));cp(p.join(__dirname,'src','tray','tray.ps1'),p.join(__dirname,'dist','tray','tray.ps1'));cp(p.join(__dirname,'src','usage','builtin-plugins'),p.join(__dirname,'dist','usage','builtin-plugins'));\"",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jack200714/mafw",
-  "version": "4.5.2",
+  "version": "4.10.1",
   "description": "MAFW Loop Agent Plugin for OpenCode - Phase Relay + TMEM + Dynamic Compression",
   "repository": {
     "type": "git",
@@ -14,6 +14,8 @@
     "postinstall": "node -e \"var p=require('path'),f=require('fs'),d=p.join(__dirname,'gateway'),ts=p.join(d,'node_modules','typescript','bin','tsc');if(f.existsSync(d)){if(f.existsSync(ts)){console.log('[mafw] gateway dev deps present, skip prod install')}else{require('child_process').execSync('npm install --omit=dev --no-audit --no-fund --loglevel=error',{cwd:d,stdio:'inherit'})}}\"",
     "prepare": "node -e \"var p=require('path'),f=require('fs'),ts=p.join(__dirname,'gateway','node_modules','typescript','bin','tsc');if(!f.existsSync(ts)){console.log('[mafw] gateway dev deps missing, skip prepare build (fresh CI install)');process.exit(0)}require('child_process').execSync('npm run build',{cwd:__dirname,stdio:'inherit'})\"",
     "pack:install": "npm run build && npm pack && npm install -g jack200714-mafw-*.tgz && mafw version",
+    "version:set": "node scripts/bump-version.mjs",
+    "version:check": "node scripts/bump-version.mjs --check",
     "test": "npm test --prefix gateway",
     "test:unit": "npm test --prefix gateway",
     "test:tui": "node --test packages/tui/tests/*.test.ts"

package/packages/tui/dist/cli.js

@@ -380,7 +380,7 @@ var require_client = __commonJS({
           return { id: data.projectDir || ".", worktree: data.projectDir || "." };
         },
         setCurrent: async (path) => {
-          await this.request("/api/projects/register", {
+          await this.request("/register", {
             method: "POST",
             body: JSON.stringify({ projectDir: path, mafwDir: path + "/.mafw" })
           });
@@ -413,7 +413,14 @@ var require_client = __commonJS({
           };
         },
         /** SSE 连接状态（onopen/onerror 维护；供监督器健康轮询）。 */
-        connected: () => this._sse.connected
+        connected: () => this._sse.connected,
+        /** 发布自定义事件到全部 UI 通道（SSE/WS/推送）。type 建议命名空间
+         *  'plugin:<name>:<event>'；消费方对未知 type 忽略（SSE 通知语义，无注册制）。 */
+        publish: async (event) => this.request("/api/events", {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify(event)
+        })
       };
       // ── Runtime ──
       runtime = {
@@ -455,10 +462,15 @@ var require_client = __commonJS({
       plugins = {
         list: async () => this.request("/api/plugins"),
         install: async (input) => {
-          const res = await this.fetchImpl(`${this.baseUrl}/api/plugins/install`, {
+          const params = new URLSearchParams({ filename: input.filename });
+          if (input.type)
+            params.set("type", input.type);
+          if (input.overwrite)
+            params.set("overwrite", "1");
+          const res = await this.fetchImpl(`${this.baseUrl}/api/plugins/install?${params.toString()}`, {
             method: "POST",
-            headers: { "Content-Type": "application/json" },
-            body: JSON.stringify({ ...input, overwrite: !!input.overwrite })
+            headers: { "Content-Type": "application/octet-stream" },
+            body: input.bytes
           });
           if (!res.ok) {
             const body = await res.json().catch(() => ({}));
@@ -1826,6 +1838,7 @@ var init_command_registry = __esm({
       { name: "status", description: "\u4F1A\u8BDD\u72B6\u6001\u56DE\u987E\uFF08\u672C\u5730\u8BA1\u7B97\uFF09", category: "\u4F1A\u8BDD", immediate: true },
       { name: "queue", description: "\u6392\u961F\u6D88\u606F\u7BA1\u7406\uFF08\u6536\u56DE/\u4E22\u5F03\uFF09", category: "\u4F1A\u8BDD", aliases: ["q"], immediate: true },
       { name: "btw", description: "\u652F\u7EBF\u95EE\u7B54\uFF1A/btw <\u95EE\u9898>", category: "\u4F1A\u8BDD" },
+      { name: "waitwhat", description: "\u6CA1\u542C\u61C2\uFF1A\u7528\u7B80\u660E\u8BED\u8A00+\u9879\u76EE\u672F\u8BED\u91CD\u8FF0\u4E0A\u4E00\u6761\u56DE\u590D", category: "\u4F1A\u8BDD", immediate: true },
       { name: "compact", description: "\u538B\u7F29\u5F53\u524D\u4F1A\u8BDD\u4E0A\u4E0B\u6587", category: "\u4E0A\u4E0B\u6587", destructive: true, immediate: true },
       { name: "undo", description: "\u56DE\u9000\u6700\u540E\u4E00\u8F6E\u5BF9\u8BDD", category: "\u4E0A\u4E0B\u6587", destructive: true },
       { name: "redo", description: "\u6062\u590D\u4E0A\u4E00\u6B21\u56DE\u9000", category: "\u4E0A\u4E0B\u6587", destructive: true },
@@ -2160,6 +2173,8 @@ function createSlashHandler(deps) {
       case "status":
         deps.showStatusRecap();
         return null;
+      case "waitwhat":
+        return deps.waitwhat();
       case "queue":
         await deps.showQueueManager();
         return null;
@@ -3916,6 +3931,14 @@ async function runApp(opts) {
       if ("error" in r) return `btw \u5931\u8D25: ${r.error}`;
       return null;
     },
+    waitwhat: async () => {
+      const sid = chatStore.sessionID;
+      if (!sid) return "\u5F53\u524D\u65E0\u4F1A\u8BDD";
+      const r = await client.mafwCommands.run({ command: "waitwhat", sessionID: sid }).catch((e) => ({ error: e.message }));
+      if ("error" in r) return `waitwhat \u5931\u8D25: ${r.error}`;
+      if (r.ok === false) return `waitwhat: ${r.error ?? "\u6CA1\u6709\u53EF\u91CD\u8FF0\u7684\u56DE\u590D"}`;
+      return null;
+    },
     showSessionPicker,
     showQueueManager,
     showModelPicker,