@dmsdc-ai/aterm-darwin-arm64 0.1.42 → 0.1.44

package/dist/aterm.app/Contents/Resources/bin/aterm

@@ -77,9 +77,9 @@ try:
                     name = s.get("name") or os.path.basename(s.get("cwd", "")) or s.get("id", "?")
                     cli = s.get("cli", "")
                     cwd = s.get("cwd", "")
-                    status = s.get("status", "")
-                    rows.append((name, cli, cwd, status))
-                cols = ["NAME", "CLI", "CWD", "STATUS"]
+                    terminal = s.get("terminal", "aterm")
+                    rows.append((name, cli, cwd, terminal))
+                cols = ["NAME", "CLI", "CWD", "TERMINAL"]
                 widths = [max(len(c), *(len(r[i]) for r in rows)) for i, c in enumerate(cols)]
                 fmt = "  ".join(f"{{:<{w}}}" for w in widths)
                 print(fmt.format(*cols))
@@ -100,11 +100,106 @@ finally:
 
 case "${1:-help}" in
     list)
-        if [[ -z "$ATERM_IPC_SOCKET" ]]; then exec telepty list "${@:2}"; fi
         if [[ "${2:-}" == "--json" ]]; then
-            ATERM_LIST_JSON=1 aterm_ipc list
+            # JSON mode: output merged JSON
+            python3 -c '
+import json, sys, os, subprocess, os.path
+
+sessions = []
+
+# 1. aterm internal sessions
+sock = os.environ.get("ATERM_IPC_SOCKET", "")
+if sock:
+    import socket as S
+    try:
+        s = S.socket(S.AF_UNIX, S.SOCK_STREAM)
+        s.settimeout(5)
+        s.connect(sock)
+        s.sendall(json.dumps({"action": "ListWorkspaces"}).encode() + b"\n")
+        s.shutdown(S.SHUT_WR)
+        data = b""
+        while True:
+            chunk = s.recv(4096)
+            if not chunk: break
+            data += chunk
+            if b"\n" in data: break
+        s.close()
+        resp = json.loads(data.decode().strip().split("\n")[0])
+        for ws in resp.get("data", []):
+            ws["terminal"] = "aterm"
+            ws.setdefault("name", os.path.basename(ws.get("cwd", "")) or ws.get("id", "?"))
+            sessions.append(ws)
+    except: pass
+
+# 2. telepty external sessions (only if installed)
+try:
+    result = subprocess.run(["telepty", "list", "--json"], capture_output=True, text=True, timeout=5)
+    if result.returncode == 0:
+        tdata = json.loads(result.stdout)
+        for ts in (tdata if isinstance(tdata, list) else tdata.get("sessions", [])):
+            ts.setdefault("terminal", ts.get("terminal", "external"))
+            ts.setdefault("name", ts.get("id", "?"))
+            sessions.append(ts)
+except (FileNotFoundError, subprocess.TimeoutExpired, json.JSONDecodeError): pass
+
+print(json.dumps({"sessions": sessions}))
+'
         else
-            aterm_ipc list
+            # Table mode: merged display
+            python3 -c '
+import json, sys, os, subprocess, os.path
+
+sessions = []
+
+# 1. aterm internal sessions
+sock = os.environ.get("ATERM_IPC_SOCKET", "")
+if sock:
+    import socket as S
+    try:
+        s = S.socket(S.AF_UNIX, S.SOCK_STREAM)
+        s.settimeout(5)
+        s.connect(sock)
+        s.sendall(json.dumps({"action": "ListWorkspaces"}).encode() + b"\n")
+        s.shutdown(S.SHUT_WR)
+        data = b""
+        while True:
+            chunk = s.recv(4096)
+            if not chunk: break
+            data += chunk
+            if b"\n" in data: break
+        s.close()
+        resp = json.loads(data.decode().strip().split("\n")[0])
+        for ws in resp.get("data", []):
+            name = ws.get("name") or os.path.basename(ws.get("cwd", "")) or ws.get("id", "?")
+            cli = ws.get("cli", "")
+            cwd = ws.get("cwd", "")
+            sessions.append((name, cli, cwd, "aterm"))
+    except: pass
+
+# 2. telepty external sessions (only if installed)
+try:
+    result = subprocess.run(["telepty", "list", "--json"], capture_output=True, text=True, timeout=5)
+    if result.returncode == 0:
+        tdata = json.loads(result.stdout)
+        for ts in (tdata if isinstance(tdata, list) else tdata.get("sessions", [])):
+            name = ts.get("name") or ts.get("id", "?")
+            cli = ts.get("cli", "")
+            cwd = ts.get("cwd", "")
+            terminal = ts.get("terminal", "external")
+            sessions.append((name, cli, cwd, terminal))
+except (FileNotFoundError, subprocess.TimeoutExpired, json.JSONDecodeError): pass
+
+if not sessions:
+    print("(no reachable sessions)")
+else:
+    cols = ["NAME", "CLI", "CWD", "TERMINAL"]
+    widths = [max(len(c), *(len(r[i]) for r in sessions)) for i, c in enumerate(cols)]
+    fmt = "  ".join(f"{{:<{w}}}" for w in widths)
+    print(fmt.format(*cols))
+    print("  ".join("\u2500" * w for w in widths))
+    for r in sessions:
+        print(fmt.format(*r))
+'
         fi ;;
     inject)
         if [[ -z "$ATERM_IPC_SOCKET" ]]; then exec telepty inject "${@:2}"; fi
@@ -208,7 +303,7 @@ print(json.dumps({"status":"ok","type": ltype}))
 
 | Command | Description |
 |---------|-------------|
-| `aterm list` | List all workspaces (JSON) |
+| `aterm list` | List workspaces (NAME, CLI, CWD, TERMINAL) |
 | `aterm inject <workspace> <text>` | Send text to a workspace |
 | `aterm status <workspace>` | Check workspace status |
 | `aterm focus <workspace>` | Focus a workspace tab |
@@ -240,6 +335,11 @@ print(json.dumps({"status":"ok","type": ltype}))
 | 'list external sessions' / '외부 세션 목록' | `telepty list` |
 | 'message deliberation session' | `telepty inject aigentry-deliberation-claude 'message'` |
 
+## Session Detection Priority
+1. `aterm list` — internal sessions (project names + terminal=aterm)
+2. `telepty list` — external sessions (project names + terminal type)
+3. NEVER use `ps aux | grep` as primary (no project names, no terminal info)
+
 ## Detection Rules
 - `$ATERM_IPC_SOCKET` set → inside aterm. Use `aterm` commands.
 - `$ATERM_IPC_SOCKET` unset → outside aterm. Use `telepty` commands.

package/dist/aterm.app/Contents/_CodeSignature/CodeResources

@@ -6,7 +6,7 @@
 	<dict>
 		<key>Resources/bin/aterm</key>
 		<data>
-		gCSvUlukYdFw7e5CEaiBmwTblYQ=
+		Eo30lOm6tQOBit8cEckLNf2wOfk=
 		</data>
 	</dict>
 	<key>files2</key>
@@ -24,7 +24,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			GC8l6O6WnDcgzRItQVXGDO4R0YvrkuR70RugB4H7NRs=
+			dIHFn0s4fzTy9zKMZ9mb35TwtC8y7AHoIbJhnFciR3Y=
 			</data>
 		</dict>
 	</dict>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dmsdc-ai/aterm-darwin-arm64",
-  "version": "0.1.42",
+  "version": "0.1.44",
   "description": "darwin-arm64 native bundle for @dmsdc-ai/aterm",
   "type": "module",
   "files": [