@openacp/cli 2026.408.1 → 2026.408.2

package/dist/cli.js

@@ -5716,7 +5716,7 @@ var init_openacp = __esm({
         this.startHeartbeat();
         return this.publicUrl;
       }
-      async stop(force = false) {
+      async stop(force = false, preserveState = false) {
         this.stopHeartbeat();
         const child = this.child;
         const tunnelId = this.tunnelId;
@@ -5732,7 +5732,7 @@ var init_openacp = __esm({
             child.once("exit", () => clearTimeout(killTimer));
           }
         }
-        if (tunnelId) {
+        if (tunnelId && !preserveState) {
           this.deleteFromWorker(tunnelId).catch((err) => {
             log8.warn({ err: err.message }, "Failed to delete tunnel from worker");
           });
@@ -5740,7 +5740,7 @@ var init_openacp = __esm({
           delete all[String(localPort)];
           await this.storage.set(STORAGE_KEY, all);
         }
-        log8.info({ localPort }, "OpenACP tunnel stopped");
+        log8.info({ localPort, preserveState }, "OpenACP tunnel stopped");
       }
       getPublicUrl() {
         return this.publicUrl;
@@ -5783,6 +5783,16 @@ var init_openacp = __esm({
             return;
           }
           this.child = child;
+          const onData = (data) => {
+            const line = data.toString();
+            if (/Registered tunnel connection/.test(line)) {
+              clearTimeout(timeout);
+              log8.info({ port }, "cloudflared connection registered");
+              settle(resolve8);
+            }
+          };
+          child.stdout?.on("data", onData);
+          child.stderr?.on("data", onData);
           child.on("error", (err) => {
             clearTimeout(timeout);
             settle(() => reject(new Error(`cloudflared failed to start: ${err.message}`)));
@@ -6059,19 +6069,24 @@ var init_tunnel_registry = __esm({
         }
       }
       async shutdown() {
+        if (this.shuttingDown) return;
         this.keepalive.stop();
         this.shuttingDown = true;
+        if (this.saveTimeout) {
+          clearTimeout(this.saveTimeout);
+          this.saveTimeout = null;
+        }
         const stopPromises = [];
         for (const [, live] of this.entries) {
           if (live.retryTimer) clearTimeout(live.retryTimer);
           if (live.process) {
-            stopPromises.push(live.process.stop(true).catch(() => {
+            stopPromises.push(live.process.stop(true, true).catch(() => {
             }));
           }
         }
         await Promise.all(stopPromises);
+        this.save();
         this.entries.clear();
-        this.scheduleSave();
       }
       list(includeSystem = false) {
         const entries = Array.from(this.entries.values()).map((l) => l.entry);
@@ -6096,16 +6111,20 @@ var init_tunnel_registry = __esm({
           const raw = JSON.parse(fs16.readFileSync(this.registryPath, "utf-8"));
           log9.info({ count: raw.length }, "Restoring tunnels");
           const userEntries = raw.filter((e) => e.type === "user");
-          for (const persisted of userEntries) {
-            try {
-              await this.add(persisted.port, {
+          const results = await Promise.allSettled(
+            userEntries.map(
+              (persisted) => this.add(persisted.port, {
                 type: persisted.type,
                 provider: persisted.provider,
-                label: persisted.label,
-                sessionId: persisted.sessionId
-              });
-            } catch (err) {
-              log9.warn({ port: persisted.port, err: err.message }, "Failed to restore tunnel");
+                label: persisted.label
+                // sessionId intentionally omitted — sessions don't survive restart
+              })
+            )
+          );
+          for (let i = 0; i < results.length; i++) {
+            if (results[i].status === "rejected") {
+              const reason = results[i].reason;
+              log9.warn({ port: userEntries[i].port, err: reason.message }, "Failed to restore tunnel");
             }
           }
         } catch (err) {
@@ -6163,7 +6182,9 @@ var init_tunnel_registry = __esm({
           clearTimeout(this.saveTimeout);
           this.saveTimeout = null;
         }
-        this.save();
+        if (!this.shuttingDown) {
+          this.save();
+        }
       }
     };
   }
@@ -8293,7 +8314,9 @@ var init_sessions = __esm({
       sourceAdapterId: z.string().optional(),
       responseAdapterId: z.string().nullable().optional(),
       // Optional file attachments; each decoded and stored via FileService
-      attachments: z.array(AttachmentInputSchema).max(10).optional()
+      attachments: z.array(AttachmentInputSchema).max(10).optional(),
+      // Client-provided turnId to avoid SSE echo race condition
+      turnId: z.string().max(64).optional()
     });
     PermissionResponseBodySchema = z.object({
       permissionId: z.string().min(1).max(200),
@@ -8490,7 +8513,7 @@ async function sessionRoutes(app, deps) {
         attachments = await resolveAttachments(fileService, sessionId, body.attachments);
       }
       const sourceAdapterId = body.sourceAdapterId ?? "api";
-      const turnId = nanoid2(8);
+      const turnId = body.turnId ?? nanoid2(8);
       deps.core.eventBus.emit(BusEvent.MESSAGE_QUEUED, {
         sessionId,
         turnId,
@@ -19303,6 +19326,12 @@ function resolveAgentCommand(cmd) {
     }
   } catch {
   }
+  if (cmd === "npx" || cmd === "uvx") {
+    const sibling = path44.join(path44.dirname(process.execPath), cmd);
+    if (fs40.existsSync(sibling)) {
+      return { command: sibling, args: [] };
+    }
+  }
   return { command: cmd, args: [] };
 }
 var log31, AgentInstance;