noninteractive 0.3.15 → 0.3.17

package/bin/noninteractive.js

@@ -347,7 +347,7 @@ var init_daemon = __esm(() => {
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "noninteractive",
-    version: "0.3.15",
+    version: "0.3.17",
     type: "module",
     bin: {
       noninteractive: "./bin/noninteractive.js"
@@ -512,10 +512,21 @@ function getSelfCommand() {
 function deriveSessionName(cmd, args) {
   const parts = [cmd, ...args];
   let i = 0;
-  if (parts[i] === "npx" || parts[i] === "bunx")
-    i++;
-  while (i < parts.length && parts[i].startsWith("-"))
-    i++;
+  while (i < parts.length) {
+    if (parts[i] === "npx" || parts[i] === "bunx") {
+      i++;
+      continue;
+    }
+    if (parts[i] === "--") {
+      i++;
+      continue;
+    }
+    if (parts[i].startsWith("-")) {
+      i++;
+      continue;
+    }
+    break;
+  }
   const name = parts[i] || cmd;
   const stripped = name.replace(/(?<=.)@[^/].*$/, "");
   return (stripped || name).replace(/^@[^/]+\//, "").replace(/[^a-zA-Z0-9_-]/g, "");
@@ -523,29 +534,28 @@ function deriveSessionName(cmd, args) {
 async function start(cmdArgs, noOpen = false) {
   const executable = cmdArgs[0];
   const args = cmdArgs.slice(1);
-  const name = deriveSessionName(executable, args);
-  const sock = socketPath(name);
-  try {
-    const res = await sendMessage(sock, { action: "read" });
-    if (res.ok) {
-      process.stdout.write(stripAnsi(res.output ?? ""));
-      handleUrls(res, noOpen);
-      if (res.exited) {
-        console.log(`
-[session '${name}' already exists but exited ${res.exitCode} \u2014 stopping it]`);
-        try {
-          await sendMessage(sock, { action: "stop" });
-        } catch {}
-      } else {
-        console.log(`
-[session '${name}' already running \u2014 read the output above, then use:]`);
-        console.log(`  npx noninteractive send ${name} "<text>" --wait  # send and wait for response`);
-        console.log(`  npx noninteractive read ${name} --wait        # wait for new output`);
-        console.log(`  npx noninteractive stop ${name}               # stop the session`);
-        return;
+  const baseName = deriveSessionName(executable, args);
+  let name = baseName;
+  let suffix = 1;
+  while (true) {
+    const sock2 = socketPath(name);
+    try {
+      const res = await sendMessage(sock2, { action: "read" });
+      if (res.ok) {
+        if (res.exited) {
+          try {
+            await sendMessage(sock2, { action: "stop" });
+          } catch {}
+          break;
+        }
+        suffix++;
+        name = `${baseName}-${suffix}`;
+        continue;
       }
-    }
-  } catch {}
+    } catch {}
+    break;
+  }
+  const sock = socketPath(name);
   ensureSessionsDir();
   try {
     const { unlinkSync: unlinkSync2 } = await import("fs");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "noninteractive",
-  "version": "0.3.15",
+  "version": "0.3.17",
   "type": "module",
   "bin": {
     "noninteractive": "./bin/noninteractive.js"