@triflux/remote 10.48.0 → 10.49.0

package/hub/server.mjs

@@ -22,13 +22,7 @@ import {
   ListToolsRequestSchema,
 } from "@modelcontextprotocol/sdk/types.js";
 import { runCollect } from "../cto/collect.mjs";
-import { resolveLakeRootDir } from "../cto/lake-root.mjs";
-import { runStatus as runCtoStatus } from "../cto/status.mjs";
 import { createModuleLogger } from "../scripts/lib/logger.mjs";
-import {
-  inspectRegistry,
-  inspectRegistryStatus,
-} from "../scripts/lib/mcp-guard-engine.mjs";
 import { broker as brokerInstance, reloadBroker } from "@triflux/core/hub/account-broker.mjs";
 import { createAdaptiveEngine } from "@triflux/core/hub/adaptive.mjs";
 import { createAssignCallbackServer } from "@triflux/core/hub/assign-callbacks.mjs";
@@ -56,7 +50,6 @@ import {
   recordWorker,
   snapshot as traceSnapshot,
 } from "@triflux/core/hub/lib/trace-recorder.mjs";
-import { focusSessionOnMac } from "./mac-focus.mjs";
 import { logQuotaRefreshFailures } from "@triflux/core/hub/middleware/quota-middleware.mjs";
 import { wrapRequestHandler } from "@triflux/core/hub/middleware/request-logger.mjs";
 import { createPipeServer } from "./pipe.mjs";
@@ -79,9 +72,6 @@ import {
 } from "./team/synapse-registry.mjs";
 import { registerTeamBridge } from "@triflux/core/hub/team-bridge.mjs";
 import { createTools } from "./tools.mjs";
-import { spawnTrayForHub } from "./tray-lifecycle.mjs";
-import { getRuntimeStatus } from "./tray-runtime.mjs";
-import { buildTrayStatePayload } from "./tray-state.mjs";
 import { createDelegatorMcpWorker } from "./workers/delegator-mcp.mjs";
 
 registerTeamBridge(nativeProxy);
