@mindstudio-ai/local-model-tunnel 0.5.40 → 0.5.42

package/dist/{chunk-55CLKSH5.js → chunk-2ND2YJQR.js}

@@ -7,7 +7,7 @@ import {
   setProviderInstallPath,
   submitProgress,
   submitResult
-} from "./chunk-I3WNZIXI.js";
+} from "./chunk-6LWKL7BC.js";
 
 // src/providers/ollama/index.ts
 import { Ollama } from "ollama";
@@ -1395,4 +1395,4 @@ export {
   requestEvents,
   TunnelRunner
 };
-//# sourceMappingURL=chunk-55CLKSH5.js.map
+//# sourceMappingURL=chunk-2ND2YJQR.js.map

package/dist/{chunk-I3WNZIXI.js → chunk-6LWKL7BC.js}

@@ -421,6 +421,45 @@ function logScenarioExecution(entry) {
     stats: entry.result?.stats ?? null
   });
 }
+function logMethodStart(requestId, sessionId, method, input) {
+  ndjsonLog.append({
+    ts: Date.now(),
+    level: "info",
+    module: "execution",
+    msg: "Method started",
+    type: "method-start",
+    requestId,
+    sessionId,
+    method,
+    input
+  });
+}
+function logMethodStdout(requestId, sessionId, method, lines) {
+  ndjsonLog.append({
+    ts: Date.now(),
+    level: "info",
+    module: "execution",
+    msg: "Method stdout",
+    type: "method-stdout",
+    requestId,
+    sessionId,
+    method,
+    stdout: lines
+  });
+}
+function logBackgroundStdout(requestId, sessionId, method, lines) {
+  ndjsonLog.append({
+    ts: Date.now(),
+    level: "info",
+    module: "execution",
+    msg: "Background stdout",
+    type: "method-background-stdout",
+    requestId,
+    sessionId,
+    method,
+    stdout: lines
+  });
+}
 function closeRequestLog() {
   ndjsonLog.close();
 }
