From 59417bb47fe5ceae576691fe5aa8acd3f9e72461 Mon Sep 17 00:00:00 2001
From: dev-guard <dev-guard@openrig.local>
Date: Sat, 7 Nov 2026 05:24:01 +0000
Subject: [PATCH] fix: qualify bare external attach names with their rig

---
 packages/cli/src/commands/attach.ts               | 2 +-
 packages/daemon/src/domain/self-attach-service.ts | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/commands/attach.ts b/packages/cli/src/commands/attach.ts
index 4b2da0468..a5e55955a 100644
--- a/packages/cli/src/commands/attach.ts
+++ b/packages/cli/src/commands/attach.ts
@@ -62,7 +62,7 @@ export function attachCommand(depsOverride?: StatusDeps): Command {
     .option("--member <name>", "Member name for pod attach mode")
     .option("--runtime <runtime>", "Runtime for pod attach mode; optional guard for node mode")
     .option("--cwd <path>", "Working directory to record", process.cwd())
-    .option("--display-name <name>", "Display label inside tmux; external session name outside tmux")
+    .option("--display-name <name>", "Display label inside tmux; external session address outside tmux (bare names gain @rig)")
     .option("--print-env", "Print shell exports for OPENRIG_NODE_ID and OPENRIG_SESSION_NAME")
     .option("--json", "JSON output, including the activity env the attached app needs. Its token is a credential: don't print or paste it, and use rig whoami for identity")
     .action(async (opts: {
diff --git a/packages/daemon/src/domain/self-attach-service.ts b/packages/daemon/src/domain/self-attach-service.ts
index 9fd3fdb1d..e7b312f9b 100644
--- a/packages/daemon/src/domain/self-attach-service.ts
+++ b/packages/daemon/src/domain/self-attach-service.ts
@@ -343,9 +343,10 @@ export class SelfAttachService {
       return context;
     }
     const explicit = context?.attachmentType === "external_cli" ? context.sessionName?.trim() : displayName?.trim();
+    const sessionName = explicit || logicalId.replace(/\./g, "-");
     return {
       attachmentType: "external_cli",
-      sessionName: explicit || `${logicalId.replace(/\./g, "-")}@${rigName}`,
+      sessionName: sessionName.includes("@") ? sessionName : `${sessionName}@${rigName}`,
     };
   }