diff --git a/.changelog/18901.txt b/.changelog/18901.txt
new file mode 100644
index 00000000000..21d438919da
--- /dev/null
+++ b/.changelog/18901.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+cli: Add file prediction for operator raft/snapshot commands
+```
diff --git a/command/operator_raft_info.go b/command/operator_raft_info.go
index 2db5b6e20ee..c2a2050d834 100644
--- a/command/operator_raft_info.go
+++ b/command/operator_raft_info.go
@@ -36,7 +36,7 @@ func (c *OperatorRaftInfoCommand) AutocompleteFlags() complete.Flags {
 }
 
 func (c *OperatorRaftInfoCommand) AutocompleteArgs() complete.Predictor {
-	return complete.PredictNothing
+	return complete.PredictFiles("*")
 }
 
 func (c *OperatorRaftInfoCommand) Synopsis() string {
diff --git a/command/operator_raft_logs.go b/command/operator_raft_logs.go
index 01e476eaeb9..25779b01a99 100644
--- a/command/operator_raft_logs.go
+++ b/command/operator_raft_logs.go
@@ -45,7 +45,7 @@ func (c *OperatorRaftLogsCommand) AutocompleteFlags() complete.Flags {
 }
 
 func (c *OperatorRaftLogsCommand) AutocompleteArgs() complete.Predictor {
-	return complete.PredictNothing
+	return complete.PredictFiles("*")
 }
 
 func (c *OperatorRaftLogsCommand) Synopsis() string {
diff --git a/command/operator_raft_state.go b/command/operator_raft_state.go
index a7ad54481cf..be9f440ed4c 100644
--- a/command/operator_raft_state.go
+++ b/command/operator_raft_state.go
@@ -42,11 +42,13 @@ Options:
 }
 
 func (c *OperatorRaftStateCommand) AutocompleteFlags() complete.Flags {
-	return complete.Flags{}
+	return complete.Flags{
+		"-last-index": complete.PredictNothing,
+	}
 }
 
 func (c *OperatorRaftStateCommand) AutocompleteArgs() complete.Predictor {
-	return complete.PredictNothing
+	return complete.PredictFiles("*")
 }
 
 func (c *OperatorRaftStateCommand) Synopsis() string {
diff --git a/command/operator_snapshot_inspect.go b/command/operator_snapshot_inspect.go
index 2a694080869..dee3d2d2bd9 100644
--- a/command/operator_snapshot_inspect.go
+++ b/command/operator_snapshot_inspect.go
@@ -33,7 +33,7 @@ func (c *OperatorSnapshotInspectCommand) AutocompleteFlags() complete.Flags {
 }
 
 func (c *OperatorSnapshotInspectCommand) AutocompleteArgs() complete.Predictor {
-	return complete.PredictNothing
+	return complete.PredictFiles("*.snap")
 }
 
 func (c *OperatorSnapshotInspectCommand) Synopsis() string {
diff --git a/command/operator_snapshot_restore.go b/command/operator_snapshot_restore.go
index a814b708651..ef9da89b4e2 100644
--- a/command/operator_snapshot_restore.go
+++ b/command/operator_snapshot_restore.go
@@ -46,7 +46,7 @@ func (c *OperatorSnapshotRestoreCommand) AutocompleteFlags() complete.Flags {
 }
 
 func (c *OperatorSnapshotRestoreCommand) AutocompleteArgs() complete.Predictor {
-	return complete.PredictNothing
+	return complete.PredictFiles("*.snap")
 }
 
 func (c *OperatorSnapshotRestoreCommand) Synopsis() string {
diff --git a/command/operator_snapshot_state.go b/command/operator_snapshot_state.go
index 19d942d647a..6580859652c 100644
--- a/command/operator_snapshot_state.go
+++ b/command/operator_snapshot_state.go
@@ -43,7 +43,7 @@ func (c *OperatorSnapshotStateCommand) AutocompleteFlags() complete.Flags {
 }
 
 func (c *OperatorSnapshotStateCommand) AutocompleteArgs() complete.Predictor {
-	return complete.PredictNothing
+	return complete.PredictFiles("*.snap")
 }
 
 func (c *OperatorSnapshotStateCommand) Synopsis() string {