junis 0.4.1 → 0.4.3

package/dist/cli/index.js

@@ -222,6 +222,14 @@ var RelayClient = class {
   heartbeatTimer = null;
   destroyed = false;
   lastPongTime = 0;
+  _currentRequestId = null;
+  _currentSessionId = null;
+  get currentRequestId() {
+    return this._currentRequestId;
+  }
+  get currentSessionId() {
+    return this._currentSessionId;
+  }
   // upload_url_response 대기용 pending 맵
   pendingUploadRequests = /* @__PURE__ */ new Map();
   // signed_url_response 대기용 pending 맵
@@ -274,11 +282,17 @@ var RelayClient = class {
           return;
         }
         if (msg.type === "mcp_request") {
+          this._currentRequestId = msg.id;
+          this._currentSessionId = msg.session_id || null;
           try {
             let result = await this.onMCPRequest(msg.id, msg.payload);
+            this._currentRequestId = null;
+            this._currentSessionId = null;
             result = await this.processLargeFiles(result);
             this.send({ type: "mcp_response", id: msg.id, payload: result });
           } catch (err) {
+            this._currentRequestId = null;
+            this._currentSessionId = null;
             this.send({
               type: "mcp_response",
               id: msg.id,
@@ -331,6 +345,14 @@ var RelayClient = class {
       this.ws.send(JSON.stringify(data));
     }
   }
+  sendProgress(requestId, line) {
+    this.send({
+      type: "mcp_stdout",
+      request_id: requestId,
+      session_id: this._currentSessionId || "",
+      line
+    });
+  }
   /**
    * 서버에 presigned PUT URL 요청.
    * WebSocket으로 upload_url_request 전송 → upload_url_response 대기.
@@ -488,7 +510,7 @@ import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/
 import { createServer } from "http";
 
 // src/tools/filesystem.ts
-import { exec, execFile } from "child_process";
+import { exec, execFile, spawn } from "child_process";
 import { promisify } from "util";
 import fs2 from "fs/promises";
 import path2 from "path";
@@ -559,7 +581,9 @@ function checkPermission(toolName) {
 var execAsync = promisify(exec);
 var execFileAsync = promisify(execFile);
 var FilesystemTools = class {
-  register(server) {
+  relayClient;
+  register(server, relayClient) {
+    this.relayClient = relayClient;
     server.tool(
       "execute_command",
       [
@@ -595,26 +619,84 @@ var FilesystemTools = class {
           exec(command);
           return { content: [{ type: "text", text: "Background execution started" }] };
         }
-        try {
-          const { stdout, stderr } = await execAsync(command, {
+        const requestId = this.relayClient?.currentRequestId ?? null;
+        if (requestId) {
+          this.relayClient?.sendProgress(requestId, `$ ${command}`);
+        }
+        return new Promise((resolve) => {
+          const child = spawn("sh", ["-c", command], {
             timeout: timeout_ms
           });
-          return {
-            content: [{ type: "text", text: stdout || stderr || "(no output)" }]
-          };
-        } catch (err) {
-          const error = err;
-          return {
-            content: [
-              {
-                type: "text",
-                text: `Error (exit ${error.code ?? "?"}): ${error.message}
-${error.stderr ?? ""}`
+          let stdoutBuf = "";
+          let stderrBuf = "";
+          let stdoutLineBuffer = "";
+          let stderrLineBuffer = "";
+          const flushLines = (buffer, newChunk) => {
+            const combined = buffer + newChunk;
+            const lines = combined.split("\n");
+            const incomplete = lines.pop() ?? "";
+            for (const line of lines) {
+              if (requestId) {
+                this.relayClient?.sendProgress(requestId, line);
               }
-            ],
-            isError: true
+            }
+            return incomplete;
           };
-        }
+          child.stdout.on("data", (chunk) => {
+            const text = chunk.toString();
+            stdoutBuf += text;
+            stdoutLineBuffer = flushLines(stdoutLineBuffer, text);
+          });
+          child.stderr.on("data", (chunk) => {
+            const text = chunk.toString();
+            stderrBuf += text;
+            stderrLineBuffer = flushLines(stderrLineBuffer, text);
+          });
+          child.on("close", (code, signal) => {
+            if (stdoutLineBuffer && requestId) {
+              this.relayClient?.sendProgress(requestId, stdoutLineBuffer);
+            }
+            if (stderrLineBuffer && requestId) {
+              this.relayClient?.sendProgress(requestId, stderrLineBuffer);
+            }
+            if (signal) {
+              resolve({
+                content: [
+                  {
+                    type: "text",
+                    text: `Killed by signal ${signal} (timeout: ${timeout_ms}ms)`
+                  }
+                ],
+                isError: true
+              });
+            } else if (code !== 0 && code !== null) {
+              resolve({
+                content: [
+                  {
+                    type: "text",
+                    text: `Error (exit ${code}): ${stderrBuf || stdoutBuf || "(no output)"}`
+                  }
+                ],
+                isError: true
+              });
+            } else {
+              resolve({
+                content: [{ type: "text", text: stdoutBuf || stderrBuf || "(no output)" }]
+              });
+            }
+          });
+          child.on("error", (err) => {
+            resolve({
+              content: [
+                {
+                  type: "text",
+                  text: `Error: ${err.message}`
+                }
+              ],
+              isError: true
+            });
+          });
+        });
       }
     );
     server.tool(
@@ -1782,14 +1864,14 @@ Cause: ${e.message}${hint}` }],
       },
       async ({ text }) => {
         const p = platform();
-        const { spawn: spawn2 } = await import("child_process");
+        const { spawn: spawn3 } = await import("child_process");
         const cmd = {
           mac: { bin: "pbcopy", args: [] },
           win: { bin: "powershell", args: ["-Command", "$input | Set-Clipboard"] },
           linux: { bin: "xclip", args: ["-selection", "clipboard"] }
         }[p];
         await new Promise((resolve, reject) => {
-          const proc = spawn2(cmd.bin, cmd.args, { stdio: ["pipe", "ignore", "ignore"] });
+          const proc = spawn3(cmd.bin, cmd.args, { stdio: ["pipe", "ignore", "ignore"] });
           proc.on("error", reject);
           proc.on("close", (code) => code === 0 ? resolve() : reject(new Error(`${cmd.bin} exited ${code}`)));
           proc.stdin.end(text);
@@ -1821,9 +1903,9 @@ Cause: ${e.message}${hint}` }],
             return { content: [{ type: "text", text: "Already recording." }] };
           }
           const tmpPath = output_path ?? `/tmp/junis_record_${Date.now()}.mp4`;
-          const { spawn: spawn2 } = await import("child_process");
+          const { spawn: spawn3 } = await import("child_process");
           const cmd = p === "mac" ? ["screencapture", ["-v", tmpPath]] : ["ffmpeg", ["-f", p === "win" ? "gdigrab" : "x11grab", "-i", p === "win" ? "desktop" : ":0.0", tmpPath]];
-          const child = spawn2(cmd[0], cmd[1], { detached: true, stdio: "ignore" });
+          const child = spawn3(cmd[0], cmd[1], { detached: true, stdio: "ignore" });
           child.unref();
           screenRecordPid = child.pid ?? null;
           return { content: [{ type: "text", text: `Recording started. Output path: ${tmpPath} (PID: ${screenRecordPid})` }] };
@@ -2761,13 +2843,17 @@ var DesktopTools = class {
 var mcpPort = 3e3;
 var globalBrowserTools = null;
 var desktopToolsEnabled = false;
+var globalRelayClient = null;
+function setRelayClient(client) {
+  globalRelayClient = client;
+}
 function createMcpServer() {
   const server = new McpServer({
     name: "junis",
     version: "0.1.0"
   });
   const fsTools = new FilesystemTools();
-  fsTools.register(server);
+  fsTools.register(server, globalRelayClient ?? void 0);
   if (globalBrowserTools) {
     globalBrowserTools.register(server);
   }
@@ -3090,7 +3176,7 @@ import { createRequire } from "module";
 import fs6 from "fs";
 import path3 from "path";
 import os2 from "os";
-import { execSync, spawn } from "child_process";
+import { execSync, spawn as spawn2 } from "child_process";
 var CONFIG_DIR2 = path3.join(os2.homedir(), ".junis");
 var PID_FILE = path3.join(CONFIG_DIR2, "junis.pid");
 var LOG_DIR = path3.join(CONFIG_DIR2, "logs");
@@ -3128,7 +3214,7 @@ function startDaemon(port) {
   const scriptPath = process.argv[1];
   const out = fs6.openSync(LOG_FILE, "a");
   const err = fs6.openSync(LOG_FILE, "a");
-  const child = spawn(nodePath, [scriptPath, "start", "--daemon", "--port", String(port)], {
+  const child = spawn2(nodePath, [scriptPath, "start", "--daemon", "--port", String(port)], {
     detached: true,
     stdio: ["ignore", out, err],
     env: { ...process.env }
@@ -3367,6 +3453,7 @@ async function runForeground(config, port) {
       process.exit(1);
     }
   });
+  setRelayClient(relay);
   await relay.connect();
   const webUrl = process.env.JUNIS_WEB_URL ?? "https://junis.ai";
   console.log(" \u25C9 Relay connected");
@@ -3585,6 +3672,7 @@ program.command("start", { isDefault: true }).description("Start Junis agent con
         process.exit(1);
       }
     });
+    setRelayClient(relay);
     await relay.connect();
     console.log("[junis daemon] relay connected");
     return;

package/dist/server/mcp.js

@@ -4,7 +4,7 @@ import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/
 import { createServer } from "http";
 
 // src/tools/filesystem.ts
-import { exec, execFile } from "child_process";
+import { exec, execFile, spawn } from "child_process";
 import { promisify } from "util";
 import fs from "fs/promises";
 import path from "path";
@@ -75,7 +75,9 @@ function checkPermission(toolName) {
 var execAsync = promisify(exec);
 var execFileAsync = promisify(execFile);
 var FilesystemTools = class {
-  register(server) {
+  relayClient;
+  register(server, relayClient) {
+    this.relayClient = relayClient;
     server.tool(
       "execute_command",
       [
@@ -111,26 +113,84 @@ var FilesystemTools = class {
           exec(command);
           return { content: [{ type: "text", text: "Background execution started" }] };
         }
-        try {
-          const { stdout, stderr } = await execAsync(command, {
+        const requestId = this.relayClient?.currentRequestId ?? null;
+        if (requestId) {
+          this.relayClient?.sendProgress(requestId, `$ ${command}`);
+        }
+        return new Promise((resolve) => {
+          const child = spawn("sh", ["-c", command], {
             timeout: timeout_ms
           });
-          return {
-            content: [{ type: "text", text: stdout || stderr || "(no output)" }]
-          };
-        } catch (err) {
-          const error = err;
-          return {
-            content: [
-              {
-                type: "text",
-                text: `Error (exit ${error.code ?? "?"}): ${error.message}
-${error.stderr ?? ""}`
+          let stdoutBuf = "";
+          let stderrBuf = "";
+          let stdoutLineBuffer = "";
+          let stderrLineBuffer = "";
+          const flushLines = (buffer, newChunk) => {
+            const combined = buffer + newChunk;
+            const lines = combined.split("\n");
+            const incomplete = lines.pop() ?? "";
+            for (const line of lines) {
+              if (requestId) {
+                this.relayClient?.sendProgress(requestId, line);
               }
-            ],
-            isError: true
+            }
+            return incomplete;
           };
-        }
+          child.stdout.on("data", (chunk) => {
+            const text = chunk.toString();
+            stdoutBuf += text;
+            stdoutLineBuffer = flushLines(stdoutLineBuffer, text);
+          });
+          child.stderr.on("data", (chunk) => {
+            const text = chunk.toString();
+            stderrBuf += text;
+            stderrLineBuffer = flushLines(stderrLineBuffer, text);
+          });
+          child.on("close", (code, signal) => {
+            if (stdoutLineBuffer && requestId) {
+              this.relayClient?.sendProgress(requestId, stdoutLineBuffer);
+            }
+            if (stderrLineBuffer && requestId) {
+              this.relayClient?.sendProgress(requestId, stderrLineBuffer);
+            }
+            if (signal) {
+              resolve({
+                content: [
+                  {
+                    type: "text",
+                    text: `Killed by signal ${signal} (timeout: ${timeout_ms}ms)`
+                  }
+                ],
+                isError: true
+              });
+            } else if (code !== 0 && code !== null) {
+              resolve({
+                content: [
+                  {
+                    type: "text",
+                    text: `Error (exit ${code}): ${stderrBuf || stdoutBuf || "(no output)"}`
+                  }
+                ],
+                isError: true
+              });
+            } else {
+              resolve({
+                content: [{ type: "text", text: stdoutBuf || stderrBuf || "(no output)" }]
+              });
+            }
+          });
+          child.on("error", (err) => {
+            resolve({
+              content: [
+                {
+                  type: "text",
+                  text: `Error: ${err.message}`
+                }
+              ],
+              isError: true
+            });
+          });
+        });
       }
     );
     server.tool(
@@ -1298,14 +1358,14 @@ Cause: ${e.message}${hint}` }],
       },
       async ({ text }) => {
         const p = platform();
-        const { spawn } = await import("child_process");
+        const { spawn: spawn2 } = await import("child_process");
         const cmd = {
           mac: { bin: "pbcopy", args: [] },
           win: { bin: "powershell", args: ["-Command", "$input | Set-Clipboard"] },
           linux: { bin: "xclip", args: ["-selection", "clipboard"] }
         }[p];
         await new Promise((resolve, reject) => {
-          const proc = spawn(cmd.bin, cmd.args, { stdio: ["pipe", "ignore", "ignore"] });
+          const proc = spawn2(cmd.bin, cmd.args, { stdio: ["pipe", "ignore", "ignore"] });
           proc.on("error", reject);
           proc.on("close", (code) => code === 0 ? resolve() : reject(new Error(`${cmd.bin} exited ${code}`)));
           proc.stdin.end(text);
@@ -1337,9 +1397,9 @@ Cause: ${e.message}${hint}` }],
             return { content: [{ type: "text", text: "Already recording." }] };
           }
           const tmpPath = output_path ?? `/tmp/junis_record_${Date.now()}.mp4`;
-          const { spawn } = await import("child_process");
+          const { spawn: spawn2 } = await import("child_process");
           const cmd = p === "mac" ? ["screencapture", ["-v", tmpPath]] : ["ffmpeg", ["-f", p === "win" ? "gdigrab" : "x11grab", "-i", p === "win" ? "desktop" : ":0.0", tmpPath]];
-          const child = spawn(cmd[0], cmd[1], { detached: true, stdio: "ignore" });
+          const child = spawn2(cmd[0], cmd[1], { detached: true, stdio: "ignore" });
           child.unref();
           screenRecordPid = child.pid ?? null;
           return { content: [{ type: "text", text: `Recording started. Output path: ${tmpPath} (PID: ${screenRecordPid})` }] };
@@ -2277,13 +2337,17 @@ var DesktopTools = class {
 var mcpPort = 3e3;
 var globalBrowserTools = null;
 var desktopToolsEnabled = false;
+var globalRelayClient = null;
+function setRelayClient(client) {
+  globalRelayClient = client;
+}
 function createMcpServer() {
   const server = new McpServer({
     name: "junis",
     version: "0.1.0"
   });
   const fsTools = new FilesystemTools();
-  fsTools.register(server);
+  fsTools.register(server, globalRelayClient ?? void 0);
   if (globalBrowserTools) {
     globalBrowserTools.register(server);
   }
@@ -2574,6 +2638,7 @@ async function handleMCPRequest(id, payload) {
 export {
   checkPermission,
   handleMCPRequest,
+  setRelayClient,
   startMCPServer,
   toolPermissions
 };

package/dist/server/stdio.js

@@ -5,7 +5,7 @@ import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 
 // src/tools/filesystem.ts
-import { exec, execFile } from "child_process";
+import { exec, execFile, spawn } from "child_process";
 import { promisify } from "util";
 import fs from "fs/promises";
 import path from "path";
@@ -76,7 +76,9 @@ function checkPermission(toolName) {
 var execAsync = promisify(exec);
 var execFileAsync = promisify(execFile);
 var FilesystemTools = class {
-  register(server) {
+  relayClient;
+  register(server, relayClient) {
+    this.relayClient = relayClient;
     server.tool(
       "execute_command",
       [
@@ -112,26 +114,84 @@ var FilesystemTools = class {
           exec(command);
           return { content: [{ type: "text", text: "Background execution started" }] };
         }
-        try {
-          const { stdout, stderr } = await execAsync(command, {
+        const requestId = this.relayClient?.currentRequestId ?? null;
+        if (requestId) {
+          this.relayClient?.sendProgress(requestId, `$ ${command}`);
+        }
+        return new Promise((resolve) => {
+          const child = spawn("sh", ["-c", command], {
             timeout: timeout_ms
           });
-          return {
-            content: [{ type: "text", text: stdout || stderr || "(no output)" }]
-          };
-        } catch (err) {
-          const error = err;
-          return {
-            content: [
-              {
-                type: "text",
-                text: `Error (exit ${error.code ?? "?"}): ${error.message}
-${error.stderr ?? ""}`
+          let stdoutBuf = "";
+          let stderrBuf = "";
+          let stdoutLineBuffer = "";
+          let stderrLineBuffer = "";
+          const flushLines = (buffer, newChunk) => {
+            const combined = buffer + newChunk;
+            const lines = combined.split("\n");
+            const incomplete = lines.pop() ?? "";
+            for (const line of lines) {
+              if (requestId) {
+                this.relayClient?.sendProgress(requestId, line);
               }
-            ],
-            isError: true
+            }
+            return incomplete;
           };
-        }
+          child.stdout.on("data", (chunk) => {
+            const text = chunk.toString();
+            stdoutBuf += text;
+            stdoutLineBuffer = flushLines(stdoutLineBuffer, text);
+          });
+          child.stderr.on("data", (chunk) => {
+            const text = chunk.toString();
+            stderrBuf += text;
+            stderrLineBuffer = flushLines(stderrLineBuffer, text);
+          });
+          child.on("close", (code, signal) => {
+            if (stdoutLineBuffer && requestId) {
+              this.relayClient?.sendProgress(requestId, stdoutLineBuffer);
+            }
+            if (stderrLineBuffer && requestId) {
+              this.relayClient?.sendProgress(requestId, stderrLineBuffer);
+            }
+            if (signal) {
+              resolve({
+                content: [
+                  {
+                    type: "text",
+                    text: `Killed by signal ${signal} (timeout: ${timeout_ms}ms)`
+                  }
+                ],
+                isError: true
+              });
+            } else if (code !== 0 && code !== null) {
+              resolve({
+                content: [
+                  {
+                    type: "text",
+                    text: `Error (exit ${code}): ${stderrBuf || stdoutBuf || "(no output)"}`
+                  }
+                ],
+                isError: true
+              });
+            } else {
+              resolve({
+                content: [{ type: "text", text: stdoutBuf || stderrBuf || "(no output)" }]
+              });
+            }
+          });
+          child.on("error", (err) => {
+            resolve({
+              content: [
+                {
+                  type: "text",
+                  text: `Error: ${err.message}`
+                }
+              ],
+              isError: true
+            });
+          });
+        });
       }
     );
     server.tool(
@@ -1299,14 +1359,14 @@ Cause: ${e.message}${hint}` }],
       },
       async ({ text }) => {
         const p = platform();
-        const { spawn } = await import("child_process");
+        const { spawn: spawn2 } = await import("child_process");
         const cmd = {
           mac: { bin: "pbcopy", args: [] },
           win: { bin: "powershell", args: ["-Command", "$input | Set-Clipboard"] },
           linux: { bin: "xclip", args: ["-selection", "clipboard"] }
         }[p];
         await new Promise((resolve, reject) => {
-          const proc = spawn(cmd.bin, cmd.args, { stdio: ["pipe", "ignore", "ignore"] });
+          const proc = spawn2(cmd.bin, cmd.args, { stdio: ["pipe", "ignore", "ignore"] });
           proc.on("error", reject);
           proc.on("close", (code) => code === 0 ? resolve() : reject(new Error(`${cmd.bin} exited ${code}`)));
           proc.stdin.end(text);
@@ -1338,9 +1398,9 @@ Cause: ${e.message}${hint}` }],
             return { content: [{ type: "text", text: "Already recording." }] };
           }
           const tmpPath = output_path ?? `/tmp/junis_record_${Date.now()}.mp4`;
-          const { spawn } = await import("child_process");
+          const { spawn: spawn2 } = await import("child_process");
           const cmd = p === "mac" ? ["screencapture", ["-v", tmpPath]] : ["ffmpeg", ["-f", p === "win" ? "gdigrab" : "x11grab", "-i", p === "win" ? "desktop" : ":0.0", tmpPath]];
-          const child = spawn(cmd[0], cmd[1], { detached: true, stdio: "ignore" });
+          const child = spawn2(cmd[0], cmd[1], { detached: true, stdio: "ignore" });
           child.unref();
           screenRecordPid = child.pid ?? null;
           return { content: [{ type: "text", text: `Recording started. Output path: ${tmpPath} (PID: ${screenRecordPid})` }] };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "junis",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "One-line device control for AI agents",
   "type": "module",
   "bin": {