@melaya/runner 1.0.85 → 1.0.87

package/dist/assistantHost.py

@@ -46,6 +46,55 @@ _stream = {"turnId": "", "lens": {}, "cancel": False}
 _CANCELLED = object()
 
 
+class _RedactingStdout:
+    """Wrap stdout to strip long base64 runs before they reach the log.
+
+    agentscope prints every agent message verbatim (the `MelayaAssistant: {...}`
+    lines), which for phone_screenshot tool results embeds a full base64 JPEG —
+    tens of KB per turn that floods and explodes the runner logs. This filter is
+    line-buffered and only replaces base64-looking runs (>=200 chars), so the
+    structured `MELASSIST ` event lines (short text deltas / tool names) pass
+    through byte-for-byte and the runner's line parser is unaffected."""
+
+    import re as _re
+    _B64 = _re.compile(r"[A-Za-z0-9+/]{200,}={0,2}")
+
+    def __init__(self, real):
+        self._real = real
+        self._buf = ""
+
+    def _scrub(self, s: str) -> str:
+        return self._B64.sub(lambda m: f"<redacted base64 {len(m.group(0))} bytes>", s)
+
+    def write(self, s):
+        try:
+            self._buf += s
+            while "\n" in self._buf:
+                line, self._buf = self._buf.split("\n", 1)
+                self._real.write(self._scrub(line) + "\n")
+            return len(s)
+        except Exception:
+            return self._real.write(s)
+
+    def flush(self):
+        try:
+            if self._buf:
+                self._real.write(self._scrub(self._buf))
+                self._buf = ""
+            self._real.flush()
+        except Exception:
+            pass
+
+    def __getattr__(self, k):
+        return getattr(self._real, k)
+
+
+# Install the redactor as early as possible so agentscope's message printing is
+# filtered for the whole process lifetime.
+if not isinstance(sys.stdout, _RedactingStdout):
+    sys.stdout = _RedactingStdout(sys.stdout)
+
+
 def _emit(turn_id: str, kind: str, **fields) -> None:
     """Write one structured event line to stdout (flushed) for the runner to relay."""
     try:
@@ -113,10 +162,25 @@ def _build_agent():
     # mobile only. These POST to /api/v1/private/assistant-tool + /phone/command
     # with MELAYA_API_KEY; tenant scope is enforced server-side.
     categories = ["melaya_agent"] + (["phone"] if phone_enabled else [])
+    # Connector tool sets the user enabled for THIS chat (any service — odoo,
+    # stripe, shopify, …). When present, use a LAZY toolkit: base tools stay
+    # active+pinned, and the connectors' tools are deferred + discoverable via
+    # search_tools/activate_tool (≤25 active) so even a 178-tool connector never
+    # explodes context. Bounded to the selected services so the model can't reach
+    # a connector the user didn't enable / has no creds for.
+    connector_services = [s.strip().lower() for s in os.environ.get("MEL_ASSISTANT_CONNECTORS", "").split(",") if s.strip()]
     try:
-        toolkit = build_toolkit(categories=categories)
+        if connector_services:
+            from shared.orchestration.lazy_registry import build_lazy_toolkit
+            toolkit = build_lazy_toolkit(
+                active_categories=categories,
+                include_categories=categories + connector_services,
+                budget=int(os.environ.get("MEL_LAZY_BUDGET", "25")),
+            )
+        else:
+            toolkit = build_toolkit(categories=categories)
     except Exception as exc:
-        _log(f"build_toolkit({categories}) failed: {exc}; retrying melaya_agent only")
+        _log(f"toolkit build failed (connectors={connector_services}): {exc}; retrying melaya_agent only")
         try:
             toolkit = build_toolkit(categories=["melaya_agent"])
         except Exception:
@@ -145,6 +209,14 @@ def _build_agent():
         "blocked; only then report what you did and what (if anything) is blocked.\n"
         if phone_enabled else ""
     )