@@ -101,7 +91,6 @@ const LOOPBACK_REMOTE_ADDRESSES = new Set([
 const ALLOWED_ORIGIN_RE =
   /^https?:\/\/(localhost|127\.0\.0\.1|\[::1\])(:\d+)?$/i;
 const PROJECT_ROOT = fileURLToPath(new URL("..", import.meta.url));
-const CANONICAL_PROJECT_ROOT = resolveLakeRootDir(PROJECT_ROOT) || PROJECT_ROOT;
 const PUBLIC_DIR = resolve(join(PROJECT_ROOT, "hub", "public"));
 const CACHE_DIR = join(homedir(), ".claude", "cache");
 const HUB_DEFAULT_PORT = 27888;
@@ -498,7 +487,6 @@ function isPublicPath(path) {
   return (
     PUBLIC_PATHS.has(path) ||
     path === "/dashboard" ||
-    path === "/tray.html" ||
     path === "/api/qos-stats" ||
     path.startsWith("/public/")
   );
@@ -861,41 +849,10 @@ function getBrokerPublicSnapshot(currentBroker = brokerInstance) {
   return currentBroker.publicSnapshot();
 }
 
-async function getTrayCtoStatus() {
-  try {
-    return await runCtoStatus(["--json"], {
-      rootDir: CANONICAL_PROJECT_ROOT,
-      stdout: { write() {} },
-    });
-  } catch (error) {
-    return { error: error?.message || String(error) };
-  }
-}
-
-function getTrayMcpStatus() {
-  const registryState = inspectRegistry();
-  if (!registryState.exists || !registryState.valid) {
-    return {
-      registry_path: registryState.path,
-      server_count: 0,
-      rows: [],
-      error: registryState.errors?.join("; ") || "MCP registry unavailable",
-    };
-  }
-  const status = inspectRegistryStatus(registryState.registry);
-  return {
-    registry_path: registryState.path,
-    server_count: Object.keys(registryState.registry?.servers || {}).length,
-    rows: status.rows,
-  };
-}
-
 function resolvePublicFilePath(path) {
   let relativePath = null;
   if (path === "/dashboard") {
     relativePath = "dashboard.html";
-  } else if (path === "/tray.html") {
-    relativePath = "tray.html";
   } else if (path.startsWith("/public/")) {
     relativePath = path.slice("/public/".length);
   }
@@ -1441,76 +1398,6 @@ export async function startHub({
         });
       }
 
-      if (path === "/api/tray-state" && req.method === "GET") {
-        if (!isLoopbackRemoteAddress(req.socket.remoteAddress)) {
-          return writeJson(res, 403, { ok: false, error: "Loopback only" });
-        }
-
-        const qos = getQosStatsPayload();
-        const synapseSnapshot = synapseRegistry.snapshot();
-        const broker = getBrokerPublicSnapshot(brokerInstance);
-        const runtimeStatus = getRuntimeStatus({
-          projectRoots: [
-            ...new Set([CANONICAL_PROJECT_ROOT, PROJECT_ROOT].filter(Boolean)),
-          ],
-        });
-        const [ctoStatus, mcpStatus, hubStatus] = await Promise.all([
-          getTrayCtoStatus(),
-          Promise.resolve(getTrayMcpStatus()),
-          pipe.executeQuery("status", {
-            scope: "hub",
-            include_metrics: true,
-          }),
-        ]);
-        const mergedCtoStatus = {
-          ...(ctoStatus || {}),
-          roles: hubStatus?.data?.roles || ctoStatus?.roles || {},
-        };
-
-        return writeJson(
-          res,
-          200,
-          buildTrayStatePayload({
-            hub: {
-              id: String(sessionId),
-              pid: process.pid,
-              port,
-              url: buildHubUrl(host, port),
-              projectRoot: CANONICAL_PROJECT_ROOT,
-            },
-            qos,
-            synapseSnapshot,
-            broker,
-            ctoStatus: mergedCtoStatus,
-            mcpStatus,
-            runtimeStatus,
-          }),
-        );
-      }
-
-      if (path === "/api/focus-session" && req.method === "POST") {
-        if (!isLoopbackRemoteAddress(req.socket.remoteAddress)) {
-          return writeJson(res, 403, { ok: false, error: "Loopback only" });
-        }
-        let body;
-        try {
-          body = await parseBody(req);
-        } catch (_e) {
-          return writeJson(res, 400, {
-            error: "Invalid JSON or Body too large",
-          });
-        }
-
-        const { sessionId, udsId } = body || {};
-        const result = await focusSessionOnMac({
-          sessionId,
-          udsId,
-          pid: body?.pid,
-          agentId: body?.agentId ?? body?.agent_id,
-        });
-        return writeJson(res, 200, { ok: result.ok !== false, focus: result });
-      }
-
       // Redacted peer-discovery surface. Returns co-located live peers (same
       // cwd / worktree) with raw cwd/pid stripped — only label/hash + booleans.
       if (path === "/synapse/peers" && req.method === "GET") {
@@ -3110,15 +2997,6 @@ if (selfRun) {
         process.exit(0);
         return;
       }
-      try {
-        const trayPath = fileURLToPath(new URL("./tray.mjs", import.meta.url));
-        const tray = spawnTrayForHub({ trayPath });
-        if (tray.status === "started") {
-          hubLog.info({ pid: tray.pid }, "tray.auto_started");
-        }
-      } catch (error) {
-        hubLog.warn({ err: error }, "tray.auto_start_failed");
-      }
       const shutdown = async (signal) => {
         hubLog.info({ signal }, "hub.stopping");
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triflux/remote",
-  "version": "10.48.0",
+  "version": "10.49.0",
   "description": "triflux remote — team mode, psmux, MCP workers, SQLite store.",
   "type": "module",
   "main": "hub/index.mjs",
@@ -9,7 +9,7 @@
     "./hub/*": "./hub/*"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20"
   },
   "peerDependencies": {
     "@triflux/core": "^10.0.0-alpha.1"
@@ -20,7 +20,6 @@
     "better-sqlite3": "^12.10.0",
     "pino": "^10.3.1",
     "pino-pretty": "^13.1.3",
-    "systray2": "^2.1.4",
     "zod": "^4.0.0"
   },
   "files": [

package/scripts/lib/keyword-rules.mjs

@@ -2,6 +2,11 @@ import { readFileSync } from "node:fs";
 
 const VALID_MCP_ROUTES = new Set(["codex", "antigravity", "gemini", "claude"]);
 
+// 주입 강도. explicit = 스킬명 직접 언급(명시 토큰) → MUST 호출 문구,
+// suggest = 자연어 매칭 → "실행 요청이면 고려하라" 수준의 제안 문구 (ADR-0021).
+const VALID_STRENGTHS = new Set(["explicit", "suggest"]);
+const DEFAULT_STRENGTH = "explicit";
+
 function logRuleError(message, error) {
   if (error) {
     console.error(`[triflux-keyword-rules] ${message}: ${error.message}`);
@@ -13,7 +18,11 @@ function logRuleError(message, error) {
 function normalizePattern(pattern) {
   if (!pattern || typeof pattern.source !== "string") return null;
   if (typeof pattern.flags !== "string") return null;
-  return { source: pattern.source, flags: pattern.flags };
+  if (pattern.strength != null && !VALID_STRENGTHS.has(pattern.strength))
+    return null;
+  const normalized = { source: pattern.source, flags: pattern.flags };
+  if (pattern.strength != null) normalized.strength = pattern.strength;
+  return normalized;
 }
 
 function normalizeState(state) {
@@ -32,13 +41,43 @@ function normalizeRule(rule) {
   if (typeof rule.priority !== "number" || !Number.isFinite(rule.priority))
     return null;
 
-  const patterns = rule.patterns.map(normalizePattern).filter(Boolean);
+  // strength: 규칙 기본 주입 강도. 패턴별 strength 가 있으면 그 패턴만 덮어쓴다.
+  // 값이 틀리면 규칙 자체를 무효로 본다 (platform 과 같은 규칙).
+  if (rule.strength != null && !VALID_STRENGTHS.has(rule.strength)) return null;
+  const strength = rule.strength ?? DEFAULT_STRENGTH;
+
+  const patterns = rule.patterns
+    .map(normalizePattern)
+    .filter(Boolean)
+    .map((p) => ({ ...p, strength: p.strength ?? strength }));
   if (patterns.length === 0) return null;
 
+  // exclude_patterns: 하나라도 맞으면 그 규칙의 suggest 매칭을 버린다.
+  // 명시 토큰(explicit) 매칭은 사용자가 스킬을 직접 부른 것이라 제외하지 않는다.
+  if (rule.exclude_patterns != null && !Array.isArray(rule.exclude_patterns))
+    return null;
+  const excludePatterns = Array.isArray(rule.exclude_patterns)
+    ? rule.exclude_patterns
+        .map(normalizePattern)
+        .filter(Boolean)
+        .map(({ source, flags }) => ({ source, flags }))
+    : [];
+
+  // skill_candidates: 머신마다 설치 이름이 다른 외부 스킬(gstack 의 `ship` /
+  // `gstack-ship`)의 후보 목록. detector 가 실행 시점에 설치된 첫 이름을 고른다.
+  // skill 이 없으면 첫 후보를 대표 이름으로 둔다.
+  if (rule.skill_candidates != null && !Array.isArray(rule.skill_candidates))
+    return null;
+  const skillCandidates = Array.isArray(rule.skill_candidates)
+    ? rule.skill_candidates
+        .filter((name) => typeof name === "string" && name.trim())
+        .map((name) => name.trim())
+    : [];
+
   const skill =
     typeof rule.skill === "string" && rule.skill.trim()
       ? rule.skill.trim()
-      : null;
+      : (skillCandidates[0] ?? null);
   const action =
     typeof rule.action === "string" && rule.action.trim()
       ? rule.action.trim()
@@ -53,6 +92,12 @@ function normalizeRule(rule) {
   const hint =
     typeof rule.hint === "string" && rule.hint.trim() ? rule.hint.trim() : null;
 
+  // suggest_when: suggest 주입문에서 "…이면 <skill> 을 고려하라"의 조건 문구.
+  const suggestWhen =
+    typeof rule.suggest_when === "string" && rule.suggest_when.trim()
+      ? rule.suggest_when.trim()
+      : null;
+
   const supersedes = Array.isArray(rule.supersedes)
     ? rule.supersedes
         .filter((id) => typeof id === "string" && id.trim())
@@ -82,7 +127,11 @@ function normalizeRule(rule) {
   return {
     id: rule.id.trim(),
     patterns,
+    exclude_patterns: excludePatterns,
+    strength,
+    suggest_when: suggestWhen,
     skill,
+    skill_candidates: skillCandidates,
     action,
     hint,
     priority: rule.priority,
@@ -124,6 +173,9 @@ export function compileRules(rules) {
           compiledPatterns: rule.patterns.map(
             (p) => new RegExp(p.source, p.flags),
           ),
+          compiledExcludes: (rule.exclude_patterns || []).map(
+            (p) => new RegExp(p.source, p.flags),
+          ),
         };
       } catch (error) {
         logRuleError(`정규식 컴파일 실패: ${rule.id}`, error);
@@ -153,12 +205,27 @@ export function matchRules(compiledRules, cleanText) {
       continue;
     }
 
-    const matched = rule.compiledPatterns.some((pattern) => {
+    // compiledPatterns[i] 와 patterns[i] 는 같은 순서다 — 패턴별 strength 를 읽는다.
+    const ruleStrength = rule.strength ?? DEFAULT_STRENGTH;
+    let explicitHit = false;
+    let suggestHit = false;
+    rule.compiledPatterns.forEach((pattern, index) => {
       pattern.lastIndex = 0;
-      return pattern.test(cleanText);
+      if (!pattern.test(cleanText)) return;
+      const strength = rule.patterns?.[index]?.strength ?? ruleStrength;
+      if (strength === "suggest") suggestHit = true;
+      else explicitHit = true;
     });
 
-    if (!matched) continue;
+    if (!explicitHit && !suggestHit) continue;
+
+    if (!explicitHit) {
+      const excluded = (rule.compiledExcludes || []).some((pattern) => {
+        pattern.lastIndex = 0;
+        return pattern.test(cleanText);
+      });
+      if (excluded) continue;
+    }
 
     matches.push({
       id: rule.id,
@@ -173,6 +240,9 @@ export function matchRules(compiledRules, cleanText) {
       repo_scope: rule.repo_scope || [],
       platform: rule.platform || [],
       explicit: rule.explicit === true,
+      strength: explicitHit ? "explicit" : "suggest",
+      suggest_when: rule.suggest_when || null,
+      skill_candidates: rule.skill_candidates || [],
     });
   }
 
@@ -197,13 +267,20 @@ export function resolveConflicts(matches) {
       seen.add(match.id);
     }
 
+    // strength 우선순위를 충돌 해소에도 적용한다 — suggest 매칭의 supersedes 는
+    // 사용자가 직접 부른 explicit 매칭을 지우지 못한다.
+    const strengthById = new Map(
+      deduped.map((match) => [match.id, match.strength ?? DEFAULT_STRENGTH]),
+    );
     const superseded = new Set();
     const resolved = [];
 
     for (const match of deduped) {
       if (superseded.has(match.id)) continue;
       resolved.push(match);
+      const fromSuggest = (match.strength ?? DEFAULT_STRENGTH) === "suggest";
       for (const targetId of match.supersedes || []) {
+        if (fromSuggest && strengthById.get(targetId) === "explicit") continue;
         superseded.add(targetId);
       }
     }

package/hub/mac-focus.mjs

@@ -1,94 +0,0 @@
-import { execFile } from "node:child_process";
-
-export const FOCUS_SCRIPT_TIMEOUT_MS = 5_000;
-
-const DEFAULT_FOCUS_CANDIDATES = [
-  "iTerm2",
-  "Terminal",
-  "Codex",
-  "Claude",
-  "Antigravity",
-  "Code",
-];
-
-function normalizeAgentId(value) {
-  const id = String(value || "")
-    .trim()
-    .toLowerCase();
-  if (id === "agy" || id === "anti") return "antigravity";
-  return id;
-}
-
-export function getFocusCandidates({ agentId } = {}) {
-  switch (normalizeAgentId(agentId)) {
-    case "codex":
-      return ["Codex", "iTerm2", "Terminal", "Code"];
-    case "claude":
-      return ["Claude", "iTerm2", "Terminal"];
-    case "antigravity":
-      return ["Antigravity", "iTerm2", "Terminal"];
-    default:
-      return [...DEFAULT_FOCUS_CANDIDATES];
-  }
-}
-
-function appleScriptList(values) {
-  return `{${values.map((value) => JSON.stringify(String(value))).join(", ")}}`;
-}
-
-export function buildFocusScript({ agentId, appCandidates } = {}) {
-  const candidates = Array.isArray(appCandidates)
-    ? appCandidates.map(String).filter(Boolean)
-    : getFocusCandidates({ agentId });
-  return `
-set appCandidates to ${appleScriptList(candidates)}
-tell application "System Events"
-  set runningNames to name of every process
-end tell
-repeat with appName in appCandidates
-  set appText to appName as text
-  if runningNames contains appText then
-    tell application appText to activate
-    return "activated " & appText
-  end if
-end repeat
-return "no focus candidate running"
-`;
-}
-
-export function focusSessionOnMac(target = {}, maybeUdsId = null) {
-  const normalizedTarget =
-    target && typeof target === "object"
-      ? target
-      : { sessionId: target, udsId: maybeUdsId };
-  const script = buildFocusScript({ agentId: normalizedTarget.agentId });
-  return new Promise((resolve) => {
-    execFile(
-      "osascript",
-      ["-e", script],
-      { timeout: FOCUS_SCRIPT_TIMEOUT_MS },
-      (err, stdout = "", stderr = "") => {
-        const output = String(stdout || stderr || "").trim();
-        if (err) {
-          console.error("mac-focus error:", err?.message || err);
-          resolve({
-            ok: false,
-            sessionId: normalizedTarget.sessionId || null,
-            pid: Number(normalizedTarget.pid) || null,
-            agentId: normalizedTarget.agentId || null,
-            error: err?.message || String(err),
-            output,
-          });
-          return;
-        }
-        resolve({
-          ok: true,
-          sessionId: normalizedTarget.sessionId || null,
-          pid: Number(normalizedTarget.pid) || null,
-          agentId: normalizedTarget.agentId || null,
-          output,
-        });
-      },
-    );
-  });
-}

package/hub/mac-tray.swift

@@ -1,144 +0,0 @@
-import Cocoa
-import WebKit
-
-class AppDelegate: NSObject, NSApplicationDelegate, NSPopoverDelegate {
-    var statusItem: NSStatusItem!
-    var popover: NSPopover!
-    var webVC: WebViewController!
-    var port: String = "27888"
-
-    func applicationDidFinishLaunching(_ aNotification: Notification) {
-        if CommandLine.arguments.count > 1 {
-            port = CommandLine.arguments[1]
-        }
-
-        statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
-        if let button = statusItem.button {
-            button.title = "T"
-            button.target = self
-            button.action = #selector(togglePopover(_:))
-        }
-
-        webVC = WebViewController()
-        webVC.port = port
-        webVC.onFocusComplete = { [weak self] in
-            self?.popover.performClose(nil)
-        }
-
-        popover = NSPopover()
-        popover.contentViewController = webVC
-        popover.behavior = .transient
-        popover.animates = false
-        popover.delegate = self
-    }
-
-    @objc func togglePopover(_ sender: Any?) {
-        if popover.isShown {
-            popover.performClose(sender)
-        } else {
-            if let button = statusItem.button {
-                webVC.reloadForPopover()
-                popover.show(relativeTo: button.bounds, of: button, preferredEdge: .minY)
-            }
-        }
-    }
-}
-
-class WebViewController: NSViewController, WKNavigationDelegate, WKScriptMessageHandler {
-    var webView: WKWebView!
-    var port: String = "27888"
-    let canonicalPort = "27888"
-    var consecutiveFailures = 0
-    var retryWorkItem: DispatchWorkItem?
-    var onFocusComplete: (() -> Void)?
-
-    func logError(_ msg: String) {
-        let path = "/tmp/mac-tray.log"
-        if let outputStream = OutputStream(toFileAtPath: path, append: true) {
-            outputStream.open()
-            let text = "\(Date()): \(msg)\n"
-            let bytesWritten = outputStream.write(text, maxLength: text.utf8.count)
-            outputStream.close()
-        }
-    }
-
-    override func loadView() {
-        let webConfiguration = WKWebViewConfiguration()
-        webConfiguration.userContentController.add(self, name: "tray")
-        let initialFrame = NSRect(x: 0, y: 0, width: 460, height: 720)
-        webView = WKWebView(frame: initialFrame, configuration: webConfiguration)
-
-        // Transparent background for Glassmorphism
-        webView.setValue(false, forKey: "drawsBackground")
-
-        self.view = NSView(frame: initialFrame)
-        webView.frame = self.view.bounds
-        webView.autoresizingMask = [.width, .height]
-        self.view.addSubview(webView)
-
-        self.preferredContentSize = initialFrame.size
-    }
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        webView.navigationDelegate = self
-        loadTray()
-    }
-
-    func loadTray() {
-        retryWorkItem?.cancel()
-        if let url = URL(string: "http://127.0.0.1:\(port)/tray.html?t=\(Date().timeIntervalSince1970)") {
-            let request = URLRequest(url: url)
-            webView.load(request)
-        } else {
-            logError("Invalid URL")
-        }
-    }
-
-    func reloadForPopover() {
-        if isViewLoaded {
-            loadTray()
-        }
-    }
-
-    func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
-        logError("Failed to load: \(error.localizedDescription)")
-        consecutiveFailures += 1
-        if consecutiveFailures >= 3 && port != canonicalPort {
-            port = canonicalPort
-            consecutiveFailures = 0
-            logError("Switching to canonical port \(canonicalPort) after repeated failures")
-            loadTray()
-            return
-        }
-        let retry = DispatchWorkItem { [weak self] in
-            self?.loadTray()
-        }
-        retryWorkItem = retry
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.35, execute: retry)
-    }
-
-    func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
-        retryWorkItem?.cancel()
-        retryWorkItem = nil
-        consecutiveFailures = 0
-        logError("Successfully loaded URL")
-    }
-
-    func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {
-        guard message.name == "tray" else { return }
-        if let body = message.body as? [String: Any],
-           let type = body["type"] as? String,
-           type == "focus-complete" {
-            DispatchQueue.main.async { [weak self] in
-                self?.onFocusComplete?()
-            }
-        }
-    }
-}
-
-let app = NSApplication.shared
-let delegate = AppDelegate()
-app.delegate = delegate
-app.setActivationPolicy(.accessory)
-app.run()