@tongil_kim/clautunnel 1.4.1 → 1.5.1

package/dist/index.d.ts

@@ -83,7 +83,7 @@ declare class RealtimeClient extends EventEmitter {
     broadcastUserQuestion(questionData: UserQuestionData): Promise<void>;
     broadcastPermissionRequest(requestData: PermissionRequestData): Promise<void>;
     broadcastToolUse(toolUseData: ToolUseData): Promise<void>;
-    broadcastStatusResponse(isProcessing: boolean, isMessageQueued: boolean): Promise<void>;
+    broadcastStatusResponse(isProcessing: boolean, isMessageQueued: boolean, permissionMode?: PermissionMode): Promise<void>;
     broadcastComplete(): Promise<void>;
     broadcastSessionTitle(title: string): Promise<void>;
     broadcastQueued(): Promise<void>;

package/dist/index.js

@@ -127,6 +127,51 @@ var require_constants = __commonJS({
   }
 });
 
+// ../../packages/shared/dist/utils/permission-mode.js
+var require_permission_mode = __commonJS({
+  "../../packages/shared/dist/utils/permission-mode.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.isPermissionMode = isPermissionMode3;
+    var VALID_PERMISSION_MODES = [
+      "default",
+      "acceptEdits",
+      "plan",
+      "bypassPermissions",
+      "delegate",
+      "dontAsk"
+    ];
+    function isPermissionMode3(value) {
+      return typeof value === "string" && VALID_PERMISSION_MODES.includes(value);
+    }
+  }
+});
+
+// ../../packages/shared/dist/utils/index.js
+var require_utils = __commonJS({
+  "../../packages/shared/dist/utils/index.js"(exports) {
+    "use strict";
+    var __createBinding = exports && exports.__createBinding || (Object.create ? (function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
+    }) : (function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      o[k2] = m[k];
+    }));
+    var __exportStar = exports && exports.__exportStar || function(m, exports2) {
+      for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports2, p)) __createBinding(exports2, m, p);
+    };
+    Object.defineProperty(exports, "__esModule", { value: true });
+    __exportStar(require_permission_mode(), exports);
+  }
+});
+
 // ../../packages/shared/dist/index.js
 var require_dist = __commonJS({
   "../../packages/shared/dist/index.js"(exports) {
@@ -150,12 +195,13 @@ var require_dist = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     __exportStar(require_types(), exports);
     __exportStar(require_constants(), exports);
+    __exportStar(require_utils(), exports);
   }
 });
 
 // src/index.ts
 import { config } from "dotenv";
-import { resolve as resolve2, dirname as dirname2 } from "path";
+import { resolve as resolve2, dirname as dirname3 } from "path";
 import { readFileSync as readFileSync5 } from "fs";
 import { fileURLToPath } from "url";
 
@@ -715,7 +761,7 @@ var RealtimeClient = class extends EventEmitter {
     }
     this.emit("broadcast", message);
   }