+    connector_rule = (
+        "- You also have CONNECTOR tools the user enabled (" + ", ".join(connector_services) + "). "
+        "Their tools are not all loaded upfront — call search_tools(query=...) to find the "
+        "right one for the user's question, then activate_tool(name=...) to load it, then call "
+        "it. Prefer specific tools (e.g. odoo_sale_order_list) over generic ones. Never invent "
+        "data — read it from the connector.\n"
+        if connector_services else ""
+    )
     sys_prompt = (
         "You are the Melaya Assistant, the in-app copilot of the Melaya "
         "agent-orchestration platform. You have READ-ONLY tools over the data "
@@ -156,6 +228,7 @@ def _build_agent():
         "templates or evals — never invent numbers. For cost, melaya_cost_summary "
         "supports dimension='pipeline' to find which pipeline cost the most.\n"
         + phone_rule
+        + connector_rule
         + "- Be concise and concrete; format small tables or bullet lists when comparing items.\n"
         "- If a question is outside the platform, answer normally without tools.\n"
         + (f"- Answer in the user's language: {language}.\n" if language and language != "en" else "")

package/dist/connection.js

@@ -893,7 +893,13 @@ export async function connect(opts) {
                 MEL_ASSISTANT_MODEL: String(payload.model || ""),
                 MEL_ASSISTANT_LANGUAGE: String(payload.language || "en"),
                 MEL_ASSISTANT_SURFACE: String(payload.surface || ""),
-                // Per-user creds (incl. MELAYA_API_KEY for the tenant-gated tool bridge).
+                // Connector tool sets the user enabled for this chat (comma-joined service
+                // ids). The host seeds a lazy toolkit from these so ANY connector's tools
+                // are reachable without exploding context.
+                MEL_ASSISTANT_CONNECTORS: Array.isArray(payload.connectors) ? payload.connectors.join(",") : "",
+                // Gate write connector-tools behind the in-chat approval card (fail-safe).
+                MEL_ASSISTANT_CONNECTOR_HITL: Array.isArray(payload.connectors) && payload.connectors.length ? "1" : "",
+                // Per-user creds (incl. MELAYA_API_KEY + the selected connectors' env).
                 ...(payload.credentials || {}),
             };
             const proc = spawn(envResult.pythonPath, ["-u", stagedHost], { cwd: workDir, env, stdio: ["pipe", "pipe", "pipe"] });

package/package.json

@@ -1,42 +1,42 @@
-{
-  "name": "@melaya/runner",
-  "version": "1.0.85",
-  "description": "Run Melaya AI pipelines locally with your own LM Studio or Ollama models",
-  "license": "UNLICENSED",
-  "private": false,
-  "type": "module",
-  "bin": {
-    "melaya-runner": "dist/cli.js"
-  },
-  "main": "dist/index.js",
-  "files": [
-    "dist/**/*.js",
-    "dist/**/*.d.ts",
-    "dist/**/*.py",
-    "localRagIngest.py",
-    "localRagRetrieve.py",
-    "nltk_data/**",
-    "README.md"
-  ],
-  "scripts": {
-    "build": "tsc && node -e \"const fs=require('fs'); fs.copyFileSync('localRagIngest.py','dist/localRagIngest.py'); fs.copyFileSync('localRagRetrieve.py','dist/localRagRetrieve.py'); fs.copyFileSync('src/assistantHost.py','dist/assistantHost.py')\"",
-    "prepublishOnly": "npm run build"
-  },
-  "dependencies": {
-    "chalk": "^5.3.0",
-    "commander": "^12.0.0",
-    "ora": "^8.0.0",
-    "playwright": "^1.47.0",
-    "socket.io-client": "^4.8.0"
-  },
-  "devDependencies": {
-    "@types/node": "^20.0.0",
-    "typescript": "^5.5.0"
-  },
-  "engines": {
-    "node": ">=18"
-  },
-  "publishConfig": {
-    "access": "public"
-  }
-}
+{
+  "name": "@melaya/runner",
+  "version": "1.0.87",
+  "description": "Run Melaya AI pipelines locally with your own LM Studio or Ollama models",
+  "license": "UNLICENSED",
+  "private": false,
+  "type": "module",
+  "bin": {
+    "melaya-runner": "dist/cli.js"
+  },
+  "main": "dist/index.js",
+  "files": [
+    "dist/**/*.js",
+    "dist/**/*.d.ts",
+    "dist/**/*.py",
+    "localRagIngest.py",
+    "localRagRetrieve.py",
+    "nltk_data/**",
+    "README.md"
+  ],
+  "scripts": {
+    "build": "tsc && node -e \"const fs=require('fs'); fs.copyFileSync('localRagIngest.py','dist/localRagIngest.py'); fs.copyFileSync('localRagRetrieve.py','dist/localRagRetrieve.py'); fs.copyFileSync('src/assistantHost.py','dist/assistantHost.py')\"",
+    "prepublishOnly": "npm run build"
+  },
+  "dependencies": {
+    "chalk": "^5.3.0",
+    "commander": "^12.0.0",
+    "ora": "^8.0.0",
+    "playwright": "^1.47.0",
+    "socket.io-client": "^4.8.0"
+  },
+  "devDependencies": {
+    "@types/node": "^20.0.0",
+    "typescript": "^5.5.0"
+  },
+  "engines": {
+    "node": ">=18"
+  },
+  "publishConfig": {
+    "access": "public"
+  }
+}