@@ -582,6 +621,7 @@ function findNearestNodeModules(startDir) {
 // src/dev/execution/executor.ts
 import { fork } from "child_process";
 import { writeFile, unlink as unlink2 } from "fs/promises";
+import { readFileSync } from "fs";
 import { join as join4 } from "path";
 import { tmpdir } from "os";
 import { randomBytes } from "crypto";
@@ -589,9 +629,10 @@ var EXECUTION_TIMEOUT_MS = 30 * 60 * 1e3;
 var worker = null;
 var workerScriptPath = null;
 var workerProjectRoot = null;
+var workerSupportsAls = false;
 var pending = /* @__PURE__ */ new Map();
-function buildWorkerScript() {
-  return `
+var requestMeta = /* @__PURE__ */ new Map();
+var SERIALIZE_ERROR_FN = `
 function serializeError(err) {
   if (!err) return { message: 'Unknown error' };
 
@@ -626,6 +667,117 @@ function serializeError(err) {
 
   return serialized;
 }
+`;
+function buildAlsWorkerScript() {
+  return `
+import { AsyncLocalStorage } from 'node:async_hooks';
+import { format } from 'node:util';
+import { runWithContext } from '@mindstudio-ai/agent';
+
+${SERIALIZE_ERROR_FN}
+
+// Per-request console capture via AsyncLocalStorage
+const consoleAls = new AsyncLocalStorage();
+const _origLog = console.log;
+const _origWarn = console.warn;
+const _origError = console.error;
+
+console.log = (...args) => {
+  const stdout = consoleAls.getStore();
+  if (stdout) stdout.push(format(...args));
+  _origLog(...args);
+};
+console.warn = (...args) => {
+  const stdout = consoleAls.getStore();
+  if (stdout) stdout.push(format(...args));
+  _origWarn(...args);
+};
+console.error = (...args) => {
+  const stdout = consoleAls.getStore();
+  if (stdout) stdout.push(format(...args));
+  _origError(...args);
+};
+
+process.on('message', async (msg) => {
+  const { id, transpiledPath, methodExport, input, auth, databases, authorizationToken, apiBaseUrl, streamId } = msg;
+
+  const ctx = {
+    callbackToken: authorizationToken,
+    remoteHostname: apiBaseUrl,
+    auth: auth ?? { userId: null, roleAssignments: [] },
+    databases: databases ?? [],
+    streamId: streamId ?? undefined,
+  };
+
+  const stdout = [];
+  let flushed = 0;
+  let done = false;
+
+  // Flush new stdout lines every 1s while the method is running.
+  // After the method returns, switches to background-stdout type.
+  const flushInterval = setInterval(() => {
+    if (stdout.length > flushed) {
+      const lines = stdout.slice(flushed);
+      flushed = stdout.length;
+      try {
+        process.send({ type: done ? 'background-stdout' : 'stdout', id, lines });
+      } catch {}
+      idleTicks = 0;
+    } else if (done) {
+      idleTicks++;
+      if (idleTicks >= 2) {
+        clearInterval(flushInterval);
+        try { process.send({ type: 'stdout-end', id }); } catch {}
+      }
+    }
+  }, 1000);
+  let idleTicks = 0;
+
+  process.send({ type: 'start', id });
+
+  const startTime = Date.now();
+
+  try {
+    const returnValue = await consoleAls.run(stdout, () =>
+      runWithContext(ctx, async () => {
+        const mod = await import(transpiledPath + '?t=' + Date.now());
+        const fn = mod[methodExport];
+        if (typeof fn !== 'function') {
+          throw new Error(methodExport + ' is not a function (got ' + typeof fn + ')');
+        }
+        return fn(input);
+      }),
+    );
+    const stats = { memoryUsedBytes: process.memoryUsage().heapUsed, executionTimeMs: Date.now() - startTime };
+
+    // Final flush of any remaining lines before sending result
+    if (stdout.length > flushed) {
+      try { process.send({ type: 'stdout', id, lines: stdout.slice(flushed) }); } catch {}
+      flushed = stdout.length;
+    }
+
+    done = true;
+    process.send({ id, success: true, output: returnValue, stats });
+  } catch (err) {
+    const stats = { memoryUsedBytes: process.memoryUsage().heapUsed, executionTimeMs: Date.now() - startTime };
+
+    if (stdout.length > flushed) {
+      try { process.send({ type: 'stdout', id, lines: stdout.slice(flushed) }); } catch {}
+      flushed = stdout.length;
+    }
+
+    done = true;
+    process.send({ id, success: false, error: serializeError(err), stats });
+  }
+});
+
+// Signal ready
+process.send({ type: 'ready' });
+`;
+}
+function buildLegacyWorkerScript() {
+  return `
+${SERIALIZE_ERROR_FN}
 
 // Save original console methods so we can restore after each request
 const _origLog = console.log;
@@ -677,6 +829,17 @@ process.on('message', async (msg) => {
 process.send({ type: 'ready' });
 `;
 }
+function detectAlsSupport(projectRoot) {
+  try {
+    const pkgPath = join4(projectRoot, "node_modules", "@mindstudio-ai", "agent", "package.json");
+    const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
+    const parts = (pkg.version || "").split(".").map(Number);
+    const [major = 0, minor = 0, patch = 0] = parts;
+    return major > 0 || minor > 1 || minor === 1 && patch >= 46;
+  } catch {
+    return false;
+  }
+}
 async function ensureWorker(projectRoot) {
   if (worker?.connected && workerProjectRoot === projectRoot) {
     return worker;
@@ -695,14 +858,17 @@ async function ensureWorker(projectRoot) {
     });
     workerScriptPath = null;
   }
+  workerSupportsAls = detectAlsSupport(projectRoot);
+  log.info("executor", "SDK context support", { als: workerSupportsAls });
   const scriptPath = join4(
     tmpdir(),
     `ms-dev-worker-${randomBytes(4).toString("hex")}.mjs`
   );
-  await writeFile(scriptPath, buildWorkerScript(), "utf-8");
+  const script = workerSupportsAls ? buildAlsWorkerScript() : buildLegacyWorkerScript();
+  await writeFile(scriptPath, script, "utf-8");
   workerScriptPath = scriptPath;
   workerProjectRoot = projectRoot;
-  log.debug("executor", "Spawning method execution process", { cwd: projectRoot, scriptPath });
+  log.debug("executor", "Spawning method execution process", { cwd: projectRoot, scriptPath, als: workerSupportsAls });
   const child = fork(scriptPath, [], {
     cwd: projectRoot,
     stdio: ["ignore", "pipe", "pipe", "ipc"],
@@ -721,6 +887,21 @@ async function ensureWorker(projectRoot) {
   });
   child.on("message", (msg) => {
     if (!msg?.id) return;
+    const meta = requestMeta.get(msg.id);
+    switch (msg.type) {
+      case "start":
+        if (meta) logMethodStart(msg.id, meta.sessionId, meta.method, meta.input);
+        return;
+      case "stdout":
+        if (meta && msg.lines?.length) logMethodStdout(msg.id, meta.sessionId, meta.method, msg.lines);
+        return;
+      case "background-stdout":
+        if (meta && msg.lines?.length) logBackgroundStdout(msg.id, meta.sessionId, meta.method, msg.lines);
+        return;
+      case "stdout-end":
+        requestMeta.delete(msg.id);
+        return;
+    }
     const req = pending.get(msg.id);
     if (!req) return;
     pending.delete(msg.id);
@@ -752,6 +933,9 @@ function enqueue(fn) {
   return task;
 }
 function executeMethod(opts) {
+  if (workerSupportsAls) {
+    return executeMethodInWorker(opts);
+  }
   return enqueue(() => executeMethodInWorker(opts));
 }
 async function executeMethodInWorker(opts) {
@@ -768,6 +952,9 @@ async function executeMethodInWorker(opts) {
       });
     }, EXECUTION_TIMEOUT_MS);
     pending.set(id, { resolve: resolve2, timer });
+    if (opts.sessionId) {
+      requestMeta.set(id, { sessionId: opts.sessionId, method: opts.methodExport, input: opts.input });
+    }
     w.send({
       id,
       transpiledPath: opts.transpiledPath,
@@ -793,10 +980,12 @@ async function cleanupWorker() {
     workerScriptPath = null;
   }
   workerProjectRoot = null;
+  workerSupportsAls = false;
   for (const [, req] of pending) {
     clearTimeout(req.timer);
   }
   pending.clear();
+  requestMeta.clear();
   queueTail = Promise.resolve();
 }
 
@@ -988,7 +1177,7 @@ function formatErrorForDisplay(error) {
 }
 
 // src/dev/execution/agent-config.ts
-import { readFileSync } from "fs";
+import { readFileSync as readFileSync2 } from "fs";
 import { join as join5, dirname as dirname2 } from "path";
 function readAgentConfig(projectRoot, appConfig) {
   const agentInterface = appConfig.interfaces.find(
@@ -1000,7 +1189,7 @@ function readAgentConfig(projectRoot, appConfig) {
   const configPath = join5(projectRoot, agentInterface.path);
   let raw;
   try {
-    raw = readFileSync(configPath, "utf-8");
+    raw = readFileSync2(configPath, "utf-8");
   } catch {
     throw new Error(
       `Agent config not found at ${agentInterface.path} \u2014 run your build command`
@@ -1012,7 +1201,7 @@ function readAgentConfig(projectRoot, appConfig) {
   const systemPromptPath = join5(agentDir, config2.systemPrompt);
   let systemPrompt;
   try {
-    systemPrompt = readFileSync(systemPromptPath, "utf-8");
+    systemPrompt = readFileSync2(systemPromptPath, "utf-8");
   } catch {
     throw new Error(
       `Agent system prompt not found at ${config2.systemPrompt} \u2014 run your build command`
@@ -1023,7 +1212,7 @@ function readAgentConfig(projectRoot, appConfig) {
       const descPath = join5(agentDir, tool.description);
       let description;
       try {
-        description = readFileSync(descPath, "utf-8");
+        description = readFileSync2(descPath, "utf-8");
       } catch {
         throw new Error(
           `Agent tool description not found at ${tool.description} for method "${tool.method}" \u2014 run your build command`
@@ -1168,7 +1357,8 @@ var DevRunner = class {
         databases: this.session.databases,
         authorizationToken,
         apiBaseUrl: getApiBaseUrl(),
-        projectRoot: this.projectRoot
+        projectRoot: this.projectRoot,
+        sessionId: this.session.sessionId
       });
       const duration = Date.now() - startTime;
       if (result.success) {
@@ -1246,7 +1436,8 @@ var DevRunner = class {
         databases: this.session.databases,
         authorizationToken,
         apiBaseUrl: getApiBaseUrl(),
-        projectRoot: this.projectRoot
+        projectRoot: this.projectRoot,
+        sessionId: this.session.sessionId
       });
       if (!result.success) {
         const error = result.error?.message ?? "Scenario seed failed";
@@ -1387,6 +1578,7 @@ var DevRunner = class {
         authorizationToken: request.authorizationToken,
         apiBaseUrl: getApiBaseUrl(),
         projectRoot: this.projectRoot,
+        sessionId: this.session.sessionId,
         streamId: request.streamId
       });
       const t2 = Date.now();
@@ -2566,6 +2758,8 @@ var DevProxy = class _DevProxy {
   async resolveAuthCookie(cookie) {
     const apiBaseUrl = getApiBaseUrl();
     const url = new URL(`/_internal/v2/apps/${this.appId}/auth/me`, apiBaseUrl);
+    const releaseId = this.clientContext.releaseId;
+    if (releaseId) url.searchParams.set("releaseId", releaseId);
     const isHttps = url.protocol === "https:";
     const httpModule = isHttps ? https : http;
     return new Promise((resolve2) => {
@@ -2573,7 +2767,7 @@ var DevProxy = class _DevProxy {
         {
           hostname: url.hostname,
           port: url.port || (isHttps ? 443 : 80),
-          path: url.pathname,
+          path: url.pathname + url.search,
           method: "GET",
           headers: {
             cookie: `__ms_auth=${cookie}`,
@@ -2667,13 +2861,13 @@ ${agentScript}`;
 };
 
 // src/dev/config/app-config.ts
-import { readFileSync as readFileSync2, existsSync as existsSync2 } from "fs";
+import { readFileSync as readFileSync3, existsSync as existsSync2 } from "fs";
 import { join as join6, dirname as dirname3 } from "path";
 function detectAppConfig(cwd = process.cwd()) {
   const appJsonPath = join6(cwd, "mindstudio.json");
   if (!existsSync2(appJsonPath)) return null;
   try {
-    const raw = readFileSync2(appJsonPath, "utf-8");
+    const raw = readFileSync3(appJsonPath, "utf-8");
     const parsed = JSON.parse(raw);
     if (!parsed.name || !Array.isArray(parsed.methods)) {
       return null;
@@ -2715,7 +2909,7 @@ function getWebInterfaceConfig(appConfig, cwd = process.cwd()) {
     return null;
   }
   try {
-    const raw = readFileSync2(configPath, "utf-8");
+    const raw = readFileSync3(configPath, "utf-8");
     const parsed = JSON.parse(raw);
     const web = parsed.web;
     if (!web || typeof web !== "object") {
@@ -2747,7 +2941,7 @@ function readTableSources(appConfig, cwd = process.cwd()) {
       continue;
     }
     try {
-      const source = readFileSync2(filePath, "utf-8");
+      const source = readFileSync3(filePath, "utf-8");
       const name = table.export;
       results.push({ name, source });
     } catch (err) {
@@ -2885,6 +3079,8 @@ export {
   getUploadUrl,
   createAuthSession,
   devRequestEvents,
+  initRequestLog,
+  closeRequestLog,
   pollForRequest,
   submitProgress,
   submitResult,
@@ -2895,8 +3091,6 @@ export {
   pollDeviceAuth,
   getEditorSessions,
   disconnectHeartbeat,
-  initRequestLog,
-  closeRequestLog,
   DevRunner,
   initBrowserLog,
   closeBrowserLog,
@@ -2911,4 +3105,4 @@ export {
   watchTableFiles,
   watchConfigFile
 };
-//# sourceMappingURL=chunk-I3WNZIXI.js.map
+//# sourceMappingURL=chunk-6LWKL7BC.js.map