-  async broadcastStatusResponse(isProcessing, isMessageQueued) {
+  async broadcastStatusResponse(isProcessing, isMessageQueued, permissionMode) {
     if (!this.outputChannel) {
       throw new Error("Not connected");
     }
@@ -726,6 +772,7 @@ var RealtimeClient = class extends EventEmitter {
       type: "status-response",
       isProcessing,
       isMessageQueued,
+      permissionMode,
       timestamp: Date.now(),
       seq: ++this.seq
     };
@@ -1000,8 +1047,8 @@ var SdkSession = class extends EventEmitter2 {
   pendingContextTransfer = false;
   thinkingEnabled = false;
   pendingPermissionRequests = /* @__PURE__ */ new Map();
-  // Pending AskUserQuestion answer resolver - resolved by provideAnswer()
-  pendingAnswerResolve = null;
+  // Pending AskUserQuestion answer promise
+  pendingAnswerRequest = null;
   // Track pending question/permission data for re-broadcast on status-request
   pendingQuestionData = null;
   pendingPermissionData = null;
@@ -1031,7 +1078,10 @@ var SdkSession = class extends EventEmitter2 {
     if (response.behavior === "allow") {
       const result = {
         behavior: "allow",
-        updatedInput: response.updatedInput,
+        // updatedInput is required by the SDK's Zod schema — if omitted,
+        // JSON.stringify drops the key and subprocess validation fails.
+        // Fall back to the original tool input to keep it valid.
+        updatedInput: response.updatedInput ?? pending.toolInput,
         updatedPermissions: response.updatedPermissions
       };
       pending.resolve(result);
@@ -1075,15 +1125,18 @@ var SdkSession = class extends EventEmitter2 {
           this.emit("user-question", questionData);
           const answers = await new Promise(
             (resolve3, reject) => {
-              this.pendingAnswerResolve = resolve3;
+              const pendingRequest = { resolve: resolve3, reject };
+              this.pendingAnswerRequest = pendingRequest;
               options.signal.addEventListener("abort", () => {
-                this.pendingAnswerResolve = null;
-                this.pendingQuestionData = null;
+                if (this.pendingAnswerRequest === pendingRequest) {
+                  this.pendingAnswerRequest = null;
+                  this.pendingQuestionData = null;
+                }
                 reject(new Error("Question aborted"));
               });
             }
           );
-          this.pendingAnswerResolve = null;
+          this.pendingAnswerRequest = null;
           this.pendingQuestionData = null;
           return {
             behavior: "allow",
@@ -1134,7 +1187,8 @@ var SdkSession = class extends EventEmitter2 {
         this.pendingPermissionRequests.set(requestId, {
           resolve: resolve3,
           reject,
-          signal: options.signal
+          signal: options.signal,
+          toolInput: input
         });
         options.signal.addEventListener("abort", () => {
           this.pendingPermissionRequests.delete(requestId);
@@ -1145,7 +1199,23 @@ var SdkSession = class extends EventEmitter2 {
     };
   }
   setPermissionMode(mode) {
+    const modeChanged = this.currentPermissionMode !== mode;
     this.currentPermissionMode = mode;
+    if (modeChanged) {
+      this.clearPendingInteractionState("Session reconfigured");
+      if (this.v2Session) {
+        this.v2Session.close();
+        this.v2Session = null;
+        this.streamLoopRunning = false;
+        this.sessionId = null;
+        this.isProcessing = false;
+        this.pendingPrompt = null;
+        this.pendingContextTransfer = true;
+      } else if (this.sessionId) {
+        this.sessionId = null;
+        this.pendingContextTransfer = true;
+      }
+    }
     this.emit("permission-mode", mode);
   }
   getPermissionMode() {
@@ -1426,19 +1496,17 @@ ${contextLines.join("\n")}
     if (answerText.trim()) {
       this.conversationHistory.push({ role: "user", content: answerText });
     }
-    if (this.pendingAnswerResolve) {
+    if (this.pendingAnswerRequest) {
       const resolvedAnswers = answers || { result: answerText };
-      this.pendingAnswerResolve(resolvedAnswers);
-      this.pendingAnswerResolve = null;
+      const pendingRequest = this.pendingAnswerRequest;
+      this.pendingAnswerRequest = null;
+      pendingRequest.resolve(resolvedAnswers);
       return;
     }
     await this.sendPrompt(answerText);
   }
   cancel() {
-    this.pendingAnswerResolve = null;
-    this.pendingQuestionData = null;
-    this.pendingPermissionData = null;
-    this.pendingPermissionRequests.clear();
+    this.clearPendingInteractionState("Session cancelled");
     if (this.v2Session) {
       this.v2Session.close();
       this.v2Session = null;
@@ -1481,6 +1549,7 @@ ${contextLines.join("\n")}
   async setModel(model) {
     if (model === this.currentModel) return;
     this.currentModel = model;
+    this.clearPendingInteractionState("Session reconfigured");
     if (this.v2Session) {
       this.v2Session.close();
       this.v2Session = null;
@@ -1512,6 +1581,18 @@ ${contextLines.join("\n")}
     this.isProcessing = false;
     this.pendingPrompt = null;
   }
+  clearPendingInteractionState(reason) {
+    if (this.pendingAnswerRequest) {
+      this.pendingAnswerRequest.reject(new Error(reason));
+      this.pendingAnswerRequest = null;
+    }
+    this.pendingQuestionData = null;
+    this.pendingPermissionData = null;
+    for (const pending of this.pendingPermissionRequests.values()) {
+      pending.reject(new Error(reason));
+    }
+    this.pendingPermissionRequests.clear();
+  }
   async getSupportedModels() {
     const coreModels = [
       { value: "opus", displayName: "Opus 4.6", description: "Opus 4.6 \xB7 Most capable for complex work" },
@@ -1651,6 +1732,7 @@ ${contextLines.join("\n")}
 };
 
 // src/daemon/config-manager.ts
+var import_clautunnel_shared2 = __toESM(require_dist(), 1);
 import { existsSync as existsSync3, readFileSync as readFileSync3, writeFileSync as writeFileSync2, mkdirSync as mkdirSync2 } from "fs";
 import { join as join3, dirname } from "path";
 import { homedir as homedir3 } from "os";
@@ -1720,6 +1802,14 @@ var ConfigManager = class {
     const settings = this.getMergedSettings();
     return settings.alwaysThinkingEnabled ?? false;
   }
+  /**
+   * Get the current permission mode setting from merged settings
+   */
+  getPermissionMode() {
+    const settings = this.getMergedSettings();
+    const mode = settings.permissions?.mode;
+    return (0, import_clautunnel_shared2.isPermissionMode)(mode) ? mode : "default";
+  }
   getInteractiveData(command) {
     const settings = this.getMergedSettings();
     switch (command) {
@@ -1964,6 +2054,7 @@ var ConfigManager = class {
 };
 
 // src/daemon/daemon.ts
+var import_clautunnel_shared3 = __toESM(require_dist(), 1);
 var Daemon = class extends EventEmitter3 {
   options;
   sdkSession;
@@ -1980,18 +2071,19 @@ var Daemon = class extends EventEmitter3 {
   constructor(options) {
     super();
     this.options = options;
-    this.sdkSession = new SdkSession({
+    this.configManager = new ConfigManager({
       cwd: options.cwd
     });
+    this.sdkSession = new SdkSession({
+      cwd: options.cwd,
+      permissionMode: this.configManager.getPermissionMode()
+    });
     this.sessionManager = new SessionManager({
       supabase: options.supabase
     });
     this.machineManager = new MachineManager({
       supabase: options.supabase
     });
-    this.configManager = new ConfigManager({
-      cwd: options.cwd
-    });
     const thinkingEnabled = this.configManager.getThinkingMode();
     if (thinkingEnabled) {
       this.sdkSession.setThinkingMode(true);
@@ -2195,7 +2287,11 @@ ${confirmationMsg}
             const isProcessing = this.sdkSession.isActive();
             const isActivelyWorking = isProcessing && !pendingQuestion && !pendingPermission;
             const isMessageQueued = this.sdkSession.hasPendingPrompt();
-            await this.realtimeClient.broadcastStatusResponse(isActivelyWorking, isMessageQueued);
+            await this.realtimeClient.broadcastStatusResponse(
+              isActivelyWorking,
+              isMessageQueued,
+              this.sdkSession.getPermissionMode()
+            );
           } catch {
           }
         }
@@ -2220,6 +2316,9 @@ ${confirmationMsg}
       }
       if (message.type === "interactive-apply" && message.interactivePayload) {
         const result = this.configManager.applyChange(message.interactivePayload);
+        if (result.success && message.interactivePayload.command === "permissions" && (0, import_clautunnel_shared3.isPermissionMode)(message.interactivePayload.value)) {
+          this.sdkSession.setPermissionMode(message.interactivePayload.value);
+        }
         if (message.interactivePayload.command === "config" && message.interactivePayload.key === "alwaysThinkingEnabled") {
           const enabled = Boolean(message.interactivePayload.value);
           await this.sdkSession.setThinkingMode(enabled);
@@ -2399,7 +2498,7 @@ import { Command } from "commander";
 import WebSocket from "ws";
 
 // src/realtime/machine-client.ts
-var import_clautunnel_shared2 = __toESM(require_dist(), 1);
+var import_clautunnel_shared4 = __toESM(require_dist(), 1);
 import { EventEmitter as EventEmitter4 } from "events";
 var MachineRealtimeClient = class extends EventEmitter4 {
   supabase;
@@ -2413,12 +2512,12 @@ var MachineRealtimeClient = class extends EventEmitter4 {
     this.machineId = options.machineId;
   }
   async connect() {
-    const inputChannelName = import_clautunnel_shared2.REALTIME_CHANNELS.machineInput(this.machineId);
+    const inputChannelName = import_clautunnel_shared4.REALTIME_CHANNELS.machineInput(this.machineId);
     this.inputChannel = this.supabase.channel(inputChannelName);
     this.inputChannel.on("broadcast", { event: "machine-command" }, (payload) => {
       this.emit("command", payload.payload);
     });
-    const outputChannelName = import_clautunnel_shared2.REALTIME_CHANNELS.machineOutput(this.machineId);
+    const outputChannelName = import_clautunnel_shared4.REALTIME_CHANNELS.machineOutput(this.machineId);
     this.outputChannel = this.supabase.channel(outputChannelName);
     const results = await Promise.all([
       subscribeWithTimeout(this.inputChannel, "machine-input"),
@@ -2426,7 +2525,7 @@ var MachineRealtimeClient = class extends EventEmitter4 {
     ]);
     const connected = results.every((success) => success);
     if (connected) {
-      const presenceChannelName = import_clautunnel_shared2.REALTIME_CHANNELS.machinePresence(this.machineId);
+      const presenceChannelName = import_clautunnel_shared4.REALTIME_CHANNELS.machinePresence(this.machineId);
       this.presenceChannel = this.supabase.channel(presenceChannelName);
       this.presenceChannel.subscribe(async (status) => {
         if (status === "SUBSCRIBED" && this.presenceChannel) {
@@ -3062,6 +3161,79 @@ var MobileServerManager = class {
   }
 };
 
+// src/utils/pid.ts
+import * as fs2 from "fs";
+import * as path3 from "path";
+import * as os4 from "os";
+var PID_FILE = path3.join(os4.homedir(), ".clautunnel", "daemon.pid");
+var startTimestamp = Date.now();
+function acquirePidFile(pidFile = PID_FILE) {
+  const dir = path3.dirname(pidFile);
+  if (!fs2.existsSync(dir)) {
+    fs2.mkdirSync(dir, { recursive: true });
+  }
+  const content = `${process.pid}:${startTimestamp}`;
+  try {
+    const fd = fs2.openSync(pidFile, "wx");
+    fs2.writeSync(fd, content);
+    fs2.closeSync(fd);
+    return null;
+  } catch (err) {
+    if (err.code !== "EEXIST") {
+      throw err;
+    }
+  }
+  const existing = parsePidFile(pidFile);
+  if (existing === null) {
+    removePidFileUnchecked(pidFile);
+    return acquirePidFile(pidFile);
+  }
+  if (isProcessAlive(existing.pid)) {
+    return existing.pid;
+  }
+  removePidFileUnchecked(pidFile);
+  return acquirePidFile(pidFile);
+}
+function removePidFile(pidFile = PID_FILE) {
+  const existing = parsePidFile(pidFile);
+  if (existing && existing.pid === process.pid && existing.timestamp === startTimestamp) {
+    removePidFileUnchecked(pidFile);
+  }
+}
+function readPidFile(pidFile = PID_FILE) {
+  const existing = parsePidFile(pidFile);
+  return existing?.pid ?? null;
+}
+function isProcessAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function pidFileExists(pidFile = PID_FILE) {
+  return fs2.existsSync(pidFile);
+}
+function parsePidFile(pidFile) {
+  try {
+    const content = fs2.readFileSync(pidFile, "utf-8").trim();
+    const parts = content.split(":");
+    const pid = parseInt(parts[0], 10);
+    const timestamp = parts.length > 1 ? parseInt(parts[1], 10) : 0;
+    if (isNaN(pid)) return null;
+    return { pid, timestamp: isNaN(timestamp) ? 0 : timestamp };
+  } catch {
+    return null;
+  }
+}
+function removePidFileUnchecked(pidFile) {
+  try {
+    fs2.unlinkSync(pidFile);
+  } catch {
+  }
+}
+
 // src/commands/start.ts
 if (typeof globalThis.WebSocket === "undefined") {
   globalThis.WebSocket = WebSocket;
@@ -3075,6 +3247,12 @@ function createStartCommand() {
     const daemons = /* @__PURE__ */ new Map();
     let machineClient = null;
     try {
+      const existingPid = acquirePidFile();
+      if (existingPid !== null) {
+        logger.error(`Another clautunnel process is already running (PID: ${existingPid})`);
+        logger.error('Run "clautunnel stop" first, or kill the existing process.');
+        process.exit(1);
+      }
       config2.requireConfiguration();
       spinner.start();
       const supabase = createSupabaseClient(
@@ -3089,6 +3267,7 @@ function createStartCommand() {
         logger.error(
           'Run "clautunnel login" or "clautunnel signup" first.'
         );
+        removePidFile();
         process.exit(1);
       }
       const { user } = session;
@@ -3186,11 +3365,13 @@ function createStartCommand() {
           logger.info("");
         } else {
           logger.error(`Mobile server failed: ${result.error}`);
+          removePidFile();
           process.exit(1);
         }
         spinner.start();
       }
       const cleanup2 = async () => {
+        removePidFile();
         if (mobileServer) {
           try {
             await mobileServer.stop();
@@ -3202,6 +3383,14 @@ function createStartCommand() {
         }
         cleanup(sleepState);
       };
+      spinner.update("Registering machine...");
+      const machineManager = new MachineManager({ supabase });
+      const machine = await machineManager.registerMachine(
+        user.id,
+        options.name,
+        config2.getMachineId()
+      );
+      config2.setMachineId(machine.id);
       let isShuttingDown = false;
       const gracefulShutdown = async (signal) => {
         if (isShuttingDown) {
@@ -3219,6 +3408,10 @@ function createStartCommand() {
             }
             daemons.delete(sessionId);
           }
+          try {
+            await machineManager.updateMachineStatus(machine.id, "offline");
+          } catch {
+          }
           if (machineClient) {
             await machineClient.disconnect();
             machineClient = null;
@@ -3237,14 +3430,6 @@ function createStartCommand() {
       process.on("SIGTERM", () => {
         gracefulShutdown("SIGTERM").catch(console.error);
       });
-      spinner.update("Registering machine...");
-      const machineManager = new MachineManager({ supabase });
-      const machine = await machineManager.registerMachine(
-        user.id,
-        options.name,
-        config2.getMachineId()
-      );
-      config2.setMachineId(machine.id);
       spinner.update("Connecting to realtime...");
       machineClient = new MachineRealtimeClient({
         supabase,
@@ -3259,6 +3444,7 @@ function createStartCommand() {
         logger.error('  1. Open a new terminal and run "clautunnel start" again');
         logger.error("  2. Check your network connection");
         logger.error('  3. Try "clautunnel login" to refresh your session');
+        removePidFile();
         process.exit(1);
       }
       logger.info("");
@@ -3360,6 +3546,7 @@ function createStartCommand() {
         }
       });
     } catch (error) {
+      removePidFile();
       if (error instanceof ConfigurationError) {
         spinner.stop();
         logger.error(error.message);
@@ -3377,42 +3564,47 @@ function createStartCommand() {
 
 // src/commands/stop.ts
 import { Command as Command2 } from "commander";
-import * as fs2 from "fs";
-import * as path3 from "path";
-import * as os4 from "os";
-var PID_FILE = path3.join(os4.homedir(), ".clautunnel", "daemon.pid");
+import * as fs3 from "fs";
 function createStopCommand() {
   const command = new Command2("stop");
   command.description("Stop the running daemon").action(async () => {
     const logger = new Logger();
     try {
-      if (!fs2.existsSync(PID_FILE)) {
+      const pid = readPidFile();
+      if (pid === null) {
         logger.info("No daemon is running");
         return;
       }
-      const pid = parseInt(fs2.readFileSync(PID_FILE, "utf-8").trim(), 10);
-      if (isNaN(pid)) {
-        logger.error("Invalid PID file");
-        fs2.unlinkSync(PID_FILE);
+      if (!isProcessAlive(pid)) {
+        logger.info("Daemon process not found (already stopped)");
+        try {
+          fs3.unlinkSync(PID_FILE);
+        } catch {
+        }
         return;
       }
       try {
-        process.kill(pid, 0);
         process.kill(pid, "SIGTERM");
         logger.info(`Sent stop signal to daemon (PID: ${pid})`);
         let attempts = 0;
+        let pidFileRemoved = false;
         while (attempts < 10) {
           await new Promise((resolve3) => setTimeout(resolve3, 500));
-          try {
-            process.kill(pid, 0);
-            attempts++;
-          } catch {
+          if (!pidFileExists()) {
+            pidFileRemoved = true;
+            break;
+          }
+          if (!isProcessAlive(pid)) {
             break;
           }
+          attempts++;
         }
-        if (attempts >= 10) {
-          logger.warn("Daemon did not stop gracefully, sending SIGKILL");
-          process.kill(pid, "SIGKILL");
+        if (attempts >= 10 && !pidFileRemoved) {
+          const currentPid2 = readPidFile();
+          if (currentPid2 === pid && isProcessAlive(pid)) {
+            logger.warn("Daemon did not stop gracefully, sending SIGKILL");
+            process.kill(pid, "SIGKILL");
+          }
         }
         logger.info("Daemon stopped");
       } catch (err) {
@@ -3422,8 +3614,12 @@ function createStopCommand() {
           throw err;
         }
       }
-      if (fs2.existsSync(PID_FILE)) {
-        fs2.unlinkSync(PID_FILE);
+      const currentPid = readPidFile();
+      if (currentPid === pid) {
+        try {
+          fs3.unlinkSync(PID_FILE);
+        } catch {
+        }
       }
     } catch (error) {
       logger.error(
@@ -3801,7 +3997,7 @@ function createMobileSetupCommand() {
 
 // src/index.ts
 var __filename = fileURLToPath(import.meta.url);
-var __dirname = dirname2(__filename);
+var __dirname = dirname3(__filename);
 config({ path: resolve2(__dirname, "../.env"), quiet: true });
 var packageJson = JSON.parse(
   readFileSync5(resolve2(__dirname, "../package.json"), "utf-8")